From f2a94d37ea1234e28f6f5154053076fabde5f107 Mon Sep 17 00:00:00 2001 From: GreYFoXGTi Date: Sun, 22 Aug 2010 15:12:30 +0200 Subject: [PATCH] Fixed Ninja When lost in strike to freeze Signed-off-by: GreYFoXGTi --- bam.lua | 2 +- src/game/server/entities/character.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bam.lua b/bam.lua index bd4a927d1..cbb463d7a 100644 --- a/bam.lua +++ b/bam.lua @@ -232,7 +232,7 @@ function build(settings) engine, client, game_editor, zlib, pnglite, wavpack, client_link_other, client_osxlaunch) - server_exe = Link(server_settings, "DDRace_Trunk", engine, server, + server_exe = Link(server_settings, "DDRace_Trunk-Server-Server", engine, server, game_shared, game_server, zlib) serverlaunch = {} diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index ac60e64f2..15ccf1dd2 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -1009,6 +1009,10 @@ bool CCharacter::UnFreeze() if(m_ActiveWeapon == WEAPON_NINJA) m_ActiveWeapon = WEAPON_GUN; SetWeapon(m_ActiveWeapon); + m_Ninja.m_ActivationDir=vec2(0,0); + m_Ninja.m_ActivationTick=0; + m_Ninja.m_CurrentMoveTime=0; + return true; } return false;