diff options
| author | Jakob Fries <jakob.fries@gmail.com> | 2007-08-09 00:47:34 +0000 |
|---|---|---|
| committer | Jakob Fries <jakob.fries@gmail.com> | 2007-08-09 00:47:34 +0000 |
| commit | fe6ae30133bd2d47202d884871461c06c6aaee3d (patch) | |
| tree | e13d0ce25aa1c30b63da6486f04d70bd63149f6c /src | |
| parent | c488c3570794de4759c353b5a078cd2df0b27f41 (diff) | |
| download | zcatch-fe6ae30133bd2d47202d884871461c06c6aaee3d.tar.gz zcatch-fe6ae30133bd2d47202d884871461c06c6aaee3d.zip | |
blink emote
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/client/game_client.cpp | 5 | ||||
| -rw-r--r-- | src/game/server/game_server.cpp | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/game/client/game_client.cpp b/src/game/client/game_client.cpp index 38515b7f..91bc2fa3 100644 --- a/src/game/client/game_client.cpp +++ b/src/game/client/game_client.cpp @@ -837,8 +837,9 @@ static void render_tee(animstate *anim, int skin, int emote, vec2 dir, vec2 pos) select_sprite(SPRITE_TEE_EYE_NORMAL, 0, 0, shift*4); break; } - gfx_quads_draw(position.x-4+direction.x*4, position.y-8+direction.y*3, basesize, basesize); - gfx_quads_draw(position.x+4+direction.x*4, position.y-8+direction.y*3, -basesize, basesize); + int h = emote == EMOTE_BLINK ? basesize/3 : basesize; + gfx_quads_draw(position.x-4+direction.x*4, position.y-8+direction.y*3, basesize, h); + gfx_quads_draw(position.x+4+direction.x*4, position.y-8+direction.y*3, -basesize, h); } } diff --git a/src/game/server/game_server.cpp b/src/game/server/game_server.cpp index 6ba83980..a28719c7 100644 --- a/src/game/server/game_server.cpp +++ b/src/game/server/game_server.cpp @@ -1488,15 +1488,15 @@ void player::snap(int snaping_client) if(dead) player->health = -1; - if(length(vel) > 15.0f) - player->emote = EMOTE_HAPPY; + //if(length(vel) > 15.0f) + // player->emote = EMOTE_HAPPY; //if(damage_taken_tick+50 > server_tick()) // player->emote = EMOTE_PAIN; if(player->emote == EMOTE_NORMAL) { - if((server_tick()%(50*5)) < 10) + if((server_tick()%(50*5)) < 5) player->emote = EMOTE_BLINK; } |