diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-10-18 11:03:33 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-10-18 11:03:33 +0000 |
| commit | e0358ee798560f7ca689577227fe7cd86342b9de (patch) | |
| tree | 27e8fe3910b9c618401fcba8d26b52d5938d5297 | |
| parent | 8e0e1051233b645a1909b9779192cc8952898fac (diff) | |
| download | zcatch-e0358ee798560f7ca689577227fe7cd86342b9de.tar.gz zcatch-e0358ee798560f7ca689577227fe7cd86342b9de.zip | |
fixed the hammer so it looks good again and works like it should
| -rw-r--r-- | src/game/client/components/players.cpp | 4 | ||||
| -rw-r--r-- | src/game/server/entities/character.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/game/client/components/players.cpp b/src/game/client/components/players.cpp index 85c644ef..51ab8fad 100644 --- a/src/game/client/components/players.cpp +++ b/src/game/client/components/players.cpp @@ -198,8 +198,8 @@ void PLAYERS::render_player( if (player.weapon == WEAPON_HAMMER) { - float a = clamp((client_tick()-player.attacktick+ticktime)/10.0f, 0.0f, 1.0f); - state.add(&data->animations[ANIM_HAMMER_SWING], a, 1.0f); + float ct = (client_prevtick()-player.attacktick)/(float)SERVER_TICK_SPEED + client_ticktime(); + state.add(&data->animations[ANIM_HAMMER_SWING], clamp(ct*5.0f,0.0f,1.0f), 1.0f); } if (player.weapon == WEAPON_NINJA) { diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index 2ba27214..18db9e3b 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -39,6 +39,7 @@ MACRO_ALLOC_POOL_ID_IMPL(CHARACTER, MAX_CLIENTS) CHARACTER::CHARACTER() : ENTITY(NETOBJTYPE_CHARACTER) { + proximity_radius = phys_size; } void CHARACTER::reset() |