Skip to content

Commit fb47686

Browse files
segraxsegrax
committed
Fixes for QT6 and latest openfodder
1 parent 328cc84 commit fb47686

9 files changed

Lines changed: 350 additions & 141 deletions

File tree

‎Dependencies/OpenFodder‎

‎Project/VS2017/ofed.sln‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,27 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26730.16
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29020.237
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Editor", "ofed.vcxproj", "{B12702AD-ABFB-343A-A199-8E24837244A3}"
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Win32 = Debug|Win32
1011
Debug|x64 = Debug|x64
1112
Debug|x86 = Debug|x86
13+
Release|Win32 = Release|Win32
1214
Release|x64 = Release|x64
1315
Release|x86 = Release|x86
1416
EndGlobalSection
1517
GlobalSection(ProjectConfigurationPlatforms) = postSolution
18+
{B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|Win32.ActiveCfg = Debug|Win32
19+
{B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|Win32.Build.0 = Debug|Win32
1620
{B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|x64.ActiveCfg = Debug|x64
1721
{B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|x64.Build.0 = Debug|x64
1822
{B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|x86.ActiveCfg = Debug|x64
23+
{B12702AD-ABFB-343A-A199-8E24837244A3}.Release|Win32.ActiveCfg = Release|Win32
24+
{B12702AD-ABFB-343A-A199-8E24837244A3}.Release|Win32.Build.0 = Release|Win32
1925
{B12702AD-ABFB-343A-A199-8E24837244A3}.Release|x64.ActiveCfg = Release|x64
2026
{B12702AD-ABFB-343A-A199-8E24837244A3}.Release|x64.Build.0 = Release|x64
2127
{B12702AD-ABFB-343A-A199-8E24837244A3}.Release|x86.ActiveCfg = Release|x64
@@ -24,6 +30,7 @@ Global
2430
HideSolutionNode = FALSE
2531
EndGlobalSection
2632
GlobalSection(ExtensibilityGlobals) = postSolution
33+
Qt5Version = 6.1.2_msvc2019_64
2734
SolutionGuid = {24D864EF-7D69-4937-8B10-36F77936383D}
2835
EndGlobalSection
2936
EndGlobal

‎Project/VS2017/ofed.vcxproj‎

Lines changed: 150 additions & 9 deletions
Large diffs are not rendered by default.

‎Project/VS2017/ofed.vcxproj.filters‎

Lines changed: 54 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@
4545
<Filter Include="Source Files\Models">
4646
<UniqueIdentifier>{24688922-079c-41ab-a6f8-8afc10e54dcd}</UniqueIdentifier>
4747
</Filter>
48+
<Filter Include="OpenFodder\Map">
49+
<UniqueIdentifier>{0517ef7d-afd3-440c-b63b-779837b512cd}</UniqueIdentifier>
50+
</Filter>
4851
</ItemGroup>
4952
<ItemGroup>
5053
<ClCompile Include="..\..\Source\ofed.cpp">
@@ -188,15 +191,36 @@
188191
<ClCompile Include="..\..\Dependencies\OpenFodder\Source\Utils\SimplexNoise.cpp">
189192
<Filter>OpenFodder\Utils</Filter>
190193
</ClCompile>
191-
<ClCompile Include="..\..\Dependencies\OpenFodder\Source\Map.cpp">
192-
<Filter>OpenFodder</Filter>
193-
</ClCompile>
194194
<ClCompile Include="..\..\Dependencies\OpenFodder\Source\About.cpp">
195195
<Filter>OpenFodder</Filter>
196196
</ClCompile>
197197
<ClCompile Include="..\..\Dependencies\OpenFodder\Source\Parameters.cpp">
198198
<Filter>OpenFodder</Filter>
199199
</ClCompile>
200+
<ClCompile Include="..\..\Dependencies\OpenFodder\Source\Map\Map.cpp">
201+
<Filter>OpenFodder\Map</Filter>
202+
</ClCompile>
203+
<ClCompile Include="..\..\Dependencies\OpenFodder\Source\Map\Original.cpp">
204+
<Filter>OpenFodder\Map</Filter>
205+
</ClCompile>
206+
<ClCompile Include="..\..\Dependencies\OpenFodder\Source\Map\Random.cpp">
207+
<Filter>OpenFodder\Map</Filter>
208+
</ClCompile>
209+
<ClCompile Include="..\..\Dependencies\OpenFodder\Source\ScriptingEngine.cpp">
210+
<Filter>OpenFodder</Filter>
211+
</ClCompile>
212+
<ClCompile Include="..\..\Dependencies\OpenFodder\Source\Utils\duktape.cpp">
213+
<Filter>OpenFodder\Utils</Filter>
214+
</ClCompile>
215+
<ClCompile Include="..\..\Dependencies\OpenFodder\Source\MapData.cpp">
216+
<Filter>OpenFodder</Filter>
217+
</ClCompile>
218+
<ClCompile Include="..\..\Dependencies\OpenFodder\Source\Utils\micropather.cpp">
219+
<Filter>OpenFodder\Utils</Filter>
220+
</ClCompile>
221+
<ClCompile Include="..\..\Dependencies\OpenFodder\Source\Utils\SimplexIslands.cpp">
222+
<Filter>OpenFodder\Utils</Filter>
223+
</ClCompile>
200224
</ItemGroup>
201225
<ItemGroup>
202226
<QtUic Include="ofed.ui">
@@ -282,9 +306,6 @@
282306
<ClInclude Include="..\..\Dependencies\OpenFodder\Source\IntroData.hpp">
283307
<Filter>OpenFodder</Filter>
284308
</ClInclude>
285-
<ClInclude Include="..\..\Dependencies\OpenFodder\Source\Map.hpp">
286-
<Filter>OpenFodder</Filter>
287-
</ClInclude>
288309
<ClInclude Include="..\..\Dependencies\OpenFodder\Source\Position.hpp">
289310
<Filter>OpenFodder</Filter>
290311
</ClInclude>
@@ -420,6 +441,33 @@
420441
<ClInclude Include="..\..\Dependencies\OpenFodder\Source\Parameters.hpp">
421442
<Filter>OpenFodder</Filter>
422443
</ClInclude>
444+
<ClInclude Include="..\..\Dependencies\OpenFodder\Source\Map\Map.hpp">
445+
<Filter>OpenFodder\Map</Filter>
446+
</ClInclude>
447+
<ClInclude Include="..\..\Dependencies\OpenFodder\Source\Map\Original.hpp">
448+
<Filter>OpenFodder\Map</Filter>
449+
</ClInclude>
450+
<ClInclude Include="..\..\Dependencies\OpenFodder\Source\Map\Random.hpp">
451+
<Filter>OpenFodder\Map</Filter>
452+
</ClInclude>
453+
<ClInclude Include="..\..\Dependencies\OpenFodder\Source\ScriptingEngine.hpp">
454+
<Filter>OpenFodder</Filter>
455+
</ClInclude>
456+
<ClInclude Include="..\..\Dependencies\OpenFodder\Source\Utils\duk_config.h">
457+
<Filter>OpenFodder\Utils</Filter>
458+
</ClInclude>
459+
<ClInclude Include="..\..\Dependencies\OpenFodder\Source\Utils\duk_trans_socket.h">
460+
<Filter>OpenFodder\Utils</Filter>
461+
</ClInclude>
462+
<ClInclude Include="..\..\Dependencies\OpenFodder\Source\Utils\duktape.h">
463+
<Filter>OpenFodder\Utils</Filter>
464+
</ClInclude>
465+
<ClInclude Include="..\..\Dependencies\OpenFodder\Source\Utils\micropather.h">
466+
<Filter>OpenFodder\Utils</Filter>
467+
</ClInclude>
468+
<ClInclude Include="..\..\Dependencies\OpenFodder\Source\Utils\SimplexIslands.hpp">
469+
<Filter>OpenFodder\Utils</Filter>
470+
</ClInclude>
423471
</ItemGroup>
424472
<ItemGroup>
425473
<None Include="packages.config" />

‎Source/Dialogs/CampaignDialog.cpp‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ void cCampaignDialog::MissionClicked(QModelIndex pIndex) {
126126

127127
g_Fodder->mGame_Data.mMission_Number = pIndex.row() + 1;
128128
g_Fodder->mGame_Data.mMission_Current = g_Fodder->mGame_Data.mCampaign.getMission(pIndex.row() + 1);
129-
g_Fodder->mGame_Data.mPhase_Current = mMissionModel.GetMission()->GetPhase(pIndex.row() + 1);
129+
g_Fodder->mGame_Data.mPhase_Current = mMissionModel.GetMission()->PhaseGet(pIndex.row() + 1);
130130

131131
mMissionModel.SetMission(g_Fodder->mGame_Data.mCampaign.getMission(pIndex.row() + 1));
132132

@@ -187,7 +187,7 @@ void cCampaignDialog::LoadPhase(const size_t pNumber) {
187187
if (!mMissionModel.GetMission())
188188
return;
189189

190-
g_Fodder->mGame_Data.mPhase_Current = mMissionModel.GetMission()->GetPhase(pNumber);
190+
g_Fodder->mGame_Data.mPhase_Current = mMissionModel.GetMission()->PhaseGet(pNumber);
191191
if (!g_Fodder->mGame_Data.mPhase_Current)
192192
return;
193193

@@ -201,36 +201,36 @@ void cCampaignDialog::LoadPhase(const size_t pNumber) {
201201
for (auto& Goal : g_Fodder->mGame_Data.mPhase_Current->mGoals) {
202202

203203
switch (Goal) {
204-
case eGoal_None:
204+
case eObjective_None:
205205
break;
206-
case eGoal_Kill_All_Enemy:
206+
case eObjective_Kill_All_Enemy:
207207
mUi->checkBox_KillAllEnemy->setChecked(true);
208208
break;
209-
case eGoal_Destroy_Enemy_Buildings:
209+
case eObjective_Destroy_Enemy_Buildings:
210210
mUi->checkBox_DestroyEnemyBuildings->setChecked(true);
211211
break;
212-
case eGoal_Rescue_Hostages:
212+
case eObjective_Rescue_Hostages:
213213
mUi->checkBox_RescueHostages->setChecked(true);
214214
break;
215-
case eGoal_Protect_Civilians:
215+
case eObjective_Protect_Civilians:
216216
mUi->checkBox_ProtectCivilians->setChecked(true);
217217
break;
218-
case eGoal_Kidnap_Leader:
218+
case eObjective_Kidnap_Leader:
219219
mUi->checkBox_KidnapLeader->setChecked(true);
220220
break;
221-
case eGoal_Destroy_Factory:
221+
case eObjective_Destroy_Factory:
222222
mUi->checkBox_DestroyFactory->setChecked(true);
223223
break;
224-
case eGoal_Destroy_Computer:
224+
case eObjective_Destroy_Computer:
225225
mUi->checkBox_DestroyComputer->setChecked(true);
226226
break;
227-
case eGoal_Get_Civilian_Home:
227+
case eObjective_Get_Civilian_Home:
228228
mUi->checkBox_GetCivilianHome->setChecked(true);
229229
break;
230-
case eGoal_Activate_All_Switches:
230+
case eObjective_Activate_All_Switches:
231231
mUi->checkBox_ActivateAllSwitches->setChecked(true);
232232
break;
233-
case eGoal_Rescue_Hostage:
233+
case eObjective_Rescue_Hostage:
234234
mUi->checkBox_RescueHostage->setChecked(true);
235235
break;
236236
}
@@ -266,59 +266,59 @@ void cCampaignDialog::Goal_ResetCheckboxes() {
266266
void cCampaignDialog::Goal_KillAllEnemy(int pValue) {
267267
if (mLoadingMission)
268268
return;
269-
g_Fodder->mGame_Data.mPhase_Current->SetGoal(eGoal_Kill_All_Enemy, pValue);
269+
g_Fodder->mGame_Data.mPhase_Current->SetGoal(eObjective_Kill_All_Enemy, pValue);
270270
}
271271

272272
void cCampaignDialog::Goal_DestroyEnemyBuildings(int pValue) {
273273
if (mLoadingMission)
274274
return;
275-
g_Fodder->mGame_Data.mPhase_Current->SetGoal(eGoal_Destroy_Enemy_Buildings, pValue);
275+
g_Fodder->mGame_Data.mPhase_Current->SetGoal(eObjective_Destroy_Enemy_Buildings, pValue);
276276
}
277277

278278
void cCampaignDialog::Goal_RescueHostages(int pValue) {
279279
if (mLoadingMission)
280280
return;
281-
g_Fodder->mGame_Data.mPhase_Current->SetGoal(eGoal_Rescue_Hostages, pValue);
281+
g_Fodder->mGame_Data.mPhase_Current->SetGoal(eObjective_Rescue_Hostages, pValue);
282282
}
283283

284284
void cCampaignDialog::Goal_ProtectCivilians(int pValue) {
285285
if (mLoadingMission)
286286
return;
287-
g_Fodder->mGame_Data.mPhase_Current->SetGoal(eGoal_Protect_Civilians, pValue);
287+
g_Fodder->mGame_Data.mPhase_Current->SetGoal(eObjective_Protect_Civilians, pValue);
288288
}
289289

290290
void cCampaignDialog::Goal_Kidnap_Leader(int pValue) {
291291
if (mLoadingMission)
292292
return;
293-
g_Fodder->mGame_Data.mPhase_Current->SetGoal(eGoal_Kidnap_Leader, pValue);
293+
g_Fodder->mGame_Data.mPhase_Current->SetGoal(eObjective_Kidnap_Leader, pValue);
294294
}
295295

296296
void cCampaignDialog::Goal_Destroy_Factory(int pValue) {
297297
if (mLoadingMission)
298298
return;
299-
g_Fodder->mGame_Data.mPhase_Current->SetGoal(eGoal_Destroy_Factory, pValue);
299+
g_Fodder->mGame_Data.mPhase_Current->SetGoal(eObjective_Destroy_Factory, pValue);
300300
}
301301

302302
void cCampaignDialog::Goal_Destroy_Computer(int pValue) {
303303
if (mLoadingMission)
304304
return;
305-
g_Fodder->mGame_Data.mPhase_Current->SetGoal(eGoal_Destroy_Computer, pValue);
305+
g_Fodder->mGame_Data.mPhase_Current->SetGoal(eObjective_Destroy_Computer, pValue);
306306
}
307307

308308
void cCampaignDialog::Goal_Get_Civilian_Home(int pValue) {
309309
if (mLoadingMission)
310310
return;
311-
g_Fodder->mGame_Data.mPhase_Current->SetGoal(eGoal_Get_Civilian_Home, pValue);
311+
g_Fodder->mGame_Data.mPhase_Current->SetGoal(eObjective_Get_Civilian_Home, pValue);
312312
}
313313

314314
void cCampaignDialog::Goal_Activate_All_Switches(int pValue) {
315315
if (mLoadingMission)
316316
return;
317-
g_Fodder->mGame_Data.mPhase_Current->SetGoal(eGoal_Activate_All_Switches, pValue);
317+
g_Fodder->mGame_Data.mPhase_Current->SetGoal(eObjective_Activate_All_Switches, pValue);
318318
}
319319

320320
void cCampaignDialog::Goal_Rescue_Hostage(int pValue) {
321321
if (mLoadingMission)
322322
return;
323-
g_Fodder->mGame_Data.mPhase_Current->SetGoal(eGoal_Rescue_Hostage, pValue);
323+
g_Fodder->mGame_Data.mPhase_Current->SetGoal(eObjective_Rescue_Hostage, pValue);
324324
}

0 commit comments

Comments
 (0)