fix WITHOUT_NETWORKING

This commit is contained in:
Glenn Maynard
2004-09-10 23:21:56 +00:00
parent f482a4fbaf
commit b66f2202dd
6 changed files with 31 additions and 5 deletions
+9 -2
View File
@@ -1,10 +1,16 @@
/* NetworkSyncServer.cpp
*/
#include "global.h" #include "global.h"
#include "NetworkSyncServer.h" #include "NetworkSyncServer.h"
#include "RageLog.h" #include "RageLog.h"
#include <time.h> #include <time.h>
#if defined(WITHOUT_NETWORKING)
bool StepManiaLanServer::ServerStart() { return false; }
void StepManiaLanServer::ServerStop() { }
void StepManiaLanServer::ServerUpdate() { }
StepManiaLanServer::StepManiaLanServer() { }
StepManiaLanServer::~StepManiaLanServer() { }
#else
LanPlayer::LanPlayer() LanPlayer::LanPlayer()
{ {
score = 0; score = 0;
@@ -763,6 +769,7 @@ void StepManiaLanServer::ScreenNetMusicSelectStatus(PacketFunctions& Packet, int
} }
ServerChat(message); ServerChat(message);
} }
#endif
/* /*
* (c) 2003-2004 Joshua Allen * (c) 2003-2004 Joshua Allen
+3
View File
@@ -76,7 +76,9 @@ public:
CString servername; CString servername;
CString lastError; CString lastError;
int lastErrorCode; int lastErrorCode;
private: private:
#if !defined(WITHOUT_NETWORKING)
bool stop; bool stop;
PacketFunctions Packet; PacketFunctions Packet;
PacketFunctions Reply; PacketFunctions Reply;
@@ -117,6 +119,7 @@ private:
void SendUserList(); void SendUserList();
void GameOver(PacketFunctions& Packet, int clientNum); void GameOver(PacketFunctions& Packet, int clientNum);
void ScreenNetMusicSelectStatus(PacketFunctions& Packet, int clientNum); void ScreenNetMusicSelectStatus(PacketFunctions& Packet, int clientNum);
#endif
}; };
#endif #endif
+6 -3
View File
@@ -346,8 +346,6 @@ Screen* Screen::Create( CString sClassName )
IF_RETURN( ScreenTestSound ); IF_RETURN( ScreenTestSound );
IF_RETURN( ScreenTitleMenu ); IF_RETURN( ScreenTitleMenu );
IF_RETURN( ScreenEz2SelectMusic ); IF_RETURN( ScreenEz2SelectMusic );
IF_RETURN( ScreenNetSelectMusic );
IF_RETURN( ScreenNetEvaluation );
IF_RETURN( ScreenRanking ); IF_RETURN( ScreenRanking );
IF_RETURN( ScreenLogo ); IF_RETURN( ScreenLogo );
IF_RETURN( ScreenUnlock ); IF_RETURN( ScreenUnlock );
@@ -362,7 +360,6 @@ Screen* Screen::Create( CString sClassName )
IF_RETURN( ScreenSelectCharacter ); IF_RETURN( ScreenSelectCharacter );
IF_RETURN( ScreenSelectMaster ); IF_RETURN( ScreenSelectMaster );
IF_RETURN( ScreenEditCoursesMenu ); IF_RETURN( ScreenEditCoursesMenu );
IF_RETURN( ScreenNetworkOptions );
IF_RETURN( ScreenProfileOptions ); IF_RETURN( ScreenProfileOptions );
IF_RETURN( ScreenExit ); IF_RETURN( ScreenExit );
IF_RETURN( ScreenReloadSongs ); IF_RETURN( ScreenReloadSongs );
@@ -380,6 +377,12 @@ Screen* Screen::Create( CString sClassName )
IF_RETURN( ScreenClearBookkeepingData ); IF_RETURN( ScreenClearBookkeepingData );
IF_RETURN( ScreenInsertCredit ); IF_RETURN( ScreenInsertCredit );
#if !defined(WITHOUT_NETWORKING)
IF_RETURN( ScreenNetworkOptions );
IF_RETURN( ScreenNetSelectMusic );
IF_RETURN( ScreenNetEvaluation );
#endif
RageException::Throw( "Invalid Screen class name '%s'", sClassName.c_str() ); RageException::Throw( "Invalid Screen class name '%s'", sClassName.c_str() );
} }
+5
View File
@@ -1,4 +1,6 @@
#include "global.h" #include "global.h"
#if !defined(WITHOUT_NETWORKING)
#include "ScreenNetEvaluation.h" #include "ScreenNetEvaluation.h"
#include "ThemeManager.h" #include "ThemeManager.h"
#include "GameState.h" #include "GameState.h"
@@ -143,3 +145,6 @@ void ScreenNetEvaluation::UpdateStats()
m_textPlayerOptions[m_pActivePlayer].SetText( NSMAN->m_EvalPlayerData[m_iCurrentPlayer].playerOptions ); m_textPlayerOptions[m_pActivePlayer].SetText( NSMAN->m_EvalPlayerData[m_iCurrentPlayer].playerOptions );
} }
#endif
+4
View File
@@ -1,4 +1,6 @@
#include "global.h" #include "global.h"
#if !defined(WITHOUT_NETWORKING)
#include "ScreenNetSelectMusic.h" #include "ScreenNetSelectMusic.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "GameSoundManager.h" #include "GameSoundManager.h"
@@ -710,6 +712,8 @@ void ScreenNetSelectMusic::UpdateSongsList()
SONGMAN->GetSongs( m_vSongs, m_vGroups[j] ); SONGMAN->GetSongs( m_vSongs, m_vGroups[j] );
} }
#endif
/* /*
* (c) 2004 Charles Lohr * (c) 2004 Charles Lohr
* All rights reserved. * All rights reserved.
+4
View File
@@ -1,4 +1,6 @@
#include "global.h" #include "global.h"
#if !defined(WITHOUT_NETWORKING)
#include "NetworkSyncManager.h" #include "NetworkSyncManager.h"
#include "ScreenNetworkOptions.h" #include "ScreenNetworkOptions.h"
#include "RageLog.h" #include "RageLog.h"
@@ -144,6 +146,8 @@ void ScreenNetworkOptions::ExportOptions()
} }
#endif
/* /*
* (c) 2004 Charles Lohr * (c) 2004 Charles Lohr
* All rights reserved. * All rights reserved.