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

fixed several stuffs

Browse source
This commit is contained in:
Choupom 2011-04-19 16:10:50 +02:00 committed by oy
parent c2f75b0017
commit 7f15b3ac57
8 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bam.lua
View file

@ -106,7 +106,7 @@ AddDependency(network_source, network_header)
AddDependency(client_content_source, client_content_header)
AddDependency(server_content_source, server_content_header)
nethash = CHash("src/game/generated/nethash.c", "src/engine/shared/protocol.h", "src/game/generated/protocol.h", "src/game/tuning.h", "src/game/gamecore.cpp", network_header)
nethash = CHash("src/game/generated/nethash.cpp", "src/engine/shared/protocol.h", "src/game/generated/protocol.h", "src/game/tuning.h", "src/game/gamecore.cpp", network_header)
client_link_other = {}
client_depends = {}

1
src/engine/server.h
View file

@ -31,7 +31,6 @@ public:
virtual bool ClientIngame(int ClientID) = 0;
virtual int GetClientInfo(int ClientID, CClientInfo *pInfo) = 0;
virtual void GetClientAddr(int ClientID, char *pAddrStr, int Size) = 0;
virtual int *LatestInput(int ClientID, int *pSize) = 0;
virtual int SendMsg(CMsgPacker *pMsg, int Flags, int ClientID) = 0;

7
src/engine/server/server.cpp
View file

@ -345,13 +345,6 @@ void CServer::GetClientAddr(int ClientID, char *pAddrStr, int Size)
}
int *CServer::LatestInput(int ClientID, int *size)
{
if(ClientID < 0 || ClientID >= MAX_CLIENTS || m_aClients[ClientID].m_State < CServer::CClient::STATE_READY)
return 0;
return m_aClients[ClientID].m_LatestInput.m_aData;
}
const char *CServer::ClientName(int ClientID)
{
if(ClientID < 0 || ClientID >= MAX_CLIENTS || m_aClients[ClientID].m_State == CServer::CClient::STATE_EMPTY)

2
src/engine/server/server.h
View file

@ -148,8 +148,6 @@ public:
int ClientCountry(int ClientID);
bool ClientIngame(int ClientID);
int *LatestInput(int ClientID, int *size);
virtual int SendMsg(CMsgPacker *pMsg, int Flags, int ClientID);
int SendMsgEx(CMsgPacker *pMsg, int Flags, int ClientID, bool System);

4
src/engine/shared/huffman.cpp
View file

@ -57,8 +57,8 @@ void CHuffman::ConstructTree(const unsigned *pFrequencies)
{
m_aNodes[i].m_NumBits = 0xFFFFFFFF;
m_aNodes[i].m_Symbol = i;
m_aNodes[i].m_aLeafs[0] = -1;
m_aNodes[i].m_aLeafs[1] = -1;
m_aNodes[i].m_aLeafs[0] = 0xffff;
m_aNodes[i].m_aLeafs[1] = 0xffff;
if(i == HUFFMAN_EOF_SYMBOL)
aNodesLeftStorage[i].m_Frequency = 1;

2
src/game/client/components/effects.cpp
View file

@ -86,7 +86,7 @@ void CEffects::SmokeTrail(vec2 Pos, vec2 Vel)
p.m_LifeSpan = 0.5f + frandom()*0.5f;
p.m_StartSize = 12.0f + frandom()*8;
p.m_EndSize = 0;
p.m_Friction = 0.7;
p.m_Friction = 0.7f;
p.m_Gravity = frandom()*-500.0f;
m_pClient->m_pParticles->Add(CParticles::GROUP_PROJECTILE_TRAIL, &p);
}

4
src/game/client/components/spectator.cpp
View file

@ -64,8 +64,8 @@ void CSpectator::ConSpectateNext(IConsole::IResult *pResult, void *pUserData)
if(!pSelf->m_pClient->m_Snap.m_paPlayerInfos[i] || pSelf->m_pClient->m_Snap.m_paPlayerInfos[i]->m_Team == TEAM_SPECTATORS)
continue;
NewSpectatorID = i;
GotNewSpectatorID = true;
NewSpectatorID = i;
GotNewSpectatorID = true;
break;
}
}

2
src/game/version.h
View file

@ -2,7 +2,7 @@
/* If you are missing that file, acquire a complete release at teeworlds.com. */
#ifndef GAME_VERSION_H
#define GAME_VERSION_H
#include "generated/nethash.c"
#include "generated/nethash.cpp"
#define GAME_VERSION "0.6 trunk"
#define GAME_NETVERSION "0.6 " GAME_NETVERSION_HASH
#endif