about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2008-03-02 15:46:51 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2008-03-02 15:46:51 +0000
commit719b133d5ae6d21638dd9bb7bfa6f4d23eef840e (patch)
treed6baf52fa141bae2c9a296a3d86c33f10faa0904
parent194ad1efb882b8572a107ccabed1437909fed79d (diff)
downloadzcatch-719b133d5ae6d21638dd9bb7bfa6f4d23eef840e.tar.gz
zcatch-719b133d5ae6d21638dd9bb7bfa6f4d23eef840e.zip
updated ctf2. could use some more 0.4.0 effects
-rw-r--r--data/maps/ctf2.mapbin0 -> 10566 bytes
-rw-r--r--src/game/client/gc_render.cpp6
2 files changed, 4 insertions, 2 deletions
diff --git a/data/maps/ctf2.map b/data/maps/ctf2.map
new file mode 100644
index 00000000..5cbd404b
--- /dev/null
+++ b/data/maps/ctf2.map
Binary files differdiff --git a/src/game/client/gc_render.cpp b/src/game/client/gc_render.cpp
index 6e001bd1..45503c8c 100644
--- a/src/game/client/gc_render.cpp
+++ b/src/game/client/gc_render.cpp
@@ -159,7 +159,7 @@ void render_tee(animstate *anim, tee_render_info *info, int emote, vec2 dir, vec
 				gfx_quads_setrotation(anim->body.angle*pi*2);
 
 				// draw body
-				gfx_setcolor(info->color_body.r, info->color_body.g, info->color_body.b, info->color_body.a);
+				gfx_setcolor(info->color_body.r, info->color_body.g, info->color_body.b, 1.0f);
 				vec2 body_pos = position + vec2(anim->body.x, anim->body.y)*animscale;
 				select_sprite(outline?SPRITE_TEE_BODY_OUTLINE:SPRITE_TEE_BODY, 0, 0, 0);
 				gfx_quads_draw(body_pos.x, body_pos.y, basesize, basesize);
@@ -196,7 +196,7 @@ void render_tee(animstate *anim, tee_render_info *info, int emote, vec2 dir, vec
 			}
 
 			// draw feet
-			gfx_setcolor(info->color_feet.r, info->color_feet.g, info->color_feet.b, info->color_feet.a);
+			gfx_setcolor(info->color_feet.r, info->color_feet.g, info->color_feet.b, 1.0f);
 			select_sprite((outline||!info->got_airjump)?SPRITE_TEE_FOOT_OUTLINE:SPRITE_TEE_FOOT, 0, 0, 0);
 
 			keyframe *foot = f ? &anim->front_foot : &anim->back_foot;
@@ -210,6 +210,8 @@ void render_tee(animstate *anim, tee_render_info *info, int emote, vec2 dir, vec
 	}
 
 	gfx_quads_end();
+	
+	
 }
 
 static void calc_screen_params(float amount, float wmax, float hmax, float aspect, float *w, float *h)