Skip to content
This repository has been archived by the owner on Mar 8, 2024. It is now read-only.

Commit

Permalink
Fix the theater related mix loading order while updating .gitignore
Browse files Browse the repository at this point in the history
  • Loading branch information
secsome committed Jan 23, 2024
1 parent ece147f commit d031b3a
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 29 deletions.
27 changes: 9 additions & 18 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,21 +1,12 @@
#Don't always push resource temp file OK?
# Ignore these files:
*.aps
*.user
/VC5
/MFC42
/Debug
/.vs/FA2sp/v16
/.vs/FA2sp/v16
/Release
/SyringeDebug
/SyringeRelease
/O2_enabled
/.vs/FA2sp/v17
VC5
MFC42
Debug
Release
.vs

#Don't ignore these files
!/Debug/vxl_drawing_lib.lib
!/Release/vxl_drawing_lib.lib
/.vs/FA2sp/project-colors.json


.vs/
# Don't ignore these files:
!Debug/vxl_drawing_lib.lib
!Release/vxl_drawing_lib.lib
23 changes: 12 additions & 11 deletions FA2sp/Ext/CLoading/Body.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -131,42 +131,43 @@ bool CLoadingExt::InitMixFilesFix()
if (!LoadMixFile("CONQUER.MIX")) return false;

// Init_Theaters
LoadMixFile("TEMPERATMD.MIX");
LoadMixFile("ISOTEMMD.MIX");
LoadMixFile("TEMPERAT.MIX");
LoadMixFile("ISOTEMP.MIX");
LoadMixFile("ISOTEMMD.MIX");
LoadMixFile("TEM.MIX");
LoadMixFile("TEMPERATMD.MIX");


LoadMixFile("SNOWMD.MIX");
LoadMixFile("ISOSNOMD.MIX");
LoadMixFile("SNOW.MIX");
LoadMixFile("ISOSNOW.MIX");
LoadMixFile("ISOSNO.MIX");
LoadMixFile("ISOSNOMD.MIX");
LoadMixFile("SNO.MIX");
LoadMixFile("SNOWMD.MIX");

LoadMixFile("URBANMD.MIX");
LoadMixFile("ISOURBMD.MIX");
LoadMixFile("URBAN.MIX");
LoadMixFile("ISOURB.MIX");
LoadMixFile("ISOURBMD.MIX");
LoadMixFile("URB.MIX");
LoadMixFile("URBANMD.MIX");

LoadMixFile("DESERT.MIX");
LoadMixFile("ISODES.MIX");
LoadMixFile("ISODESMD.MIX");
LoadMixFile("DES.MIX");
LoadMixFile("DESERTMD.MIX");

LoadMixFile("URBANNMD.MIX");
LoadMixFile("ISOUBNMD.MIX");
LoadMixFile("URBANN.MIX");
LoadMixFile("ISOUBN.MIX");
LoadMixFile("ISOUBNMD.MIX");
LoadMixFile("UBN.MIX");
LoadMixFile("URBANNMD.MIX");

LoadMixFile("LUNARMD.MIX");
LoadMixFile("ISOLUNMD.MIX");
LoadMixFile("LUNAR.MIX");
LoadMixFile("ISOLUN.MIX");
LoadMixFile("ISOLUNMD.MIX");
LoadMixFile("LUN.MIX");
LoadMixFile("LUNARMD.MIX");


if (LoadMixFile("MARBLE.MIX"))
CFinalSunApp::Instance->MarbleLoaded = TRUE;
Expand Down

0 comments on commit d031b3a

Please sign in to comment.