edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-21 01:54:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed ninja not being remembered after freeze

Browse source 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
This commit is contained in:
GreYFoXGTi 2010-08-24 17:13:26 +02:00
parent f7aa9c4c2b
commit 03bb17e580
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/game/server/entities/character.cpp
View file

@ -1096,6 +1096,7 @@ bool CCharacter::UnFreeze()
{ {
m_aWeapons[i].m_Ammo = -1; m_aWeapons[i].m_Ammo = -1;
} }
if(!m_aWeapons[m_ActiveWeapon].m_Got) m_ActiveWeapon=WEAPON_GUN;
m_FreezeTime=0; m_FreezeTime=0;
return true; return true;
} }

5
src/game/server/entities/pickup.cpp
View file

@ -80,6 +80,9 @@ void CPickup::Tick()
} }
} }
} }
pChr->m_Ninja.m_ActivationDir=vec2(0,0);
pChr->m_Ninja.m_ActivationTick=-500;
pChr->m_Ninja.m_CurrentMoveTime=0;
if (sound) if (sound)
{ {
pChr->m_LastWeapon = WEAPON_GUN; pChr->m_LastWeapon = WEAPON_GUN;
@ -90,7 +93,7 @@ void CPickup::Tick()
case POWERUP_WEAPON: case POWERUP_WEAPON:
if(m_Subtype >= 0 && m_Subtype < NUM_WEAPONS && (!pChr->m_aWeapons[m_Subtype].m_Got || pChr->m_aWeapons[m_Subtype].m_Ammo != -1)) if(m_Subtype >= 0 && m_Subtype < NUM_WEAPONS && (!pChr->m_aWeapons[m_Subtype].m_Got || (pChr->m_aWeapons[m_Subtype].m_Ammo != -1 && !pChr->m_FreezeTime)))
{ {
if(pChr->GiveWeapon(m_Subtype, -1)) if(pChr->GiveWeapon(m_Subtype, -1))
{ {