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

Rename LoadString to FromString to fix windows build

Browse source
This commit is contained in:
Zwelf 2020-08-09 16:52:18 +02:00
parent 20e8bfd12a
commit 5b53a05a40
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/game/server/save.cpp
View file

@ -290,7 +290,7 @@ char* CSaveTee::GetString(const CSaveTeam *pTeam)
return m_aString; return m_aString;
} }
int CSaveTee::LoadString(const char* String) int CSaveTee::FromString(const char* String)
{ {
int Num; int Num;
Num = sscanf(String, Num = sscanf(String,
@ -552,7 +552,7 @@ char* CSaveTeam::GetString()
return m_aString; return m_aString;
} }
int CSaveTeam::LoadString(const char* String) int CSaveTeam::FromString(const char* String)
{ {
char TeamStats[MAX_CLIENTS]; char TeamStats[MAX_CLIENTS];
char Switcher[64]; char Switcher[64];
@ -636,7 +636,7 @@ int CSaveTeam::LoadString(const char* String)
if(StrSize < sizeof(SaveTee)) if(StrSize < sizeof(SaveTee))
{ {
str_copy(SaveTee, CopyPos, StrSize); str_copy(SaveTee, CopyPos, StrSize);
int Num = m_pSavedTees[n].LoadString(SaveTee); int Num = m_pSavedTees[n].FromString(SaveTee);
if(Num) if(Num)
{ {
dbg_msg("load", "failed to load tee"); dbg_msg("load", "failed to load tee");

4
src/game/server/save.h
View file

@ -18,7 +18,7 @@ public:
void save(CCharacter* pchr); void save(CCharacter* pchr);
void load(CCharacter* pchr, int Team); void load(CCharacter* pchr, int Team);
char* GetString(const CSaveTeam *pTeam); char* GetString(const CSaveTeam *pTeam);
int LoadString(const char* String); int FromString(const char* String);
void LoadHookedPlayer(const CSaveTeam *pTeam); void LoadHookedPlayer(const CSaveTeam *pTeam);
vec2 GetPos() const { return m_Pos; } vec2 GetPos() const { return m_Pos; }
const char* GetName() const { return m_aName; } const char* GetName() const { return m_aName; }
@ -115,7 +115,7 @@ public:
char* GetString(); char* GetString();
int GetMembersCount() const { return m_MembersCount; } int GetMembersCount() const { return m_MembersCount; }
// MatchPlayers has to be called afterwards // MatchPlayers has to be called afterwards
int LoadString(const char* String); int FromString(const char* String);
// returns true if a team can load, otherwise writes a nice error Message in pMessage // returns true if a team can load, otherwise writes a nice error Message in pMessage
bool MatchPlayers(const char (*paNames)[MAX_NAME_LENGTH], const int *pClientID, int NumPlayer, char *pMessage, int MessageLen); bool MatchPlayers(const char (*paNames)[MAX_NAME_LENGTH], const int *pClientID, int NumPlayer, char *pMessage, int MessageLen);
int save(int Team); int save(int Team);

2
src/game/server/score.cpp
View file

@ -1498,7 +1498,7 @@ bool CScore::LoadTeamThread(IDbConnection *pSqlServer, const ISqlData *pGameData
char aSaveString[65536]; char aSaveString[65536];
pSqlServer->GetString(1, aSaveString, sizeof(aSaveString)); pSqlServer->GetString(1, aSaveString, sizeof(aSaveString));
int Num = pData->m_pResult->m_SavedTeam.LoadString(aSaveString); int Num = pData->m_pResult->m_SavedTeam.FromString(aSaveString);
if(Num != 0) if(Num != 0)
{ {