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

Fixed a merge mistake

Browse source
This commit is contained in:
GreYFoX 2011-02-23 09:43:05 +02:00
parent 5ffe4e9429
commit 6d181a2daa
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/gamecontext.cpp
View file

@ -141,9 +141,10 @@ void CGameContext::CreateExplosion(vec2 Pos, int Owner, int Weapon, bool NoDamag
pEvent->m_X = (int)Pos.x; pEvent->m_X = (int)Pos.x;
pEvent->m_Y = (int)Pos.y; pEvent->m_Y = (int)Pos.y;
} }
/*
if (!NoDamage) if (!NoDamage)
{ {
*/
// deal damage // deal damage
CCharacter *apEnts[MAX_CLIENTS]; CCharacter *apEnts[MAX_CLIENTS];
float Radius = 135.0f; float Radius = 135.0f;
@ -167,7 +168,7 @@ void CGameContext::CreateExplosion(vec2 Pos, int Owner, int Weapon, bool NoDamag
if(!g_Config.m_SvHit||NoDamage) break; if(!g_Config.m_SvHit||NoDamage) break;
} }
} }
} //}
} }
/* /*
@ -1623,4 +1624,4 @@ void CGameContext::SendRecord(int ClientID) {
RecordsMsg.m_PlayerTimeBest = Score()->PlayerData(ClientID)->m_BestTime * 100.0f;// RecordsMsg.m_PlayerTimeBest = Score()->PlayerData(ClientID)->m_BestTime * 100.0f;//
RecordsMsg.m_ServerTimeBest = m_pController->m_CurrentRecord * 100.0f;//TODO: finish this RecordsMsg.m_ServerTimeBest = m_pController->m_CurrentRecord * 100.0f;//TODO: finish this
Server()->SendPackMsg(&RecordsMsg, MSGFLAG_VITAL, ClientID); Server()->SendPackMsg(&RecordsMsg, MSGFLAG_VITAL, ClientID);
} }