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

Merge branch 'master' of http://github.com/btd/DDRace

Browse source 
Conflicts:
	data/editor/entities_clear.png
This commit is contained in:
GreYFoXGTi 2010-08-28 16:10:34 +02:00
parent da94ad22b0 368ce9dee4
commit 193e350500
6 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bam.lua
View file

@ -16,7 +16,7 @@ config:Finalize("config.lua")
-- data compiler
function Script(name)
if family == "windows" then
return str_replace(name, "/", "\\")
str_replace(name, "/", "\\")
end
return "python " .. name
end

BIN
data/editor/entities_clear.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 276 KiB

After

Width:  |  Height:  |  Size: 231 KiB

BIN
other/icons/teeworlds.res
View file

Binary file not shown.

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

@ -735,11 +735,11 @@ void CCharacter::Tick()
if(g_Config.m_SvHideScore || i == m_pPlayer->GetCID())
{
CNetMsg_Sv_PlayerTime Msg;
//char aBuf[16];
//str_format(aBuf, sizeof(aBuf), "%.0f", time*100.0f); // damn ugly but the only way i know to do it
//int TimeToSend;
//sscanf(aBuf, "%d", &TimeToSend);
Msg.m_Time = static_cast<int>(time*100.0f);
char aBuf[16];
str_format(aBuf, sizeof(aBuf), "%.0f", time*100.0f); // damn ugly but the only way i know to do it
int TimeToSend;
sscanf(aBuf, "%d", &TimeToSend);
Msg.m_Time = TimeToSend;
Msg.m_Cid = m_pPlayer->GetCID();
Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, i);
}

6
src/game/server/gamecontext.h
View file

@ -61,10 +61,16 @@ class CGameContext : public IGameServer
static void ConShotgun(IConsole::IResult *pResult, void *pUserData, int cid);
static void ConShotgunMe(IConsole::IResult *pResult, void *pUserData, int cid);
static void ConGrenade(IConsole::IResult *pResult, void *pUserData, int cid);
static void ConGrenadeMe(IConsole::IResult *pResult, void *pUserData, int cid);
static void ConRifle(IConsole::IResult *pResult, void *pUserData, int cid);
static void ConRifleMe(IConsole::IResult *pResult, void *pUserData, int cid);
static void ConLaser(IConsole::IResult *pResult, void *pUserData, int cid);
static void ConLaserMe(IConsole::IResult *pResult, void *pUserData, int cid);
static void ConWeapons(IConsole::IResult *pResult, void *pUserData, int cid);
static void ConWeaponsMe(IConsole::IResult *pResult, void *pUserData, int cid);

10
src/game/server/player.cpp
View file

@ -95,12 +95,12 @@ void CPlayer::Tick()
if(m_LastSentTime > GameServer()->m_pController->m_CurrentRecord || (m_LastSentTime == 0 && GameServer()->m_pController->m_CurrentRecord > 0))
{
//dbg_msg("player", "Record message sended");
//char aBuf[16];
//str_format(aBuf, sizeof(aBuf), "%.0f", GameServer()->m_pController->m_CurrentRecord*100.0f); // damn ugly but the only way i know to do it
//int TimeToSend;
//sscanf(aBuf, "%d", &TimeToSend);
char aBuf[16];
str_format(aBuf, sizeof(aBuf), "%.0f", GameServer()->m_pController->m_CurrentRecord*100.0f); // damn ugly but the only way i know to do it
int TimeToSend;
sscanf(aBuf, "%d", &TimeToSend);
CNetMsg_Sv_Record Msg;
Msg.m_Time = static_cast<int>(GameServer()->m_pController->m_CurrentRecord*100.0f);
Msg.m_Time = TimeToSend;
Server()->SendPackMsg(&Msg, MSGFLAG_VITAL, m_ClientID);
m_LastSentTime = GameServer()->m_pController->m_CurrentRecord;