actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix spacing style

Browse Source
This commit is contained in:
Josh Allen
2005-02-08 23:55:07 +00:00
parent 58510d151d
commit 891125b2df
2 changed files with 78 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSMOnlineLogin.cpp
+74 -62
View File
@@ -25,7 +25,8 @@ OptionRowData g_ProfileLine[1] = {
OptionRowData("Profile",false) OptionRowData("Profile",false)
}; };
ScreenSMOnlineLogin::ScreenSMOnlineLogin(CString sClassName) : ScreenOptions(sClassName) { ScreenSMOnlineLogin::ScreenSMOnlineLogin(CString sClassName) : ScreenOptions(sClassName)
{
LOG->Trace( "ScreenSMOnlineLogin::ScreenSMOnlineLogin()" ); LOG->Trace( "ScreenSMOnlineLogin::ScreenSMOnlineLogin()" );
g_ProfileLine[0].choices.clear(); g_ProfileLine[0].choices.clear();
@@ -33,20 +34,21 @@ OptionRowData g_ProfileLine[1] = {
if(!g_ProfileLine[0].choices.size()) if(!g_ProfileLine[0].choices.size())
{ {
SCREENMAN->SystemMessage("You Must Define A Profile!"); SCREENMAN->SystemMessage("You Must Define A Profile!");
SCREENMAN->SetNewScreen("ScreenProfileOptions"); SCREENMAN->SetNewScreen("ScreenProfileOptions");
} }
else else
{ {
InitMenu(INPUTMODE_SHARE_CURSOR, g_ProfileLine, 1); InitMenu(INPUTMODE_SHARE_CURSOR, g_ProfileLine, 1);
SOUND->PlayMusic( THEME->GetPathS("ScreenMachineOptions","music")); SOUND->PlayMusic( THEME->GetPathS("ScreenMachineOptions", "music"));
Row &row = *m_Rows.back(); Row &row = *m_Rows.back();
BitmapText *bt = row.m_textItems.back(); BitmapText *bt = row.m_textItems.back();
bt->SetText("Login"); //Change "Exit" Text bt->SetText("Login"); //Change "Exit" Text
} }
} }
void ScreenSMOnlineLogin::ImportOptions() { void ScreenSMOnlineLogin::ImportOptions()
{
vector<CString> vsProfiles; vector<CString> vsProfiles;
PROFILEMAN->GetLocalProfileIDs( vsProfiles ); PROFILEMAN->GetLocalProfileIDs( vsProfiles );
@@ -59,82 +61,91 @@ OptionRowData g_ProfileLine[1] = {
if( iter != vsProfiles.end() ) if( iter != vsProfiles.end() )
m_Rows[0]->SetOneSelection((PlayerNumber) 0, iter - vsProfiles.begin()); m_Rows[0]->SetOneSelection((PlayerNumber) 0, iter - vsProfiles.begin());
iter = find( iter = find(vsProfiles.begin(), vsProfiles.end(), PREFSMAN->m_sDefaultLocalProfileID[1] );
vsProfiles.begin(),
vsProfiles.end(),
PREFSMAN->m_sDefaultLocalProfileID[1] );
if( iter != vsProfiles.end() ) if( iter != vsProfiles.end() )
m_Rows[0]->SetOneSelection((PlayerNumber) 1, iter - vsProfiles.begin()); m_Rows[0]->SetOneSelection((PlayerNumber) 1, iter - vsProfiles.begin());
} }
void ScreenSMOnlineLogin::ExportOptions() { void ScreenSMOnlineLogin::ExportOptions()
{
vector<CString> vsProfiles; vector<CString> vsProfiles;
PROFILEMAN->GetLocalProfileIDs( vsProfiles ); PROFILEMAN->GetLocalProfileIDs( vsProfiles );
if(GAMESTATE->IsPlayerEnabled((PlayerNumber) 0)) if(GAMESTATE->IsPlayerEnabled((PlayerNumber) 0))
PREFSMAN->m_sDefaultLocalProfileID[0] = vsProfiles[m_Rows[0]->GetOneSelection((PlayerNumber) 0)]; PREFSMAN->m_sDefaultLocalProfileID[0] = vsProfiles[m_Rows[0]->GetOneSelection((PlayerNumber) 0)];
if(GAMESTATE->IsPlayerEnabled((PlayerNumber) 1)) if(GAMESTATE->IsPlayerEnabled((PlayerNumber) 1))
PREFSMAN->m_sDefaultLocalProfileID[0] = vsProfiles[m_Rows[0]->GetOneSelection((PlayerNumber) 1)]; PREFSMAN->m_sDefaultLocalProfileID[0] = vsProfiles[m_Rows[0]->GetOneSelection((PlayerNumber) 1)];
} }
void ScreenSMOnlineLogin::GoToPrevScreen() { void ScreenSMOnlineLogin::GoToPrevScreen()
{
SCREENMAN->SetNewScreen(PREV_SCREEN); SCREENMAN->SetNewScreen(PREV_SCREEN);
} }
void ScreenSMOnlineLogin::GoToNextScreen() { void ScreenSMOnlineLogin::GoToNextScreen()
PREFSMAN->SaveGlobalPrefsToDisk(); {
PREFSMAN->SaveGlobalPrefsToDisk();
PROFILEMAN->LoadLocalProfileFromMachine((PlayerNumber) 0); PROFILEMAN->LoadLocalProfileFromMachine((PlayerNumber) 0);
PROFILEMAN->LoadLocalProfileFromMachine((PlayerNumber) 1); //Update Profiles PROFILEMAN->LoadLocalProfileFromMachine((PlayerNumber) 1); //Update Profiles
if(GAMESTATE->IsPlayerEnabled((PlayerNumber) 0) && GAMESTATE->IsPlayerEnabled((PlayerNumber) 1) && if(GAMESTATE->IsPlayerEnabled((PlayerNumber) 0) && GAMESTATE->IsPlayerEnabled((PlayerNumber) 1) &&
(GAMESTATE->GetPlayerDisplayName((PlayerNumber) 0) == GAMESTATE->GetPlayerDisplayName((PlayerNumber) 1))) { (GAMESTATE->GetPlayerDisplayName((PlayerNumber) 0) == GAMESTATE->GetPlayerDisplayName((PlayerNumber) 1)))
SCREENMAN->SystemMessage("Each Player Needs A Unique Profile!"); {
SCREENMAN->SetNewScreen("ScreenSMOnlineLogin"); SCREENMAN->SystemMessage("Each Player Needs A Unique Profile!");
SCREENMAN->SetNewScreen("ScreenSMOnlineLogin");
} }
else { else
m_iPlayer=0; {
while(!GAMESTATE->IsPlayerEnabled((PlayerNumber) m_iPlayer)) m_iPlayer=0;
++m_iPlayer; while(!GAMESTATE->IsPlayerEnabled((PlayerNumber) m_iPlayer))
SCREENMAN->Password(SM_PasswordDone, "You are logging on as:\n" + GAMESTATE->GetPlayerDisplayName((PlayerNumber) m_iPlayer) + "\n\nPlease enter your password.", NULL ); ++m_iPlayer;
SCREENMAN->Password(SM_PasswordDone, "You are logging on as:\n" + GAMESTATE->GetPlayerDisplayName((PlayerNumber) m_iPlayer) + "\n\nPlease enter you password.", NULL );
} }
} }
void ScreenSMOnlineLogin::HandleScreenMessage(const ScreenMessage SM) { void ScreenSMOnlineLogin::HandleScreenMessage(const ScreenMessage SM)
switch(SM) { {
case SM_PasswordDone: switch(SM)
{
case SM_PasswordDone:
if(!ScreenTextEntry::s_bCancelledLast) if(!ScreenTextEntry::s_bCancelledLast)
SendLogin(ScreenTextEntry::s_sLastAnswer); SendLogin(ScreenTextEntry::s_sLastAnswer);
else else
SCREENMAN->SetNewScreen(PREV_SCREEN); SCREENMAN->SetNewScreen(PREV_SCREEN);
break; break;
case SM_SMOnlinePack: case SM_SMOnlinePack:
int ResponceCode = NSMAN->m_SMOnlinePacket.Read1(); int ResponceCode = NSMAN->m_SMOnlinePacket.Read1();
if (ResponceCode == 0) { if (ResponceCode == 0)
int Status = NSMAN->m_SMOnlinePacket.Read1(); {
if(Status == 0) { int Status = NSMAN->m_SMOnlinePacket.Read1();
NSMAN->isSMOLoggedIn[m_iPlayer++] = true; if(Status == 0)
if(GAMESTATE->IsPlayerEnabled((PlayerNumber) m_iPlayer)) {
SCREENMAN->Password(SM_PasswordDone, "You are logging on as:\n" + GAMESTATE->GetPlayerDisplayName((PlayerNumber) m_iPlayer) + "\n\nPlease enter you password.", NULL ); NSMAN->isSMOLoggedIn[m_iPlayer++] = true;
else if(GAMESTATE->IsPlayerEnabled((PlayerNumber) m_iPlayer))
SCREENMAN->SetNewScreen(NEXT_SCREEN); SCREENMAN->Password(SM_PasswordDone, "You are logging on as:\n" + GAMESTATE->GetPlayerDisplayName((PlayerNumber) m_iPlayer) + "\n\nPlease enter you password.", NULL );
} else
else { SCREENMAN->SetNewScreen(NEXT_SCREEN);
CString Responce = NSMAN->m_SMOnlinePacket.ReadNT(); }
SCREENMAN->Password( SM_PasswordDone, Responce + "\n\nYou are logging on as:\n" + GAMESTATE->GetPlayerDisplayName((PlayerNumber) m_iPlayer) + "\n\nPlease enter you password.", NULL ); else
} {
CString Responce = NSMAN->m_SMOnlinePacket.ReadNT();
SCREENMAN->Password( SM_PasswordDone, Responce + "\n\nYou are logging on as:\n" + GAMESTATE->GetPlayerDisplayName((PlayerNumber) m_iPlayer) + "\n\nPlease enter you password.", NULL );
}
} }
break; break;
} }
ScreenOptions::HandleScreenMessage(SM); ScreenOptions::HandleScreenMessage(SM);
} }
void ScreenSMOnlineLogin::MenuStart(PlayerNumber pn,const InputEventType type) { void ScreenSMOnlineLogin::MenuStart(PlayerNumber pn,const InputEventType type)
ScreenOptions::MenuStart(pn,type); {
} ScreenOptions::MenuStart(pn,type);
}
CString ScreenSMOnlineLogin::GetSelectedProfileID() { CString ScreenSMOnlineLogin::GetSelectedProfileID()
{
vector<CString> vsProfiles; vector<CString> vsProfiles;
PROFILEMAN->GetLocalProfileIDs( vsProfiles ); PROFILEMAN->GetLocalProfileIDs( vsProfiles );
@@ -143,9 +154,10 @@ OptionRowData g_ProfileLine[1] = {
if( !Selection ) if( !Selection )
return ""; return "";
return vsProfiles[ Selection-1 ]; return vsProfiles[ Selection-1 ];
} }
void ScreenSMOnlineLogin::SendLogin(CString sPassword) { void ScreenSMOnlineLogin::SendLogin(CString sPassword)
{
CString PlayerName = GAMESTATE->GetPlayerDisplayName((PlayerNumber) m_iPlayer); CString PlayerName = GAMESTATE->GetPlayerDisplayName((PlayerNumber) m_iPlayer);
CString HashedName; CString HashedName;
CString PreHashedName; CString PreHashedName;
@@ -185,7 +197,7 @@ OptionRowData g_ProfileLine[1] = {
NSMAN->m_SMOnlinePacket.WriteNT(PlayerName); NSMAN->m_SMOnlinePacket.WriteNT(PlayerName);
NSMAN->m_SMOnlinePacket.WriteNT(HashedName); NSMAN->m_SMOnlinePacket.WriteNT(HashedName);
NSMAN->SendSMOnline( ); NSMAN->SendSMOnline( );
} }
#endif #endif
stepmania/src/ScreenSMOnlineLogin.h
+2 -3
View File
@@ -4,14 +4,13 @@
#include "ScreenOptions.h" #include "ScreenOptions.h"
class ScreenSMOnlineLogin : public ScreenOptions { class ScreenSMOnlineLogin : public ScreenOptions {
public:
public:
ScreenSMOnlineLogin(CString sName); ScreenSMOnlineLogin(CString sName);
virtual void HandleScreenMessage(const ScreenMessage SM); virtual void HandleScreenMessage(const ScreenMessage SM);
virtual void MenuStart(PlayerNumber pn,const InputEventType type); virtual void MenuStart(PlayerNumber pn,const InputEventType type);
void SendLogin(CString sPassword); void SendLogin(CString sPassword);
private: private:
void ImportOptions(); void ImportOptions();
void ExportOptions(); void ExportOptions();
void GoToNextScreen(); void GoToNextScreen();