From b66f2202dd90216dd99f03a7ad42895e13183085 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 10 Sep 2004 23:21:56 +0000
Subject: [PATCH] fix WITHOUT_NETWORKING

---
 stepmania/src/NetworkSyncServer.cpp    | 11 +++++++++--
 stepmania/src/NetworkSyncServer.h      |  3 +++
 stepmania/src/Screen.cpp               |  9 ++++++---
 stepmania/src/ScreenNetEvaluation.cpp  |  5 +++++
 stepmania/src/ScreenNetSelectMusic.cpp |  4 ++++
 stepmania/src/ScreenNetworkOptions.cpp |  4 ++++
 6 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/stepmania/src/NetworkSyncServer.cpp b/stepmania/src/NetworkSyncServer.cpp
index 8668779148..26267eca9e 100644
--- a/stepmania/src/NetworkSyncServer.cpp
+++ b/stepmania/src/NetworkSyncServer.cpp
@@ -1,10 +1,16 @@
-/* NetworkSyncServer.cpp
- */
 #include "global.h"
 #include "NetworkSyncServer.h"
 #include "RageLog.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()
 {
 	score = 0;
@@ -763,6 +769,7 @@ void StepManiaLanServer::ScreenNetMusicSelectStatus(PacketFunctions& Packet, int
 	}
 	ServerChat(message);
 }
+#endif
 
 /*
  * (c) 2003-2004 Joshua Allen
diff --git a/stepmania/src/NetworkSyncServer.h b/stepmania/src/NetworkSyncServer.h
index 9bce88643f..01ea1a3d72 100644
--- a/stepmania/src/NetworkSyncServer.h
+++ b/stepmania/src/NetworkSyncServer.h
@@ -76,7 +76,9 @@ public:
 	CString servername;
 	CString lastError;
 	int lastErrorCode;
+
 private:
+#if !defined(WITHOUT_NETWORKING)
 	bool stop;
 	PacketFunctions Packet;
 	PacketFunctions Reply;
@@ -117,6 +119,7 @@ private:
 	void SendUserList();
 	void GameOver(PacketFunctions& Packet, int clientNum);
 	void ScreenNetMusicSelectStatus(PacketFunctions& Packet, int clientNum);
+#endif
 };
 
 #endif
diff --git a/stepmania/src/Screen.cpp b/stepmania/src/Screen.cpp
index 7b93f21ecb..fbabfa9942 100644
--- a/stepmania/src/Screen.cpp
+++ b/stepmania/src/Screen.cpp
@@ -346,8 +346,6 @@ Screen* Screen::Create( CString sClassName )
 	IF_RETURN( ScreenTestSound );
 	IF_RETURN( ScreenTitleMenu );
 	IF_RETURN( ScreenEz2SelectMusic );
-	IF_RETURN( ScreenNetSelectMusic );
-	IF_RETURN( ScreenNetEvaluation );
 	IF_RETURN( ScreenRanking );
 	IF_RETURN( ScreenLogo );
 	IF_RETURN( ScreenUnlock );
@@ -362,7 +360,6 @@ Screen* Screen::Create( CString sClassName )
 	IF_RETURN( ScreenSelectCharacter );
 	IF_RETURN( ScreenSelectMaster );
 	IF_RETURN( ScreenEditCoursesMenu );
-	IF_RETURN( ScreenNetworkOptions );
 	IF_RETURN( ScreenProfileOptions );
 	IF_RETURN( ScreenExit );
 	IF_RETURN( ScreenReloadSongs );
@@ -380,6 +377,12 @@ Screen* Screen::Create( CString sClassName )
 	IF_RETURN( ScreenClearBookkeepingData );
 	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() );
 }
 
diff --git a/stepmania/src/ScreenNetEvaluation.cpp b/stepmania/src/ScreenNetEvaluation.cpp
index 59b87ffcb9..208dc5ff0a 100644
--- a/stepmania/src/ScreenNetEvaluation.cpp
+++ b/stepmania/src/ScreenNetEvaluation.cpp
@@ -1,4 +1,6 @@
 #include "global.h"
+
+#if !defined(WITHOUT_NETWORKING)
 #include "ScreenNetEvaluation.h"
 #include "ThemeManager.h"
 #include "GameState.h"
@@ -143,3 +145,6 @@ void ScreenNetEvaluation::UpdateStats()
 
 	m_textPlayerOptions[m_pActivePlayer].SetText( NSMAN->m_EvalPlayerData[m_iCurrentPlayer].playerOptions );
 }
+
+#endif
+
diff --git a/stepmania/src/ScreenNetSelectMusic.cpp b/stepmania/src/ScreenNetSelectMusic.cpp
index dd8afc6702..a30172b73a 100644
--- a/stepmania/src/ScreenNetSelectMusic.cpp
+++ b/stepmania/src/ScreenNetSelectMusic.cpp
@@ -1,4 +1,6 @@
 #include "global.h"
+
+#if !defined(WITHOUT_NETWORKING)
 #include "ScreenNetSelectMusic.h"
 #include "ScreenManager.h"
 #include "GameSoundManager.h"
@@ -710,6 +712,8 @@ void ScreenNetSelectMusic::UpdateSongsList()
 		SONGMAN->GetSongs( m_vSongs, m_vGroups[j] );
 }
 
+#endif
+
 /*
  * (c) 2004 Charles Lohr
  * All rights reserved.
diff --git a/stepmania/src/ScreenNetworkOptions.cpp b/stepmania/src/ScreenNetworkOptions.cpp
index d38a46facd..93524912e7 100644
--- a/stepmania/src/ScreenNetworkOptions.cpp
+++ b/stepmania/src/ScreenNetworkOptions.cpp
@@ -1,4 +1,6 @@
 #include "global.h"
+
+#if !defined(WITHOUT_NETWORKING)
 #include "NetworkSyncManager.h"
 #include "ScreenNetworkOptions.h"
 #include "RageLog.h"
@@ -144,6 +146,8 @@ void ScreenNetworkOptions::ExportOptions()
 
 }
 
+#endif
+
 /*
  * (c) 2004 Charles Lohr
  * All rights reserved.