diff --git a/src/game/server/save.cpp b/src/game/server/save.cpp index f5563c021..dba931519 100644 --- a/src/game/server/save.cpp +++ b/src/game/server/save.cpp @@ -290,7 +290,7 @@ char* CSaveTee::GetString(const CSaveTeam *pTeam) return m_aString; } -int CSaveTee::LoadString(const char* String) +int CSaveTee::FromString(const char* String) { int Num; Num = sscanf(String, @@ -552,7 +552,7 @@ char* CSaveTeam::GetString() return m_aString; } -int CSaveTeam::LoadString(const char* String) +int CSaveTeam::FromString(const char* String) { char TeamStats[MAX_CLIENTS]; char Switcher[64]; @@ -636,7 +636,7 @@ int CSaveTeam::LoadString(const char* String) if(StrSize < sizeof(SaveTee)) { str_copy(SaveTee, CopyPos, StrSize); - int Num = m_pSavedTees[n].LoadString(SaveTee); + int Num = m_pSavedTees[n].FromString(SaveTee); if(Num) { dbg_msg("load", "failed to load tee"); diff --git a/src/game/server/save.h b/src/game/server/save.h index 7b6e48bd2..6eaafd53c 100644 --- a/src/game/server/save.h +++ b/src/game/server/save.h @@ -18,7 +18,7 @@ public: void save(CCharacter* pchr); void load(CCharacter* pchr, int Team); char* GetString(const CSaveTeam *pTeam); - int LoadString(const char* String); + int FromString(const char* String); void LoadHookedPlayer(const CSaveTeam *pTeam); vec2 GetPos() const { return m_Pos; } const char* GetName() const { return m_aName; } @@ -115,7 +115,7 @@ public: char* GetString(); int GetMembersCount() const { return m_MembersCount; } // 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 bool MatchPlayers(const char (*paNames)[MAX_NAME_LENGTH], const int *pClientID, int NumPlayer, char *pMessage, int MessageLen); int save(int Team); diff --git a/src/game/server/score.cpp b/src/game/server/score.cpp index 80b155484..7231d5ba4 100644 --- a/src/game/server/score.cpp +++ b/src/game/server/score.cpp @@ -1498,7 +1498,7 @@ bool CScore::LoadTeamThread(IDbConnection *pSqlServer, const ISqlData *pGameData char aSaveString[65536]; 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) {