From 2d9af1e348642dd65408f9845c11277b2f043faf Mon Sep 17 00:00:00 2001 From: Kp Date: Thu, 14 May 2015 02:23:13 +0000 Subject: [PATCH] Propagate gr_init argument --- common/include/gr.h | 2 +- similar/arch/ogl/gr.cpp | 4 ++-- similar/arch/sdl/gr.cpp | 4 ++-- similar/arch/sdl/init.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/include/gr.h b/common/include/gr.h index 8b08dc96b..d56348fbf 100644 --- a/common/include/gr.h +++ b/common/include/gr.h @@ -192,7 +192,7 @@ public: } }; -int gr_init(int mode); +int gr_init(); int gr_list_modes( array &gsmodes ); int gr_set_mode(u_int32_t mode); diff --git a/similar/arch/ogl/gr.cpp b/similar/arch/ogl/gr.cpp index e38641a83..3e9270a33 100644 --- a/similar/arch/ogl/gr.cpp +++ b/similar/arch/ogl/gr.cpp @@ -726,7 +726,7 @@ void gr_set_attributes(void) gr_remap_mono_fonts(); } -int gr_init(int mode) +int gr_init() { int retcode; @@ -768,7 +768,7 @@ int gr_init(int mode) grd_curscreen->sc_canvas.cv_bitmap.bm_data = NULL; // Set the mode. - if ((retcode=gr_set_mode(mode))) + if ((retcode=gr_set_mode(0))) return retcode; grd_curscreen->sc_canvas.cv_color = 0; diff --git a/similar/arch/sdl/gr.cpp b/similar/arch/sdl/gr.cpp index 3b126f0b7..5e39560cd 100644 --- a/similar/arch/sdl/gr.cpp +++ b/similar/arch/sdl/gr.cpp @@ -158,7 +158,7 @@ void gr_set_attributes(void) { } -int gr_init(int mode) +int gr_init() { int retcode; @@ -186,7 +186,7 @@ int gr_init(int mode) sdl_video_flags|=SDL_ASYNCBLIT; // Set the mode. - if ((retcode=gr_set_mode(mode))) + if ((retcode=gr_set_mode(0))) return retcode; grd_curscreen->sc_canvas.cv_color = 0; diff --git a/similar/arch/sdl/init.cpp b/similar/arch/sdl/init.cpp index d9ccad01a..fcdc532f6 100644 --- a/similar/arch/sdl/init.cpp +++ b/similar/arch/sdl/init.cpp @@ -61,7 +61,7 @@ void arch_init(void) if (!GameArg.CtlNoJoystick) joy_init(); - if ((t = gr_init(0)) != 0) + if ((t = gr_init()) != 0) Error(TXT_CANT_INIT_GFX,t); atexit(arch_close);