From 69209c38968c6f4066a772e0a51a2928749217de Mon Sep 17 00:00:00 2001 From: "FWoltermann@gmail.com" Date: Fri, 9 Dec 2011 19:00:23 +0000 Subject: Re-indenting the code to use standard tabs. Yes, I know this is pretty pointless, but who cares? --- Stars45/CmpSelectDlg.cpp | 830 +++++++++++++++++++++++------------------------ 1 file changed, 415 insertions(+), 415 deletions(-) (limited to 'Stars45/CmpSelectDlg.cpp') diff --git a/Stars45/CmpSelectDlg.cpp b/Stars45/CmpSelectDlg.cpp index 39b5923..d4ae5e8 100644 --- a/Stars45/CmpSelectDlg.cpp +++ b/Stars45/CmpSelectDlg.cpp @@ -1,15 +1,15 @@ /* Project Starshatter 4.5 - Destroyer Studios LLC - Copyright © 1997-2004. All Rights Reserved. + Destroyer Studios LLC + Copyright © 1997-2004. All Rights Reserved. - SUBSYSTEM: Stars.exe - FILE: CmpSelectDlg.cpp - AUTHOR: John DiCamillo + SUBSYSTEM: Stars.exe + FILE: CmpSelectDlg.cpp + AUTHOR: John DiCamillo - OVERVIEW - ======== - Mission Select Dialog Active Window class + OVERVIEW + ======== + Mission Select Dialog Active Window class */ #include "MemDebug.h" @@ -48,21 +48,21 @@ DEF_MAP_CLIENT(CmpSelectDlg, OnCampaignSelect); // +--------------------------------------------------------------------+ CmpSelectDlg::CmpSelectDlg(Screen* s, FormDef& def, MenuScreen* mgr) - : FormWindow(s, 0, 0, s->Width(), s->Height()), manager(mgr), - lst_campaigns(0), btn_new(0), btn_saved(0), btn_delete(0), - btn_accept(0), btn_cancel(0), description(0), stars(0), campaign(0), - selected_mission(-1), show_saved(false), loading(false), - loaded(false), hproc(0) +: FormWindow(s, 0, 0, s->Width(), s->Height()), manager(mgr), +lst_campaigns(0), btn_new(0), btn_saved(0), btn_delete(0), +btn_accept(0), btn_cancel(0), description(0), stars(0), campaign(0), +selected_mission(-1), show_saved(false), loading(false), +loaded(false), hproc(0) { - stars = Starshatter::GetInstance(); - select_msg = Game::GetText("CmpSelectDlg.select_msg"); - Init(def); + stars = Starshatter::GetInstance(); + select_msg = Game::GetText("CmpSelectDlg.select_msg"); + Init(def); } CmpSelectDlg::~CmpSelectDlg() { - StopLoadProc(); - images.destroy(); + StopLoadProc(); + images.destroy(); } // +--------------------------------------------------------------------+ @@ -70,42 +70,42 @@ CmpSelectDlg::~CmpSelectDlg() void CmpSelectDlg::RegisterControls() { - btn_new = (Button*) FindControl(100); - btn_saved = (Button*) FindControl(101); - btn_delete = (Button*) FindControl(102); - btn_accept = (Button*) FindControl( 1); - btn_cancel = (Button*) FindControl( 2); - - if (btn_new) - REGISTER_CLIENT(EID_CLICK, btn_new, CmpSelectDlg, OnNew); - - if (btn_saved) - REGISTER_CLIENT(EID_CLICK, btn_saved, CmpSelectDlg, OnSaved); - - if (btn_delete) { - btn_delete->SetEnabled(false); - REGISTER_CLIENT(EID_CLICK, btn_delete, CmpSelectDlg, OnDelete); - REGISTER_CLIENT(EID_USER_1, btn_delete, CmpSelectDlg, OnConfirmDelete); - } - - if (btn_accept) { - btn_accept->SetEnabled(false); - REGISTER_CLIENT(EID_CLICK, btn_accept, CmpSelectDlg, OnAccept); - } - - if (btn_cancel) { - btn_cancel->SetEnabled(true); - REGISTER_CLIENT(EID_CLICK, btn_cancel, CmpSelectDlg, OnCancel); - } - - description = FindControl(200); - - lst_campaigns = (ListBox*) FindControl(201); - - if (lst_campaigns) - REGISTER_CLIENT(EID_SELECT, lst_campaigns, CmpSelectDlg, OnCampaignSelect); - - ShowNewCampaigns(); + btn_new = (Button*) FindControl(100); + btn_saved = (Button*) FindControl(101); + btn_delete = (Button*) FindControl(102); + btn_accept = (Button*) FindControl( 1); + btn_cancel = (Button*) FindControl( 2); + + if (btn_new) + REGISTER_CLIENT(EID_CLICK, btn_new, CmpSelectDlg, OnNew); + + if (btn_saved) + REGISTER_CLIENT(EID_CLICK, btn_saved, CmpSelectDlg, OnSaved); + + if (btn_delete) { + btn_delete->SetEnabled(false); + REGISTER_CLIENT(EID_CLICK, btn_delete, CmpSelectDlg, OnDelete); + REGISTER_CLIENT(EID_USER_1, btn_delete, CmpSelectDlg, OnConfirmDelete); + } + + if (btn_accept) { + btn_accept->SetEnabled(false); + REGISTER_CLIENT(EID_CLICK, btn_accept, CmpSelectDlg, OnAccept); + } + + if (btn_cancel) { + btn_cancel->SetEnabled(true); + REGISTER_CLIENT(EID_CLICK, btn_cancel, CmpSelectDlg, OnCancel); + } + + description = FindControl(200); + + lst_campaigns = (ListBox*) FindControl(201); + + if (lst_campaigns) + REGISTER_CLIENT(EID_SELECT, lst_campaigns, CmpSelectDlg, OnCampaignSelect); + + ShowNewCampaigns(); } // +--------------------------------------------------------------------+ @@ -113,92 +113,92 @@ CmpSelectDlg::RegisterControls() void CmpSelectDlg::ExecFrame() { - if (Keyboard::KeyDown(VK_RETURN)) { - if (btn_accept && btn_accept->IsEnabled()) - OnAccept(0); - } - - AutoThreadSync a(sync); - - if (loaded) { - loaded = false; - - if (btn_cancel) - btn_cancel->SetEnabled(true); - - if (description && btn_accept) { - if (campaign) { - Campaign::SelectCampaign(campaign->Name()); - - if (load_index >= 0) { - if (lst_campaigns) { - images[load_index]->CopyBitmap(*campaign->GetImage(1)); - lst_campaigns->SetItemImage(load_index, images[load_index]); - } - - description->SetText(Text("") + - campaign->Name() + - Text("\n\n") + - Text("") + - Game::GetText("CmpSelectDlg.scenario") + - Text("\n\t") + - campaign->Description()); - } - else { - char time_buf[32]; - char score_buf[32]; - - double t = campaign->GetLoadTime() - campaign->GetStartTime(); - FormatDayTime(time_buf, t); - - sprintf(score_buf, "%d", campaign->GetPlayerTeamScore()); - - Text desc = Text("") + - campaign->Name() + - Text("\n\n") + - Text("") + - Game::GetText("CmpSelectDlg.scenario") + - Text("\n\t") + - campaign->Description() + - Text("\n\n") + - Game::GetText("CmpSelectDlg.campaign-time") + - Text("\n\t") + - time_buf + - Text("\n\n") + - Game::GetText("CmpSelectDlg.assignment") + - Text("\n\t"); - - if (campaign->GetPlayerGroup()) - desc += campaign->GetPlayerGroup()->GetDescription(); - else - desc += "n/a"; - - desc += Text("\n\n") + - Game::GetText("CmpSelectDlg.team-score") + - Text("\n\t") + - score_buf; - - description->SetText(desc); - } - - btn_accept->SetEnabled(true); - - if (btn_delete) - btn_delete->SetEnabled(show_saved); - } - else { - description->SetText(select_msg); - btn_accept->SetEnabled(true); - } - } - } + if (Keyboard::KeyDown(VK_RETURN)) { + if (btn_accept && btn_accept->IsEnabled()) + OnAccept(0); + } + + AutoThreadSync a(sync); + + if (loaded) { + loaded = false; + + if (btn_cancel) + btn_cancel->SetEnabled(true); + + if (description && btn_accept) { + if (campaign) { + Campaign::SelectCampaign(campaign->Name()); + + if (load_index >= 0) { + if (lst_campaigns) { + images[load_index]->CopyBitmap(*campaign->GetImage(1)); + lst_campaigns->SetItemImage(load_index, images[load_index]); + } + + description->SetText(Text("") + + campaign->Name() + + Text("\n\n") + + Text("") + + Game::GetText("CmpSelectDlg.scenario") + + Text("\n\t") + + campaign->Description()); + } + else { + char time_buf[32]; + char score_buf[32]; + + double t = campaign->GetLoadTime() - campaign->GetStartTime(); + FormatDayTime(time_buf, t); + + sprintf(score_buf, "%d", campaign->GetPlayerTeamScore()); + + Text desc = Text("") + + campaign->Name() + + Text("\n\n") + + Text("") + + Game::GetText("CmpSelectDlg.scenario") + + Text("\n\t") + + campaign->Description() + + Text("\n\n") + + Game::GetText("CmpSelectDlg.campaign-time") + + Text("\n\t") + + time_buf + + Text("\n\n") + + Game::GetText("CmpSelectDlg.assignment") + + Text("\n\t"); + + if (campaign->GetPlayerGroup()) + desc += campaign->GetPlayerGroup()->GetDescription(); + else + desc += "n/a"; + + desc += Text("\n\n") + + Game::GetText("CmpSelectDlg.team-score") + + Text("\n\t") + + score_buf; + + description->SetText(desc); + } + + btn_accept->SetEnabled(true); + + if (btn_delete) + btn_delete->SetEnabled(show_saved); + } + else { + description->SetText(select_msg); + btn_accept->SetEnabled(true); + } + } + } } bool CmpSelectDlg::CanClose() { - AutoThreadSync a(sync); - return !loading; + AutoThreadSync a(sync); + return !loading; } // +--------------------------------------------------------------------+ @@ -206,85 +206,85 @@ CmpSelectDlg::CanClose() void CmpSelectDlg::ShowNewCampaigns() { - AutoThreadSync a(sync); + AutoThreadSync a(sync); - if (loading && description) { - description->SetText(Game::GetText("CmpSelectDlg.already-loading")); - Button::PlaySound(Button::SND_REJECT); - return; - } + if (loading && description) { + description->SetText(Game::GetText("CmpSelectDlg.already-loading")); + Button::PlaySound(Button::SND_REJECT); + return; + } - if (btn_new) - btn_new->SetButtonState(1); + if (btn_new) + btn_new->SetButtonState(1); - if (btn_saved) - btn_saved->SetButtonState(0); + if (btn_saved) + btn_saved->SetButtonState(0); - if (btn_delete) - btn_delete->SetEnabled(false); + if (btn_delete) + btn_delete->SetEnabled(false); - if (lst_campaigns) { - images.destroy(); + if (lst_campaigns) { + images.destroy(); - lst_campaigns->SetSelectedStyle(ListBox::LIST_ITEM_STYLE_PLAIN); - lst_campaigns->SetLeading(0); - lst_campaigns->ClearItems(); - lst_campaigns->SetLineHeight(100); + lst_campaigns->SetSelectedStyle(ListBox::LIST_ITEM_STYLE_PLAIN); + lst_campaigns->SetLeading(0); + lst_campaigns->ClearItems(); + lst_campaigns->SetLineHeight(100); - Player* player = Player::GetCurrentPlayer(); - if (!player) return; + Player* player = Player::GetCurrentPlayer(); + if (!player) return; - ListIter iter = Campaign::GetAllCampaigns(); - while (++iter) { - Campaign* c = iter.value(); + ListIter iter = Campaign::GetAllCampaigns(); + while (++iter) { + Campaign* c = iter.value(); - if (c->GetCampaignId() < Campaign::SINGLE_MISSIONS) { - Bitmap* bmp = new(__FILE__,__LINE__) Bitmap; - bmp->CopyBitmap(*c->GetImage(0)); - images.append(bmp); + if (c->GetCampaignId() < Campaign::SINGLE_MISSIONS) { + Bitmap* bmp = new(__FILE__,__LINE__) Bitmap; + bmp->CopyBitmap(*c->GetImage(0)); + images.append(bmp); - int n = lst_campaigns->AddImage(bmp) - 1; - lst_campaigns->SetItemText(n, c->Name()); + int n = lst_campaigns->AddImage(bmp) - 1; + lst_campaigns->SetItemText(n, c->Name()); - // if campaign is not available, show the grayed-out image + // if campaign is not available, show the grayed-out image #ifdef STARSHATTER_DEMO_RELEASE - // DEMO VERSION (only one campaign): - if (c->GetCampaignId() > 2) { - images[n]->CopyBitmap(*c->GetImage(2)); - lst_campaigns->SetItemImage(n, images[n]); - } + // DEMO VERSION (only one campaign): + if (c->GetCampaignId() > 2) { + images[n]->CopyBitmap(*c->GetImage(2)); + lst_campaigns->SetItemImage(n, images[n]); + } #else - // FULL GAME CRITERIA (based on player record): - if (c->GetCampaignId() > 2 && c->GetCampaignId() < 10 && - !player->HasCompletedCampaign(c->GetCampaignId()-1)) { - images[n]->CopyBitmap(*c->GetImage(2)); - lst_campaigns->SetItemImage(n, images[n]); - } - - // Two additional sequences of ten campaigns (10-19 and 20-29) - // for mod authors to use: - else if (c->GetCampaignId() >= 10 && c->GetCampaignId() < 30 && - (c->GetCampaignId() % 10) != 0 && - !player->HasCompletedCampaign(c->GetCampaignId()-1)) { - images[n]->CopyBitmap(*c->GetImage(2)); - lst_campaigns->SetItemImage(n, images[n]); - } - - // NOTE: Campaigns 10, 20, and 30-99 are always enabled if they exist! + // FULL GAME CRITERIA (based on player record): + if (c->GetCampaignId() > 2 && c->GetCampaignId() < 10 && + !player->HasCompletedCampaign(c->GetCampaignId()-1)) { + images[n]->CopyBitmap(*c->GetImage(2)); + lst_campaigns->SetItemImage(n, images[n]); + } + + // Two additional sequences of ten campaigns (10-19 and 20-29) + // for mod authors to use: + else if (c->GetCampaignId() >= 10 && c->GetCampaignId() < 30 && + (c->GetCampaignId() % 10) != 0 && + !player->HasCompletedCampaign(c->GetCampaignId()-1)) { + images[n]->CopyBitmap(*c->GetImage(2)); + lst_campaigns->SetItemImage(n, images[n]); + } + + // NOTE: Campaigns 10, 20, and 30-99 are always enabled if they exist! #endif - } - } - } + } + } + } - if (description) - description->SetText(select_msg); + if (description) + description->SetText(select_msg); - if (btn_accept) - btn_accept->SetEnabled(false); + if (btn_accept) + btn_accept->SetEnabled(false); - show_saved = false; + show_saved = false; } // +--------------------------------------------------------------------+ @@ -292,47 +292,47 @@ CmpSelectDlg::ShowNewCampaigns() void CmpSelectDlg::ShowSavedCampaigns() { - AutoThreadSync a(sync); + AutoThreadSync a(sync); - if (loading && description) { - description->SetText(Game::GetText("CmpSelectDlg.already-loading")); - Button::PlaySound(Button::SND_REJECT); - return; - } + if (loading && description) { + description->SetText(Game::GetText("CmpSelectDlg.already-loading")); + Button::PlaySound(Button::SND_REJECT); + return; + } - if (btn_new) - btn_new->SetButtonState(0); + if (btn_new) + btn_new->SetButtonState(0); - if (btn_saved) - btn_saved->SetButtonState(1); + if (btn_saved) + btn_saved->SetButtonState(1); - if (btn_delete) - btn_delete->SetEnabled(false); + if (btn_delete) + btn_delete->SetEnabled(false); - if (lst_campaigns) { - lst_campaigns->SetSelectedStyle(ListBox::LIST_ITEM_STYLE_FILLED_BOX); - lst_campaigns->SetLeading(4); - lst_campaigns->ClearItems(); - lst_campaigns->SetLineHeight(12); + if (lst_campaigns) { + lst_campaigns->SetSelectedStyle(ListBox::LIST_ITEM_STYLE_FILLED_BOX); + lst_campaigns->SetLeading(4); + lst_campaigns->ClearItems(); + lst_campaigns->SetLineHeight(12); - List save_list; + List save_list; - CampaignSaveGame::GetSaveGameList(save_list); - save_list.sort(); + CampaignSaveGame::GetSaveGameList(save_list); + save_list.sort(); - for (int i = 0; i < save_list.size(); i++) - lst_campaigns->AddItem(*save_list[i]); + for (int i = 0; i < save_list.size(); i++) + lst_campaigns->AddItem(*save_list[i]); - save_list.destroy(); - } + save_list.destroy(); + } - if (description) - description->SetText(select_msg); + if (description) + description->SetText(select_msg); - if (btn_accept) - btn_accept->SetEnabled(false); + if (btn_accept) + btn_accept->SetEnabled(false); - show_saved = true; + show_saved = true; } // +--------------------------------------------------------------------+ @@ -340,89 +340,89 @@ CmpSelectDlg::ShowSavedCampaigns() void CmpSelectDlg::OnCampaignSelect(AWEvent* event) { - if (description && lst_campaigns) { - AutoThreadSync a(sync); + if (description && lst_campaigns) { + AutoThreadSync a(sync); - if (loading) { - description->SetText(Game::GetText("CmpSelectDlg.already-loading")); - Button::PlaySound(Button::SND_REJECT); - return; - } + if (loading) { + description->SetText(Game::GetText("CmpSelectDlg.already-loading")); + Button::PlaySound(Button::SND_REJECT); + return; + } - load_index = -1; - load_file = ""; + load_index = -1; + load_file = ""; - Player* player = Player::GetCurrentPlayer(); - if (!player) return; + Player* player = Player::GetCurrentPlayer(); + if (!player) return; - // NEW CAMPAIGN: - if (btn_new && btn_new->GetButtonState()) { - List& list = Campaign::GetAllCampaigns(); + // NEW CAMPAIGN: + if (btn_new && btn_new->GetButtonState()) { + List& list = Campaign::GetAllCampaigns(); - for (int i = 0; i < lst_campaigns->NumItems(); i++) { - Campaign* c = list[i]; + for (int i = 0; i < lst_campaigns->NumItems(); i++) { + Campaign* c = list[i]; - // is campaign available? + // is campaign available? #ifdef STARSHATTER_DEMO_RELEASE - // DEMO VERSION (only one campaign): - if (c->GetCampaignId() <= 2) + // DEMO VERSION (only one campaign): + if (c->GetCampaignId() <= 2) #else - // FULL GAME CRITERIA (based on player record): - if (c->GetCampaignId() <= 2 || - player->HasCompletedCampaign(c->GetCampaignId()-1)) + // FULL GAME CRITERIA (based on player record): + if (c->GetCampaignId() <= 2 || + player->HasCompletedCampaign(c->GetCampaignId()-1)) #endif - { - - if (lst_campaigns->IsSelected(i)) { - images[i]->CopyBitmap(*c->GetImage(1)); - lst_campaigns->SetItemImage(i, images[i]); - - AutoThreadSync a(sync); - load_index = i; - } - else { - images[i]->CopyBitmap(*c->GetImage(0)); - lst_campaigns->SetItemImage(i, images[i]); - } - } - - // if not, then don't select - else { - images[i]->CopyBitmap(*c->GetImage(2)); - lst_campaigns->SetItemImage(i, images[i]); - - if (lst_campaigns->IsSelected(i)) { - description->SetText(select_msg); - } - } - } - } - - // SAVED CAMPAIGN: - else { - int seln = lst_campaigns->GetSelection(); - - if (seln < 0) { - description->SetText(select_msg); - } - - else { - load_index = -1; - load_file = lst_campaigns->GetItemText(seln); - } - } - - if (btn_accept) - btn_accept->SetEnabled(false); - } - - if (!loading && (load_index >= 0 || load_file.length() > 0)) { - if (btn_cancel) - btn_cancel->SetEnabled(false); - - StartLoadProc(); - } + { + + if (lst_campaigns->IsSelected(i)) { + images[i]->CopyBitmap(*c->GetImage(1)); + lst_campaigns->SetItemImage(i, images[i]); + + AutoThreadSync a(sync); + load_index = i; + } + else { + images[i]->CopyBitmap(*c->GetImage(0)); + lst_campaigns->SetItemImage(i, images[i]); + } + } + + // if not, then don't select + else { + images[i]->CopyBitmap(*c->GetImage(2)); + lst_campaigns->SetItemImage(i, images[i]); + + if (lst_campaigns->IsSelected(i)) { + description->SetText(select_msg); + } + } + } + } + + // SAVED CAMPAIGN: + else { + int seln = lst_campaigns->GetSelection(); + + if (seln < 0) { + description->SetText(select_msg); + } + + else { + load_index = -1; + load_file = lst_campaigns->GetItemText(seln); + } + } + + if (btn_accept) + btn_accept->SetEnabled(false); + } + + if (!loading && (load_index >= 0 || load_file.length() > 0)) { + if (btn_cancel) + btn_cancel->SetEnabled(false); + + StartLoadProc(); + } } // +--------------------------------------------------------------------+ @@ -430,8 +430,8 @@ CmpSelectDlg::OnCampaignSelect(AWEvent* event) void CmpSelectDlg::Show() { - FormWindow::Show(); - ShowNewCampaigns(); + FormWindow::Show(); + ShowNewCampaigns(); } // +--------------------------------------------------------------------+ @@ -439,61 +439,61 @@ CmpSelectDlg::Show() void CmpSelectDlg::OnNew(AWEvent* event) { - ShowNewCampaigns(); + ShowNewCampaigns(); } void CmpSelectDlg::OnSaved(AWEvent* event) { - ShowSavedCampaigns(); + ShowSavedCampaigns(); } void CmpSelectDlg::OnDelete(AWEvent* event) { - load_file = ""; - - if (lst_campaigns) { - int seln = lst_campaigns->GetSelection(); - - if (seln < 0) { - description->SetText(select_msg); - btn_accept->SetEnabled(false); - } - - else { - load_index = -1; - load_file = lst_campaigns->GetItemText(seln); - } - } - - if (load_file.length()) { - ConfirmDlg* confirm = manager->GetConfirmDlg(); - if (confirm) { - char msg[256]; - sprintf(msg, Game::GetText("CmpSelectDlg.are-you-sure"), load_file.data()); - confirm->SetMessage(msg); - confirm->SetTitle(Game::GetText("CmpSelectDlg.confirm")); - - manager->ShowConfirmDlg(); - } - - else { - OnConfirmDelete(event); - } - } - - ShowSavedCampaigns(); + load_file = ""; + + if (lst_campaigns) { + int seln = lst_campaigns->GetSelection(); + + if (seln < 0) { + description->SetText(select_msg); + btn_accept->SetEnabled(false); + } + + else { + load_index = -1; + load_file = lst_campaigns->GetItemText(seln); + } + } + + if (load_file.length()) { + ConfirmDlg* confirm = manager->GetConfirmDlg(); + if (confirm) { + char msg[256]; + sprintf(msg, Game::GetText("CmpSelectDlg.are-you-sure"), load_file.data()); + confirm->SetMessage(msg); + confirm->SetTitle(Game::GetText("CmpSelectDlg.confirm")); + + manager->ShowConfirmDlg(); + } + + else { + OnConfirmDelete(event); + } + } + + ShowSavedCampaigns(); } void CmpSelectDlg::OnConfirmDelete(AWEvent* event) { - if (load_file.length()) { - CampaignSaveGame::Delete(load_file); - } + if (load_file.length()) { + CampaignSaveGame::Delete(load_file); + } - ShowSavedCampaigns(); + ShowSavedCampaigns(); } // +--------------------------------------------------------------------+ @@ -501,26 +501,26 @@ CmpSelectDlg::OnConfirmDelete(AWEvent* event) void CmpSelectDlg::OnAccept(AWEvent* event) { - AutoThreadSync a(sync); + AutoThreadSync a(sync); - if (loading) - return; + if (loading) + return; - // if this is to be a new campaign, - // re-instaniate the campaign object - if (btn_new->GetButtonState()) - Campaign::GetCampaign()->Load(); - else - Game::ResetGameTime(); + // if this is to be a new campaign, + // re-instaniate the campaign object + if (btn_new->GetButtonState()) + Campaign::GetCampaign()->Load(); + else + Game::ResetGameTime(); - Mouse::Show(false); - stars->SetGameMode(Starshatter::CLOD_MODE); + Mouse::Show(false); + stars->SetGameMode(Starshatter::CLOD_MODE); } void CmpSelectDlg::OnCancel(AWEvent* event) { - manager->ShowMenuDlg(); + manager->ShowMenuDlg(); } // +--------------------------------------------------------------------+ @@ -530,94 +530,94 @@ DWORD WINAPI CmpSelectDlgLoadProc(LPVOID link); void CmpSelectDlg::StartLoadProc() { - if (hproc != 0) { - DWORD result = 0; - GetExitCodeThread(hproc, &result); - - if (result != STILL_ACTIVE) { - CloseHandle(hproc); - hproc = 0; - } - else { - return; - } - } - - if (hproc == 0) { - campaign = 0; - loading = true; - loaded = false; - - if (description) - description->SetText(Game::GetText("CmpSelectDlg.loading")); - - DWORD thread_id = 0; - hproc = CreateThread(0, 4096, CmpSelectDlgLoadProc, (LPVOID) this, 0, &thread_id); - - if (hproc == 0) { - static int report = 10; - if (report > 0) { - ::Print("WARNING: CmpSelectDlg() failed to create thread (err=%08x)\n", GetLastError()); - report--; - - if (report == 0) - ::Print(" Further warnings of this type will be supressed.\n"); - } - } - } + if (hproc != 0) { + DWORD result = 0; + GetExitCodeThread(hproc, &result); + + if (result != STILL_ACTIVE) { + CloseHandle(hproc); + hproc = 0; + } + else { + return; + } + } + + if (hproc == 0) { + campaign = 0; + loading = true; + loaded = false; + + if (description) + description->SetText(Game::GetText("CmpSelectDlg.loading")); + + DWORD thread_id = 0; + hproc = CreateThread(0, 4096, CmpSelectDlgLoadProc, (LPVOID) this, 0, &thread_id); + + if (hproc == 0) { + static int report = 10; + if (report > 0) { + ::Print("WARNING: CmpSelectDlg() failed to create thread (err=%08x)\n", GetLastError()); + report--; + + if (report == 0) + ::Print(" Further warnings of this type will be supressed.\n"); + } + } + } } void CmpSelectDlg::StopLoadProc() { - if (hproc != 0) { - WaitForSingleObject(hproc, 2500); - CloseHandle(hproc); - hproc = 0; - } + if (hproc != 0) { + WaitForSingleObject(hproc, 2500); + CloseHandle(hproc); + hproc = 0; + } } DWORD WINAPI CmpSelectDlgLoadProc(LPVOID link) { - CmpSelectDlg* dlg = (CmpSelectDlg*) link; + CmpSelectDlg* dlg = (CmpSelectDlg*) link; - if (dlg) - return dlg->LoadProc(); + if (dlg) + return dlg->LoadProc(); - return (DWORD) E_POINTER; + return (DWORD) E_POINTER; } DWORD CmpSelectDlg::LoadProc() { - Campaign* c = 0; + Campaign* c = 0; - // NEW CAMPAIGN: - if (load_index >= 0) { - List& list = Campaign::GetAllCampaigns(); + // NEW CAMPAIGN: + if (load_index >= 0) { + List& list = Campaign::GetAllCampaigns(); - if (load_index < list.size()) { - c = list[load_index]; - c->Load(); - } - } + if (load_index < list.size()) { + c = list[load_index]; + c->Load(); + } + } - // SAVED CAMPAIGN: - else { - CampaignSaveGame savegame; - savegame.Load(load_file); - c = savegame.GetCampaign(); - } + // SAVED CAMPAIGN: + else { + CampaignSaveGame savegame; + savegame.Load(load_file); + c = savegame.GetCampaign(); + } - sync.acquire(); + sync.acquire(); - loading = false; - loaded = true; - campaign = c; + loading = false; + loaded = true; + campaign = c; - sync.release(); + sync.release(); - return 0; + return 0; } // +--------------------------------------------------------------------+ -- cgit v1.1