tiberium/CNC_TS_and_RA2_Mission_Editor
1
0
Fork 0
mirror of https://github.com/electronicarts/CNC_TS_and_RA2_Mission_Editor.git synced 2025-04-30 09:01:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

some code format adjustment.

Browse source
This commit is contained in:
Zero Fanker 2024-11-25 18:47:43 -05:00
parent 82715d1d0b
commit 16db1564c3
2 changed files with 68 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
MissionEditor/FinalSunDlg.cpp
View file

@ -2179,39 +2179,35 @@ void CFinalSunDlg::OnHelpTipoftheday()
void CFinalSunDlg::UnloadAll()
{
int iQuit = MessageBox(GetLanguageStringACP("MainDialogExitQuestion"), GetLanguageStringACP("MainDialogExitQuestionCap"), MB_ICONQUESTION | MB_YESNO | MB_DEFBUTTON2);
if (iQuit == IDNO) return;
else {
try {
CShutDownDlg dlg(this);
dlg.ShowWindow(SW_SHOW);
dlg.UpdateWindow();
tiledata = 0;
theApp.m_loading->FreeAll();
rules.Clear();
ai.Clear();
art.Clear();
tiles_t.Clear();
tiles_s.Clear();
tiles_u.Clear();
Map->GetIniFile().Clear();
sound.Clear();
tutorial.Clear();
g_data.Clear();
language.Clear();
DestroyWindow();
} catch (...) {
DestroyWindow();
}
if (iQuit == IDNO) {
return;
}
try {
CShutDownDlg dlg(this);
dlg.ShowWindow(SW_SHOW);
dlg.UpdateWindow();
tiledata = nullptr;
theApp.m_loading->FreeAll();
rules.Clear();
ai.Clear();
art.Clear();
tiles_t.Clear();
tiles_s.Clear();
tiles_u.Clear();
Map->GetIniFile().Clear();
sound.Clear();
tutorial.Clear();
g_data.Clear();
language.Clear();
DestroyWindow();
} catch (...) {
DestroyWindow();
}
}
void CFinalSunDlg::OnOptionsSimpleview()

54
MissionEditor/Loading.cpp
View file

@ -3626,12 +3626,24 @@ void CLoading::FreeAll()
// MW fix: We need to set tiledata and tiledata_count to the old pointers again
int t = 0;
if (tiledata == &t_tiledata) t = 0;
if (tiledata == &s_tiledata) t = 1;
if (tiledata == &u_tiledata) t = 2;
if (tiledata == &un_tiledata) t = 3;
if (tiledata == &l_tiledata) t = 4;
if (tiledata == &d_tiledata) t = 4;
if (tiledata == &t_tiledata) {
t = 0;
}
if (tiledata == &s_tiledata) {
t = 1;
}
if (tiledata == &u_tiledata) {
t = 2;
}
if (tiledata == &un_tiledata) {
t = 3;
}
if (tiledata == &l_tiledata) {
t = 4;
}
if (tiledata == &d_tiledata) {
t = 4;
}
//try{
tiledata = &t_tiledata;
@ -3661,12 +3673,30 @@ void CLoading::FreeAll()
}*/
// MW Reset tiledata & tiledata_count
if (t == 0) { tiledata = &t_tiledata; tiledata_count = &t_tiledata_count; }
if (t == 1) { tiledata = &s_tiledata; tiledata_count = &s_tiledata_count; }
if (t == 2) { tiledata = &u_tiledata; tiledata_count = &u_tiledata_count; }
if (t == 3) { tiledata = &un_tiledata; tiledata_count = &un_tiledata_count; }
if (t == 4) { tiledata = &l_tiledata; tiledata_count = &l_tiledata_count; }
if (t == 5) { tiledata = &d_tiledata; tiledata_count = &d_tiledata_count; }
if (t == 0) {
tiledata = &t_tiledata;
tiledata_count = &t_tiledata_count;
}
if (t == 1) {
tiledata = &s_tiledata;
tiledata_count = &s_tiledata_count;
}
if (t == 2) {
tiledata = &u_tiledata;
tiledata_count = &u_tiledata_count;
}
if (t == 3) {
tiledata = &un_tiledata;
tiledata_count = &un_tiledata_count;
}
if (t == 4) {
tiledata = &l_tiledata;
tiledata_count = &l_tiledata_count;
}
if (t == 5) {
tiledata = &d_tiledata;
tiledata_count = &d_tiledata_count;
}
map<CString, PICDATA>::iterator i = pics.begin();
for (int e = 0; e < pics.size(); e++) {