edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-13 03:28:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some logic fixes

Browse source
This commit is contained in:
GreYFoX 2011-07-22 14:29:27 +02:00
parent b0420e66ee
commit 2964919bf2
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1234,12 +1234,12 @@ void CCharacter::HandleTiles(int Index)
GameServer()->SendChatTarget(GetPlayer()->GetCID(),"Endless hook has been deactivated"); GameServer()->SendChatTarget(GetPlayer()->GetCID(),"Endless hook has been deactivated");
m_EndlessHook = false; m_EndlessHook = false;
} }
if(((m_TileIndex == TILE_HIT_START) || (m_TileFIndex == TILE_HIT_START)) && !m_EndlessHook) if(((m_TileIndex == TILE_HIT_START) || (m_TileFIndex == TILE_HIT_START)) && !m_Hit)
{ {
GameServer()->SendChatTarget(GetPlayer()->GetCID(),"You can hit others"); GameServer()->SendChatTarget(GetPlayer()->GetCID(),"You can hit others");
m_Hit = true; m_Hit = true;
} }
else if(((m_TileIndex == TILE_HIT_END) || (m_TileFIndex == TILE_HIT_END)) && m_EndlessHook) else if(((m_TileIndex == TILE_HIT_END) || (m_TileFIndex == TILE_HIT_END)) && m_Hit)
{ {
GameServer()->SendChatTarget(GetPlayer()->GetCID(),"You can't hit others"); GameServer()->SendChatTarget(GetPlayer()->GetCID(),"You can't hit others");
m_Hit = false; m_Hit = false;
@ -1399,7 +1399,7 @@ void CCharacter::DDRacePostCoreTick()
m_EmoteStop = -1; m_EmoteStop = -1;
} }
if (g_Config.m_SvEndlessDrag || m_EndlessHook || (m_Super && g_Config.m_SvEndlessSuperHook)) if (m_EndlessHook || (m_Super && g_Config.m_SvEndlessSuperHook))
m_Core.m_HookTick = 0; m_Core.m_HookTick = 0;
if (m_DeepFreeze && !m_Super) if (m_DeepFreeze && !m_Super)
@ -1500,5 +1500,6 @@ void CCharacter::DDRaceInit()
m_DefEmote = EMOTE_NORMAL; m_DefEmote = EMOTE_NORMAL;
m_DefEmoteReset = -1; m_DefEmoteReset = -1;
m_TeleCheckpoint = 0; m_TeleCheckpoint = 0;
m_EndlessHook = g_Config.m_SvEndlessDrag;
m_Hit = g_Config.m_SvHit; m_Hit = g_Config.m_SvHit;
} }