about summary refs log tree commit diff
path: root/src/game/client/game_client.cpp
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2007-08-30 07:15:26 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2007-08-30 07:15:26 +0000
commitc919da6640a34d49cc128c8eed1ba383463bbc6f (patch)
treee329cbc1095f92056f7d2e449442555dddb9e4cc /src/game/client/game_client.cpp
parent0e7054a24abfe2074aa5bbc556205cf2381bb87a (diff)
downloadzcatch-c919da6640a34d49cc128c8eed1ba383463bbc6f.tar.gz
zcatch-c919da6640a34d49cc128c8eed1ba383463bbc6f.zip
made stuff for ctf. all editor stuff for it is done. the ctf logic has to be written.
Diffstat (limited to 'src/game/client/game_client.cpp')
-rw-r--r--src/game/client/game_client.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/client/game_client.cpp b/src/game/client/game_client.cpp
index 0c20ab66..87fe767c 100644
--- a/src/game/client/game_client.cpp
+++ b/src/game/client/game_client.cpp
@@ -789,7 +789,7 @@ static void render_flag(const obj_flag *prev, const obj_flag *current)
 	float size = 64.0f;
 
     gfx_blend_normal();
-    gfx_texture_set(0);
+    gfx_texture_set(-1);
     gfx_quads_begin();
 	
 	gfx_quads_setrotation(angle);
@@ -805,7 +805,7 @@ static void render_flag(const obj_flag *prev, const obj_flag *current)
 		0, // starty
 		1, // endx
 		1); // endy								
-    gfx_quads_drawTL(pos.x,pos.y,size,size);
+    gfx_quads_draw(pos.x,pos.y,size,size);
     gfx_quads_end();
 }
 
@@ -1075,7 +1075,7 @@ static void render_player(const obj_player *prev, const obj_player *player)
 	if(player->health < 0) // dont render dead players
 		return;
 		
-	int skin = gametype == GAMETYPE_TDM ? skinseed + player->team : player->clientid;
+	int skin = gametype == GAMETYPE_DM ? player->clientid : skinseed + player->team;
 
 	vec2 direction = get_direction(player->angle);
 	float angle = player->angle/256.0f;