X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bigscreen%2Fccbs_bigscreen.cpp;h=7165bc393006f1843c406bb28943ec04bdfa8652;hb=405a983fa5d81d4ea5efdf13fa43dbe14a6d8a87;hp=2694e3711850820c72904153a5ef762e298a3252;hpb=fe5d8dd4bcbab4fed744782495a9fecdb5a5b1a7;p=ccbs diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp index 2694e37..7165bc3 100644 --- a/bigscreen/ccbs_bigscreen.cpp +++ b/bigscreen/ccbs_bigscreen.cpp @@ -39,8 +39,6 @@ void init(pqxx::connection &conn) } screens.erase(screens.begin(), screens.end()); - bool show_only_main_screen = (USE_SPLITSCREEN && screens.size() == 1); - #if !USE_SPLITSCREEN RotateScreen *rs = new RotateScreen(); mainscreen = rs; @@ -69,6 +67,8 @@ void init(pqxx::connection &conn) } } + bool show_only_main_screen = (USE_SPLITSCREEN && screens.size() == 1); + /* * Show auxilliary screens except if we have too many already, * or if we're in the special split-screen end-tournament mode, @@ -144,7 +144,7 @@ void main_loop(pqxx::connection &conn) } if (mainscreen && mainscreen->check_invalidated()) { - if (screen->pitch == SCREEN_WIDTH) { + if (screen->pitch == SCREEN_WIDTH * 4) { SDL_LockSurface(screen); mainscreen->draw((unsigned char *)screen->pixels, SCREEN_WIDTH, SCREEN_HEIGHT); SDL_UnlockSurface(screen);