From 7434ab383b6174b947492f78f895e35caaaac546 Mon Sep 17 00:00:00 2001 From: Charles Lohr Date: Tue, 31 Aug 2004 15:44:19 +0000 Subject: [PATCH] Added the basis for ScreenNetEvaluation. It doesn't ACTUALLY do anything yet, but this will make it easier to work on by committing it. --- stepmania/src/Makefile.am | 2 +- stepmania/src/NetworkSyncManager.cpp | 17 +++++++++++------ stepmania/src/Screen.cpp | 2 ++ stepmania/src/ScreenNetSelectMusic.cpp | 1 + stepmania/src/StepMania.dsp | 16 ++++++++++++---- stepmania/src/StepMania.vcproj | 6 ++++++ stepmania/src/StepManiaXbox.vcproj | 12 ++++++++++++ 7 files changed, 45 insertions(+), 11 deletions(-) diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am index afdba4b5e5..0219b2f9ad 100644 --- a/stepmania/src/Makefile.am +++ b/stepmania/src/Makefile.am @@ -29,7 +29,7 @@ ScreenClearBookkeepingData.cpp ScreenClearBookkeepingData.h ScreenClearMachineSt ScreenDownloadMachineStats.cpp ScreenDownloadMachineStats.h ScreenEdit.cpp ScreenEdit.h \ ScreenEditCoursesMenu.cpp ScreenEditCoursesMenu.h EditCoursesSongMenu.cpp EditCoursesSongMenu.h \ ScreenEditMenu.cpp ScreenEditMenu.h ScreenEnding.cpp ScreenEnding.h \ -ScreenEndlessBreak.cpp ScreenEndlessBreak.h ScreenEvaluation.cpp ScreenEvaluation.h ScreenExit.cpp ScreenExit.h \ +ScreenEndlessBreak.cpp ScreenEndlessBreak.h ScreenEvaluation.cpp ScreenEvaluation.h ScreenExit.cpp ScreenExit.h ScreenEvaluation.cpp ScreenNetEvaluation.h \ ScreenNetSelectMusic.cpp ScreenNetSlectMusic.h ScreenEz2SelectMusic.cpp ScreenEz2SelectMusic.h ScreenEz2SelectPlayer.cpp ScreenEz2SelectPlayer.h \ ScreenGameOver.cpp ScreenGameOver.h ScreenGameplay.cpp ScreenGameplay.h ScreenHowToPlay.cpp ScreenHowToPlay.h \ ScreenInstructions.cpp ScreenInstructions.h ScreenInsertCredit.cpp ScreenInsertCredit.h \ diff --git a/stepmania/src/NetworkSyncManager.cpp b/stepmania/src/NetworkSyncManager.cpp index 57e172f43c..0d187c273d 100644 --- a/stepmania/src/NetworkSyncManager.cpp +++ b/stepmania/src/NetworkSyncManager.cpp @@ -333,17 +333,17 @@ void NetworkSyncManager::StartRequest(short position) m_packet.ClearPacket(); - m_packet.Write1(3 ); + m_packet.Write1( 3 ); unsigned char ctr=0; Steps * tSteps; - tSteps = g_CurStageStats.vpSteps[PLAYER_1].back(); - if (tSteps!=NULL) + tSteps = GAMESTATE->m_pCurSteps[PLAYER_1]; + if ((tSteps!=NULL) && (GAMESTATE->IsPlayerEnabled(PLAYER_1))) ctr = uint8_t(ctr+tSteps->GetMeter()*16); - tSteps = g_CurStageStats.vpSteps[PLAYER_2].back(); - if (tSteps!=NULL) + tSteps = GAMESTATE->m_pCurSteps[PLAYER_2]; + if ((tSteps!=NULL) && (GAMESTATE->IsPlayerEnabled(PLAYER_2))) ctr = uint8_t(ctr+tSteps->GetMeter()); m_packet.Write1(ctr); @@ -491,7 +491,12 @@ void NetworkSyncManager::ProcessInput() case 1: //These are in responce to when/if we send packet 0's case 2: //This is already taken care of by the blocking code earlier on case 3: //This is taken care of by the blocking start code - case 4: //Undefined + break; + case 4: + { + + } + break; case 5: //Scoreboard Update { //Ease scope int ColumnNumber=m_packet.Read1(); diff --git a/stepmania/src/Screen.cpp b/stepmania/src/Screen.cpp index bf27331798..b7e262b19e 100644 --- a/stepmania/src/Screen.cpp +++ b/stepmania/src/Screen.cpp @@ -267,6 +267,7 @@ void Screen::ClearMessageQueue( const ScreenMessage SM ) #include "ScreenTestSound.h" #include "ScreenTitleMenu.h" #include "ScreenNetSelectMusic.h" +#include "ScreenNetEvaluation.h" #include "ScreenEz2SelectMusic.h" #include "ScreenRanking.h" #include "ScreenLogo.h" @@ -338,6 +339,7 @@ Screen* Screen::Create( CString sClassName ) IF_RETURN( ScreenTitleMenu ); IF_RETURN( ScreenEz2SelectMusic ); IF_RETURN( ScreenNetSelectMusic ); + IF_RETURN( ScreenNetEvaluation ); IF_RETURN( ScreenRanking ); IF_RETURN( ScreenLogo ); IF_RETURN( ScreenUnlock ); diff --git a/stepmania/src/ScreenNetSelectMusic.cpp b/stepmania/src/ScreenNetSelectMusic.cpp index ceea2ec825..281b9951d4 100644 --- a/stepmania/src/ScreenNetSelectMusic.cpp +++ b/stepmania/src/ScreenNetSelectMusic.cpp @@ -652,6 +652,7 @@ void ScreenNetSelectMusic::UpdateGroupsListPos() } m_textGroups.SetText( GroupsDisplay ); } + void ScreenNetSelectMusic::UpdateSongsList() { m_vSongs.clear(); diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp index 247d2049ce..557ac44a34 100644 --- a/stepmania/src/StepMania.dsp +++ b/stepmania/src/StepMania.dsp @@ -59,10 +59,10 @@ LINK32=link.exe # SUBTRACT LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib # Begin Special Build Tool IntDir=.\../Debug6 -TargetDir=\StepMania CVS\Program +TargetDir=\stepmania\stepmania\Program TargetName=StepMania-debug SOURCE="$(InputPath)" -PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ +PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi # End Special Build Tool @@ -96,10 +96,10 @@ LINK32=link.exe # SUBTRACT LINK32 /verbose /pdb:none /debug # Begin Special Build Tool IntDir=.\../Release6 -TargetDir=\StepMania CVS\Program +TargetDir=\stepmania\stepmania\Program TargetName=StepMania SOURCE="$(InputPath)" -PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ +PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi # End Special Build Tool @@ -2579,6 +2579,14 @@ SOURCE=.\ScreenNameEntryTraditional.h # End Source File # Begin Source File +SOURCE=.\ScreenNetEvaluation.cpp +# End Source File +# Begin Source File + +SOURCE=.\ScreenNetEvaluation.h +# End Source File +# Begin Source File + SOURCE=.\ScreenNetSelectMusic.cpp # End Source File # Begin Source File diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj index 53b594ae02..ba36215f18 100644 --- a/stepmania/src/StepMania.vcproj +++ b/stepmania/src/StepMania.vcproj @@ -373,6 +373,12 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ + + + + diff --git a/stepmania/src/StepManiaXbox.vcproj b/stepmania/src/StepManiaXbox.vcproj index 09432ffb2e..1375bc4957 100644 --- a/stepmania/src/StepManiaXbox.vcproj +++ b/stepmania/src/StepManiaXbox.vcproj @@ -486,6 +486,18 @@ cl + + + + + + + +