diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-11-27 19:32:35 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-11-27 19:32:35 +0000 |
| commit | 8fa8485a3a207565a610dac981cb2da2a6a6d040 (patch) | |
| tree | 5ee8d57e86c4e7d5b17fc8772f79e719d1789c92 /src/engine/client | |
| parent | 9a8c0809c78782a1bcd038fe29277c12dbe781b8 (diff) | |
| download | zcatch-8fa8485a3a207565a610dac981cb2da2a6a6d040.tar.gz zcatch-8fa8485a3a207565a610dac981cb2da2a6a6d040.zip | |
fixed CTF sounds. fixed close teewars bug
Diffstat (limited to 'src/engine/client')
| -rw-r--r-- | src/engine/client/client.c | 3 | ||||
| -rw-r--r-- | src/engine/client/gfx.c | 4 | ||||
| -rw-r--r-- | src/engine/client/snd.c | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/src/engine/client/client.c b/src/engine/client/client.c index 6606ecf6..dcac2234 100644 --- a/src/engine/client/client.c +++ b/src/engine/client/client.c @@ -989,6 +989,9 @@ static void client_run() /* panic quit button */ if(inp_key_pressed(KEY_LCTRL) && inp_key_pressed(KEY_LSHIFT) && inp_key_pressed('Q')) break; + + if(!gfx_window_open()) + break; /* pump the network */ client_pump_network(); diff --git a/src/engine/client/gfx.c b/src/engine/client/gfx.c index e89fd199..c85e2a91 100644 --- a/src/engine/client/gfx.c +++ b/src/engine/client/gfx.c @@ -261,6 +261,10 @@ int gfx_window_active() return glfwGetWindowParam(GLFW_ACTIVE) == GL_TRUE ? 1 : 0; } +int gfx_window_open() +{ + return glfwGetWindowParam(GLFW_OPENED) == GL_TRUE ? 1 : 0; +} VIDEO_MODE fakemodes[] = { {320,240,8,8,8}, {400,300,8,8,8}, {640,480,8,8,8}, diff --git a/src/engine/client/snd.c b/src/engine/client/snd.c index ba8d03ef..f2b7f9a4 100644 --- a/src/engine/client/snd.c +++ b/src/engine/client/snd.c @@ -381,11 +381,12 @@ int snd_load_wv(const char *filename) return -1; } + /* if(snd->rate != 44100) { dbg_msg("sound/wv", "file is %d Hz, not 44100 Hz. filename='%s'", snd->rate, filename); return -1; - } + }*/ if(bitspersample != 16) { |