From 599211722dc90f342996f49cd045db447bc83de3 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 3 May 2004 20:28:24 +0000 Subject: [PATCH] this can be done with GameState --player, --mode now --- stepmania/src/NetworkSyncManager.cpp | 59 ---------------------------- stepmania/src/NetworkSyncManager.h | 1 - stepmania/src/StepMania.cpp | 2 - 3 files changed, 62 deletions(-) diff --git a/stepmania/src/NetworkSyncManager.cpp b/stepmania/src/NetworkSyncManager.cpp index fb90a8a34c..141e31781a 100644 --- a/stepmania/src/NetworkSyncManager.cpp +++ b/stepmania/src/NetworkSyncManager.cpp @@ -315,65 +315,6 @@ void NetworkSyncManager::SendSongs() } -void ArgSetMode (CString cmdLineMode) -{ - CString PlayerModeStr; - int loc=0; - int loc2=1; - - while (loc2>=0) { - loc2=cmdLineMode.Find(",",loc); - if (loc2<0) - PlayerModeStr = cmdLineMode.substr(loc,loc2-loc); - else - PlayerModeStr = cmdLineMode.substr(loc,loc2-loc); - - if (PlayerModeStr.CompareNoCase("1")==0) { - GAMESTATE->m_CurStyle = STYLE_DANCE_SINGLE; - GAMESTATE->m_bSideIsJoined[PLAYER_1] = true; - GAMESTATE->m_MasterPlayerNumber = PLAYER_1; - } else if (PlayerModeStr.CompareNoCase("2")==0) { - GAMESTATE->m_CurStyle = STYLE_DANCE_SINGLE; - GAMESTATE->m_bSideIsJoined[PLAYER_2] = true; - GAMESTATE->m_MasterPlayerNumber = PLAYER_2; - } else if (PlayerModeStr.CompareNoCase("VERSUS")==0) { - GAMESTATE->m_CurStyle = STYLE_DANCE_VERSUS; - GAMESTATE->m_bSideIsJoined[PLAYER_1] = true; - GAMESTATE->m_bSideIsJoined[PLAYER_2] = true; - } else if (PlayerModeStr.CompareNoCase("VERSUS")==0) { - GAMESTATE->m_CurStyle = STYLE_DANCE_VERSUS; - GAMESTATE->m_bSideIsJoined[PLAYER_1] = true; - GAMESTATE->m_bSideIsJoined[PLAYER_2] = true; - } else if (PlayerModeStr.CompareNoCase("DOUBLE")==0) { - GAMESTATE->m_CurStyle = STYLE_DANCE_DOUBLE; - GAMESTATE->m_bSideIsJoined[PLAYER_1] = true; - GAMESTATE->m_bSideIsJoined[PLAYER_2] = true; - } else if (PlayerModeStr.CompareNoCase("COUPLE")==0) { - GAMESTATE->m_CurStyle = STYLE_DANCE_COUPLE; - GAMESTATE->m_bSideIsJoined[PLAYER_1] = true; - GAMESTATE->m_bSideIsJoined[PLAYER_2] = true; - } else if (PlayerModeStr.CompareNoCase("FAILOFF")==0) { - GAMESTATE->m_SongOptions.m_FailType = SongOptions::FAIL_OFF; - } else if (PlayerModeStr.CompareNoCase("FAILENDOFSONG")==0) { - GAMESTATE->m_SongOptions.m_FailType = SongOptions::FAIL_END_OF_SONG; - } else if (PlayerModeStr.CompareNoCase("FAILARCADE")==0) { - GAMESTATE->m_SongOptions.m_FailType = SongOptions::FAIL_ARCADE; - } else if (PlayerModeStr.CompareNoCase("ARCADE")==0) { - GAMESTATE->m_PlayMode = PLAY_MODE_ARCADE; - } else if (PlayerModeStr.CompareNoCase("NONSTOP")==0) { - GAMESTATE->m_PlayMode = PLAY_MODE_NONSTOP; - } else if (PlayerModeStr.CompareNoCase("ONI")==0) { - GAMESTATE->m_PlayMode = PLAY_MODE_ONI; - } else if (PlayerModeStr.CompareNoCase("BATTLE")==0) { - GAMESTATE->m_PlayMode = PLAY_MODE_BATTLE; - } else if (PlayerModeStr.CompareNoCase("RAVE")==0) { - GAMESTATE->m_PlayMode = PLAY_MODE_RAVE; - } - loc = loc2+1; - } -} - - //I am adding this for Network support //Feel free to change the way --course is used //I am not building any part of SMOnline specific to this yet. diff --git a/stepmania/src/NetworkSyncManager.h b/stepmania/src/NetworkSyncManager.h index ce5758be6d..6504e7dc0a 100644 --- a/stepmania/src/NetworkSyncManager.h +++ b/stepmania/src/NetworkSyncManager.h @@ -17,7 +17,6 @@ void NSSendSongs(); void ArgStartCourse(CString CourseName); -void ArgSetMode (CString cmdLineMode); class EzSockets; diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index 62f7bac202..132d3bae6c 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -925,8 +925,6 @@ static void ProcessArgsSecond() //"ArgStartCourse", is in the NSManager //bacause Networked StepMania will //use it a lot. - if( GetCommandlineArgument( "mode",& Argument ) ) - ArgSetMode(Argument); if( GetCommandlineArgument( "netip" ) ) NSMAN->DisplayStartupStatus(); //If we're using networking show what happend