]>
Commit | Line | Data |
---|---|---|
e9397a32 | 1 | --- src/GameState.h.orig 2006-04-23 18:31:04.000000000 +0200 |
2 | +++ src/GameState.h 2006-04-23 18:31:23.000000000 +0200 | |
3 | @@ -85,8 +85,8 @@ | |
4 | bool AnyPlayersAreCpu() const; | |
5 | ||
6 | void GetCharacters( vector<Character*> &apCharactersOut ); | |
7 | - Character* GameState::GetRandomCharacter(); | |
8 | - Character* GameState::GetDefaultCharacter(); | |
9 | + Character* GetRandomCharacter(); | |
10 | + Character* GetDefaultCharacter(); | |
11 | ||
12 | PlayerController m_PlayerController[NUM_PLAYERS]; | |
13 | ||
14 | --- src/StdString.h.orig 2006-04-23 18:40:14.000000000 +0200 | |
15 | +++ src/StdString.h 2006-04-23 19:22:10.000000000 +0200 | |
16 | @@ -1087,7 +1087,7 @@ | |
17 | ||
18 | while ( (nIdx=this->find(szOld, nIdx)) != MYBASE::npos ) | |
19 | { | |
20 | - replace(this->begin()+nIdx, this->begin()+nIdx+nOldLen, szRealNew); | |
21 | + MYBASE::replace(this->begin()+nIdx, this->begin()+nIdx+nOldLen, szRealNew); | |
22 | nReplaced++; | |
23 | nIdx += nNewLen; | |
24 | } | |
25 | --- src/NetworkSyncServer.h.orig 2006-04-23 19:28:07.000000000 +0200 | |
26 | +++ src/NetworkSyncServer.h 2006-04-23 19:28:20.000000000 +0200 | |
27 | @@ -117,7 +117,7 @@ | |
28 | void GameOver(PacketFunctions& Packet, const unsigned int clientNum); | |
29 | void ScreenNetMusicSelectStatus(PacketFunctions& Packet, const unsigned int clientNum); | |
30 | void AnalizeChat(PacketFunctions &Packet, const unsigned int clientNum); | |
31 | - CString StepManiaLanServer::ListPlayers(); | |
32 | + CString ListPlayers(); | |
33 | void Kick(CString &name); | |
34 | void Ban(CString &name); | |
35 | bool IsBanned(CString &ip); | |
36 | --- src/RageUtil_FileDB.h.orig 2006-04-23 19:35:11.000000000 +0200 | |
37 | +++ src/RageUtil_FileDB.h 2006-04-23 19:35:34.000000000 +0200 | |
38 | @@ -86,9 +86,9 @@ | |
39 | virtual void PopulateFileSet( FileSet &fs, const CString &sPath ) { } | |
40 | ||
41 | public: | |
42 | - FilenameDB::FilenameDB(): | |
43 | + FilenameDB(): | |
44 | ExpireSeconds( -1 ) { } | |
45 | - virtual FilenameDB::~FilenameDB() { FlushDirCache(); } | |
46 | + virtual ~FilenameDB() { FlushDirCache(); } | |
47 | ||
48 | void AddFile( const CString &sPath, int size, int hash, void *priv=NULL ); | |
49 | void DelFile( const CString &sPath ); |