From b649ab6c16c6275c9ef9c21b2971d410ffd5b0db Mon Sep 17 00:00:00 2001 From: Alfred Eriksson Date: Mon, 1 Sep 2008 18:17:01 +0000 Subject: merged teambalance-warning and mini-/maximize-stuff from 0.4.3 --- src/engine/client/ec_gfx.c | 10 ++++++++++ src/engine/e_if_gfx.h | 28 ++++++++++++++++++++++++++++ src/engine/server/es_server.c | 16 ++++++++++++++++ 3 files changed, 54 insertions(+) (limited to 'src/engine') diff --git a/src/engine/client/ec_gfx.c b/src/engine/client/ec_gfx.c index c062ebbd..279194ef 100644 --- a/src/engine/client/ec_gfx.c +++ b/src/engine/client/ec_gfx.c @@ -1153,3 +1153,13 @@ void gfx_clip_disable() { glDisable(GL_SCISSOR_TEST); } + +void gfx_minimize() +{ + glfwIconifyWindow(); +} + +void gfx_maximize() +{ + glfwRestoreWindow(); +} diff --git a/src/engine/e_if_gfx.h b/src/engine/e_if_gfx.h index acbd4afc..73b1aa22 100644 --- a/src/engine/e_if_gfx.h +++ b/src/engine/e_if_gfx.h @@ -220,6 +220,34 @@ void gfx_lines_begin(); */ void gfx_lines_draw(float x0, float y0, float x1, float y1); +/* + Function: gfx_minimize + Minimizes the window. + + Arguments: + arg1 - desc + + Returns: + + See Also: + +*/ +void gfx_minimize(); + +/* + Function: gfx_minimize + Maximizes the window. + + Arguments: + arg1 - desc + + Returns: + + See Also: + +*/ +void gfx_maximize(); + /* Function: gfx_lines_end TODO diff --git a/src/engine/server/es_server.c b/src/engine/server/es_server.c index 62a8921d..afd0b16b 100644 --- a/src/engine/server/es_server.c +++ b/src/engine/server/es_server.c @@ -21,6 +21,11 @@ #include +#if defined(CONF_FAMILY_WINDOWS) + #define _WIN32_WINNT 0x0500 + #include +#endif + static SNAPBUILD builder; static int64 game_start_time; @@ -1152,6 +1157,17 @@ int main(int argc, char **argv) buffer[pos] = 0; chdir(buffer); #endif +#if defined(CONF_FAMILY_WINDOWS) + int i; + for(i = 1; i < argc; i++) + { + if(strcmp("-s", argv[i]) == 0 || strcmp("--silent", argv[i]) == 0) + { + ShowWindow(GetConsoleWindow(), SW_HIDE); + break; + } + } +#endif /* init the engine */ dbg_msg("server", "starting..."); -- cgit 1.4.1