Fix spacing style

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
+32 -20
View File
@@ -25,7 +25,8 @@ OptionRowData g_ProfileLine[1] = {
OptionRowData("Profile",false)
};
ScreenSMOnlineLogin::ScreenSMOnlineLogin(CString sClassName) : ScreenOptions(sClassName) {
ScreenSMOnlineLogin::ScreenSMOnlineLogin(CString sClassName) : ScreenOptions(sClassName)
{
LOG->Trace( "ScreenSMOnlineLogin::ScreenSMOnlineLogin()" );
g_ProfileLine[0].choices.clear();
@@ -46,7 +47,8 @@ OptionRowData g_ProfileLine[1] = {
}
}
void ScreenSMOnlineLogin::ImportOptions() {
void ScreenSMOnlineLogin::ImportOptions()
{
vector<CString> vsProfiles;
PROFILEMAN->GetLocalProfileIDs( vsProfiles );
@@ -59,15 +61,13 @@ OptionRowData g_ProfileLine[1] = {
if( iter != vsProfiles.end() )
m_Rows[0]->SetOneSelection((PlayerNumber) 0, iter - vsProfiles.begin());
iter = find(
vsProfiles.begin(),
vsProfiles.end(),
PREFSMAN->m_sDefaultLocalProfileID[1] );
iter = find(vsProfiles.begin(), vsProfiles.end(), PREFSMAN->m_sDefaultLocalProfileID[1] );
if( iter != vsProfiles.end() )
m_Rows[0]->SetOneSelection((PlayerNumber) 1, iter - vsProfiles.begin());
}
void ScreenSMOnlineLogin::ExportOptions() {
void ScreenSMOnlineLogin::ExportOptions()
{
vector<CString> vsProfiles;
PROFILEMAN->GetLocalProfileIDs( vsProfiles );
@@ -78,30 +78,36 @@ OptionRowData g_ProfileLine[1] = {
PREFSMAN->m_sDefaultLocalProfileID[0] = vsProfiles[m_Rows[0]->GetOneSelection((PlayerNumber) 1)];
}
void ScreenSMOnlineLogin::GoToPrevScreen() {
void ScreenSMOnlineLogin::GoToPrevScreen()
{
SCREENMAN->SetNewScreen(PREV_SCREEN);
}
void ScreenSMOnlineLogin::GoToNextScreen() {
void ScreenSMOnlineLogin::GoToNextScreen()
{
PREFSMAN->SaveGlobalPrefsToDisk();
PROFILEMAN->LoadLocalProfileFromMachine((PlayerNumber) 0);
PROFILEMAN->LoadLocalProfileFromMachine((PlayerNumber) 1); //Update Profiles
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");
}
else {
else
{
m_iPlayer=0;
while(!GAMESTATE->IsPlayerEnabled((PlayerNumber) m_iPlayer))
++m_iPlayer;
SCREENMAN->Password(SM_PasswordDone, "You are logging on as:\n" + GAMESTATE->GetPlayerDisplayName((PlayerNumber) m_iPlayer) + "\n\nPlease enter your password.", NULL );
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) {
switch(SM) {
void ScreenSMOnlineLogin::HandleScreenMessage(const ScreenMessage SM)
{
switch(SM)
{
case SM_PasswordDone:
if(!ScreenTextEntry::s_bCancelledLast)
SendLogin(ScreenTextEntry::s_sLastAnswer);
@@ -111,16 +117,19 @@ OptionRowData g_ProfileLine[1] = {
case SM_SMOnlinePack:
int ResponceCode = NSMAN->m_SMOnlinePacket.Read1();
if (ResponceCode == 0) {
if (ResponceCode == 0)
{
int Status = NSMAN->m_SMOnlinePacket.Read1();
if(Status == 0) {
if(Status == 0)
{
NSMAN->isSMOLoggedIn[m_iPlayer++] = true;
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 );
else
SCREENMAN->SetNewScreen(NEXT_SCREEN);
}
else {
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 );
}
@@ -130,11 +139,13 @@ OptionRowData g_ProfileLine[1] = {
ScreenOptions::HandleScreenMessage(SM);
}
void ScreenSMOnlineLogin::MenuStart(PlayerNumber pn,const InputEventType type) {
void ScreenSMOnlineLogin::MenuStart(PlayerNumber pn,const InputEventType type)
{
ScreenOptions::MenuStart(pn,type);
}
CString ScreenSMOnlineLogin::GetSelectedProfileID() {
CString ScreenSMOnlineLogin::GetSelectedProfileID()
{
vector<CString> vsProfiles;
PROFILEMAN->GetLocalProfileIDs( vsProfiles );
@@ -145,7 +156,8 @@ OptionRowData g_ProfileLine[1] = {
return vsProfiles[ Selection-1 ];
}
void ScreenSMOnlineLogin::SendLogin(CString sPassword) {
void ScreenSMOnlineLogin::SendLogin(CString sPassword)
{
CString PlayerName = GAMESTATE->GetPlayerDisplayName((PlayerNumber) m_iPlayer);
CString HashedName;
CString PreHashedName;
-1
View File
@@ -4,7 +4,6 @@
#include "ScreenOptions.h"
class ScreenSMOnlineLogin : public ScreenOptions {
public:
ScreenSMOnlineLogin(CString sName);
virtual void HandleScreenMessage(const ScreenMessage SM);