diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-12-16 22:57:41 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-12-16 22:57:41 +0000 |
| commit | fc554e113b12da5cdcea021c85231adba5a749b1 (patch) | |
| tree | 73cf7c672ea817eb7777726bb6f70877d16da7c4 /src | |
| parent | 85d58973e806ddcd881d7a518c75188601d2b332 (diff) | |
| download | zcatch-fc554e113b12da5cdcea021c85231adba5a749b1.tar.gz zcatch-fc554e113b12da5cdcea021c85231adba5a749b1.zip | |
fixed so that the scoreboard can hold 12 players
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/client/gc_client.cpp | 6 | ||||
| -rw-r--r-- | src/game/g_variables.h | 2 | ||||
| -rw-r--r-- | src/game/server/gs_server.cpp | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/game/client/gc_client.cpp b/src/game/client/gc_client.cpp index 9dac2749..0de6c240 100644 --- a/src/game/client/gc_client.cpp +++ b/src/game/client/gc_client.cpp @@ -1936,7 +1936,7 @@ void render_scoreboard(float x, float y, float w, int team, const char *title) anim_eval_add(&idlestate, &data->animations[ANIM_IDLE], 0, 1.0f); //float ystart = y; - float h = 600.0f; + float h = 750.0f; gfx_blend_normal(); gfx_texture_set(-1); @@ -2974,8 +2974,8 @@ void render_game() render_scoreboard(width/2 + 20, 150.0f, w, 1, "Blue Team"); } - render_goals(width/2-w/2, 150+600+25, w); - render_spectators(width/2-w/2, 150+600+25+50+25, w); + render_goals(width/2-w/2, 150+750+25, w); + render_spectators(width/2-w/2, 150+750+25+50+25, w); } } diff --git a/src/game/g_variables.h b/src/game/g_variables.h index 76dee35c..c2d2eb2c 100644 --- a/src/game/g_variables.h +++ b/src/game/g_variables.h @@ -24,7 +24,7 @@ MACRO_CONFIG_INT(key_console, 256+2, 32, 512) MACRO_CONFIG_INT(key_remoteconsole, 256+3, 32, 512) -MACRO_CONFIG_INT(dbg_bots, 0, 0, 7) +MACRO_CONFIG_INT(dbg_bots, 0, 0, 11) MACRO_CONFIG_INT(cl_predict, 1, 0, 1) MACRO_CONFIG_INT(cl_nameplates, 0, 0, 1) diff --git a/src/game/server/gs_server.cpp b/src/game/server/gs_server.cpp index 5b0f4a11..7f7e3ad9 100644 --- a/src/game/server/gs_server.cpp +++ b/src/game/server/gs_server.cpp @@ -1957,7 +1957,6 @@ void mods_init() mods_client_enter(MAX_CLIENTS-i-1); if(gameobj->gametype != GAMETYPE_DM) players[MAX_CLIENTS-i-1].team = i&1; - players[MAX_CLIENTS-i-1].team = -1; } } } |