From 6404ae4da8ed891b715ac27110e17ea389cbe6b1 Mon Sep 17 00:00:00 2001 From: AcyForsythe Date: Fri, 29 Sep 2006 22:48:15 +0000 Subject: [PATCH] -Added EDITOR_SCREEN_RESOLUTION setting to Ja2.ini -Bugfix: Editor Tilesets Now uses MAX_TILESETS Value from JA2set.dat git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@582 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Editor/popupmenu.cpp | 2 +- GameVersion.cpp | 2 +- JA2.opt | Bin 120832 -> 124928 bytes JA2.plg | 80 +++++++++++++++---------------- Standard Gaming Platform/sgp.cpp | 8 ++++ builddefines.h | 18 +++---- 6 files changed, 57 insertions(+), 53 deletions(-) diff --git a/Editor/popupmenu.cpp b/Editor/popupmenu.cpp index 9e2a1802..4e95b447 100644 --- a/Editor/popupmenu.cpp +++ b/Editor/popupmenu.cpp @@ -129,7 +129,7 @@ void InitPopupMenu( INT32 iButtonID, UINT8 ubPopupMenuID, UINT8 ubDirection ) switch( ubPopupMenuID ) { case CHANGETSET_POPUP: //change tileset - gPopup.ubNumEntries = NUM_TILESETS; + gPopup.ubNumEntries = gubNumSets; break; case OWNERSHIPGROUP_POPUP: case CHANGECIVGROUP_POPUP: diff --git a/GameVersion.cpp b/GameVersion.cpp index 6f952817..936cabcc 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -13,7 +13,7 @@ #ifdef JA2BETAVERSION //BETA/TEST BUILD VERSION -INT16 zVersionLabel[256] = { L"Beta v. 0.98" }; +INT16 zVersionLabel[256] = { L"Map Editor v1.13.579" }; #elif defined CRIPPLED_VERSION diff --git a/JA2.opt b/JA2.opt index 9a4082eda821a9afab9d88ad4ba4fd0d87916fd3..ac1e1a2a7e7bf5c94414e4da74251e7de701f7da 100644 GIT binary patch literal 124928 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 literal 120832 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

Command Lines

-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1A7.tmp" with contents +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP2B.tmp" with contents [ /nologo /MT /W3 /GX /O2 /I "..\Standard Gaming Platform" /I "..\\" /I "..\Tactical" /I "..\Utils" /I "..\tacticalai" /I "..\Editor" /I "..\strategic" /I "..\Laptop" /I ".\\" /D "CALLBACKTIMER" /D "PRECOMPILEDHEADERS" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /D "CINTERFACE" /FR"Release/" /Fp"Release/TileEngine.pch" /YX"TileEngine All.h" /Fo"Release/" /Fd"Release/" /FD /O2b2 /c "C:\JA2\Build\TileEngine\Ambient Control.cpp" @@ -46,8 +46,8 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1A7.tmp" with conten "C:\JA2\Build\TileEngine\worldman.cpp" "C:\JA2\Build\TileEngine\XML_ExplosionData.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1A7.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1A8.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP2B.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP2C.tmp" with contents [ /nologo /out:"Release\TileEngine.lib" ".\Release\Ambient Control.obj" @@ -87,7 +87,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1A8.tmp" with conten .\Release\worldman.obj .\Release\XML_ExplosionData.obj ] -Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1A8.tmp" +Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP2C.tmp"

Output Window

Compiling... Ambient Control.cpp @@ -132,7 +132,7 @@ Creating library... --------------------Configuration: Standard Gaming Platform - Win32 Release--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1A9.tmp" with contents +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP2D.tmp" with contents [ /nologo /MT /W3 /GX /O2 /I "..\\" /I "..\TileEngine" /I "..\Tactical" /I "..\Utils" /I "..\strategic" /I ".\\" /D "NO_ZLIB" /D "JA2_PRECOMPILED_HEADERS" /D "NO_ZLIB_COMPRESSION" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /D "CINTERFACE" /FR".\Release/" /Fp".\Release/Standard Gaming Platform.pch" /YX"JA2 SGP ALL.H" /Fo".\Release/" /Fd".\Release/" /FD /c "C:\JA2\Build\Standard Gaming Platform\Button Sound Control.cpp" @@ -172,14 +172,14 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1A9.tmp" with conten "C:\JA2\Build\Standard Gaming Platform\vsurface.cpp" "C:\JA2\Build\Standard Gaming Platform\WinFont.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1A9.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1AA.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP2D.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP2E.tmp" with contents [ /nologo /MT /W3 /GX /O2 /I "..\\" /I "..\TileEngine" /I "..\Tactical" /I "..\Utils" /I "..\strategic" /I ".\\" /D "NO_ZLIB" /D "JA2_PRECOMPILED_HEADERS" /D "NO_ZLIB_COMPRESSION" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /D "CINTERFACE" /D "_DEBUG" /FR".\Release/" /Fp".\Release/Standard Gaming Platform.pch" /YX"JA2 SGP ALL.H" /Fo".\Release/" /Fd".\Release/" /FD /c "C:\JA2\Build\Standard Gaming Platform\DEBUG.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1AA.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1AB.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP2E.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP2F.tmp" with contents [ /nologo /out:".\Release\Standard Gaming Platform.lib" ".\Release\Button Sound Control.obj" @@ -221,7 +221,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1AB.tmp" with conten ".\Release\WinFont.obj" ".\ddraw.lib" ] -Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1AB.tmp" +Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP2F.tmp"

Output Window

Compiling... Button Sound Control.cpp @@ -275,7 +275,7 @@ Creating library... --------------------Configuration: Tactical - Win32 Release--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1AC.tmp" with contents +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP30.tmp" with contents [ /nologo /MT /W3 /GX /O2 /I "..\Standard Gaming Platform" /I "..\TileEngine" /I "..\\" /I "..\Utils" /I "..\tacticalai" /I "..\Editor" /I "..\strategic" /I "..\Laptop" /I ".\\" /D "CALLBACKTIMER" /D "PRECOMPILEDHEADERS" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /FR"Release/" /Fp"Release/Tactical.pch" /YX"Tactical All.h" /Fo"Release/" /Fd"Release/" /FD /c "C:\JA2\Build\Tactical\Air Raid.cpp" @@ -372,14 +372,14 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1AC.tmp" with conten "C:\JA2\Build\Tactical\XML_Sounds.cpp" "C:\JA2\Build\Tactical\XML_TonyInventory.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1AC.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1AD.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP30.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP31.tmp" with contents [ /nologo /MT /W3 /GX /Od /I "..\Standard Gaming Platform" /I "..\TileEngine" /I "..\\" /I "..\Utils" /I "..\tacticalai" /I "..\Editor" /I "..\strategic" /I "..\Laptop" /I ".\\" /D "CALLBACKTIMER" /D "PRECOMPILEDHEADERS" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /FR"Release/" /Fp"Release/Tactical.pch" /YX"Tactical All.h" /Fo"Release/" /Fd"Release/" /FD /c "C:\JA2\Build\Tactical\LOS.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1AD.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1AE.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP31.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP32.tmp" with contents [ /nologo /out:"Release\Tactical.lib" ".\Release\Air Raid.obj" @@ -477,7 +477,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1AE.tmp" with conten .\Release\XML_Sounds.obj .\Release\XML_TonyInventory.obj ] -Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1AE.tmp" +Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP32.tmp"

Output Window

Compiling... Air Raid.cpp @@ -586,7 +586,7 @@ Creating library... --------------------Configuration: Utils - Win32 Release--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1AF.tmp" with contents +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP33.tmp" with contents [ /nologo /MT /W3 /GX /O2 /I "..\Standard Gaming Platform" /I "..\TileEngine" /I "..\\" /I "..\Tactical" /I "..\tacticalai" /I "..\Editor" /I "..\strategic" /I "..\Laptop" /I ".\\" /D "CALLBACKTIMER" /D "PRECOMPILEDHEADERS" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /D "CINTERFACE" /FR"Release/" /Fp"Release/Utils.pch" /YX"Utils All.h" /Fo"Release/" /Fd"Release/" /FD /c "C:\JA2\Build\Utils\_DutchText.cpp" @@ -629,8 +629,8 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1AF.tmp" with conten "C:\JA2\Build\Utils\XML_Strings.cpp" "C:\JA2\Build\Utils\XML_Strings2.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1AF.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B0.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP33.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP34.tmp" with contents [ /nologo /out:"Release\Utils.lib" .\Release\_DutchText.obj @@ -673,7 +673,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B0.tmp" with conten .\Release\XML_Strings.obj .\Release\XML_Strings2.obj ] -Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B0.tmp" +Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP34.tmp"

Output Window

Compiling... _DutchText.cpp @@ -732,7 +732,7 @@ Creating library... --------------------Configuration: TacticalAI - Win32 Release--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B1.tmp" with contents +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP35.tmp" with contents [ /nologo /MT /W3 /GX /O2 /I "..\Standard Gaming Platform" /I "..\TileEngine" /I "..\\" /I "..\Tactical" /I "..\Utils" /I "..\Editor" /I "..\strategic" /I "..\Laptop" /I ".\\" /D "PRECOMPILEDHEADERS" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /D "CINTERFACE" /FR"Release/" /Fp"Release/TacticalAI.pch" /YX"AI All.h" /Fo"Release/" /Fd"Release/" /FD /c "C:\JA2\Build\TacticalAI\AIList.cpp" @@ -750,8 +750,8 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B1.tmp" with conten "C:\JA2\Build\TacticalAI\QuestDebug.cpp" "C:\JA2\Build\TacticalAI\Realtime.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B1.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B2.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP35.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP36.tmp" with contents [ /nologo /out:"Release\TacticalAI.lib" .\Release\AIList.obj @@ -769,7 +769,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B2.tmp" with conten .\Release\QuestDebug.obj .\Release\Realtime.obj ] -Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B2.tmp" +Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP36.tmp"

Output Window

Compiling... AIList.cpp @@ -792,7 +792,7 @@ Creating library... --------------------Configuration: Editor - Win32 Release--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B3.tmp" with contents +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP37.tmp" with contents [ /nologo /MT /W3 /GX /O2 /Ob2 /I "..\Standard Gaming Platform" /I "..\TileEngine" /I "..\\" /I "..\Tactical" /I "..\Utils" /I "..\tacticalai" /I "..\strategic" /I "..\Laptop" /I ".\\" /D "PRECOMPILEDHEADERS" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /D "CINTERFACE" /FR"Release/" /Fp"Release/Editor.pch" /YX"Editor All.h" /Fo"Release/" /Fd"Release/" /FD /c "C:\JA2\Build\Editor\Cursor Modes.cpp" @@ -820,8 +820,8 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B3.tmp" with conten "C:\JA2\Build\Editor\smooth.cpp" "C:\JA2\Build\Editor\Smoothing Utils.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B3.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B4.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP37.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP38.tmp" with contents [ /nologo /out:"Release\Editor.lib" ".\Release\Cursor Modes.obj" @@ -849,7 +849,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B4.tmp" with conten .\Release\smooth.obj ".\Release\Smoothing Utils.obj" ] -Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B4.tmp" +Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP38.tmp"

Output Window

Compiling... Cursor Modes.cpp @@ -882,7 +882,7 @@ Creating library... --------------------Configuration: Laptop - Win32 Release--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B5.tmp" with contents +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP39.tmp" with contents [ /nologo /MT /W3 /GX /O2 /I "..\Standard Gaming Platform" /I "..\TileEngine" /I "..\\" /I "..\Tactical" /I "..\Utils" /I "..\tacticalai" /I "..\Editor" /I "..\strategic" /I ".\\" /D "PRECOMPILEDHEADERS" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /D "CINTERFACE" /FR"Release/" /Fp"Release/Laptop.pch" /YX"Laptop All.h" /Fo"Release/" /Fd"Release/" /FD /c "C:\JA2\Build\Laptop\aim.cpp" @@ -943,8 +943,8 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B5.tmp" with conten "C:\JA2\Build\Laptop\sirtech.cpp" "C:\JA2\Build\Laptop\Store Inventory.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B5.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B6.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP39.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP3A.tmp" with contents [ /nologo /out:"Release\Laptop.lib" .\Release\aim.obj @@ -1005,7 +1005,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B6.tmp" with conten .\Release\sirtech.obj ".\Release\Store Inventory.obj" ] -Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B6.tmp" +Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP3A.tmp"

Output Window

Compiling... aim.cpp @@ -1071,7 +1071,7 @@ Creating library... --------------------Configuration: Strategic - Win32 Release--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B7.tmp" with contents +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP3B.tmp" with contents [ /nologo /MT /W3 /GX /O2 /I "..\Standard Gaming Platform" /I "..\TileEngine" /I "..\\" /I "..\Tactical" /I "..\Utils" /I "..\tacticalai" /I "..\Editor" /I "..\Laptop" /I ".\\" /D "PRECOMPILEDHEADERS" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /D "CINTERFACE" /FR"Release/" /Fp"Release/Strategic.pch" /YX"Strategic All.h" /Fo"Release/" /Fd"Release/" /FD /c "C:\JA2\Build\Strategic\AI Viewer.cpp" @@ -1118,8 +1118,8 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B7.tmp" with conten "C:\JA2\Build\Strategic\MilitiaSquads.cpp" "C:\JA2\Build\Strategic\Reinforcement.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B7.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B8.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP3B.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP3C.tmp" with contents [ /nologo /out:"Release\Strategic.lib" ".\Release\AI Viewer.obj" @@ -1166,7 +1166,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B8.tmp" with conten .\Release\MilitiaSquads.obj .\Release\Reinforcement.obj ] -Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B8.tmp" +Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP3C.tmp"

Output Window

Compiling... AI Viewer.cpp @@ -1219,7 +1219,7 @@ Creating library...

Command Lines

Creating command line "rc.exe /l 0x409 /fo"Release/ja2.res" /i "Res" /i ".\Res" /d "NDEBUG" "C:\JA2\Build\Res\ja2.rc"" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B9.tmp" with contents +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP3D.tmp" with contents [ /nologo /G5 /MT /W3 /GX /Zi /O2 /Ob2 /I ".\Standard Gaming Platform" /I ".\TileEngine" /I ".\Tactical" /I ".\Utils" /I ".\TacticalAI" /I ".\Editor" /I ".\Strategic" /I ".\laptop" /I ".\\" /D "CALLBACKTIMER" /D "PRECOMPILEDHEADERS" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "JA2" /D "XML_STATIC" /D "CINTERFACE" /FR"Release/" /Fp"Release/JA2.pch" /YX"JA2 All.h" /Fo"Release/" /Fd"Release/" /FD /O2b2 /c "C:\JA2\Build\Utils\_Ja25GermanText.cpp" @@ -1246,8 +1246,8 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B9.tmp" with conten "C:\JA2\Build\SCREENS.cpp" "C:\JA2\Build\Sys Globals.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B9.tmp" -Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1BA.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP3D.tmp" +Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP3E.tmp" with contents [ libexpatMT.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib winmm.lib smackw32.lib mss32.lib /nologo /subsystem:windows /profile /map:"Release/ja2_cvs.map" /machine:I386 /out:"..\ja2_cvs.exe" .\Release\_Ja25GermanText.obj @@ -1284,7 +1284,7 @@ libexpatMT.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advap .\Laptop\Release\Laptop.lib .\Strategic\Release\Strategic.lib ] -Creating command line "link.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1BA.tmp" +Creating command line "link.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP3E.tmp"

Output Window

Compiling resources... Compiling... diff --git a/Standard Gaming Platform/sgp.cpp b/Standard Gaming Platform/sgp.cpp index 7e146f85..a15780a5 100644 --- a/Standard Gaming Platform/sgp.cpp +++ b/Standard Gaming Platform/sgp.cpp @@ -867,6 +867,14 @@ void GetRuntimeSettings( ) iResolution = atoi(zScreenResolution); } +#ifdef JA2EDITOR + if (GetPrivateProfileString( "Ja2 Settings","EDITOR_SCREEN_RESOLUTION", "", zScreenResolution, 50, INIFile )) + { + iResolution = atoi(zScreenResolution); + } +#endif + + int iResX; int iResY; diff --git a/builddefines.h b/builddefines.h index 1d9d376a..e45639f9 100644 --- a/builddefines.h +++ b/builddefines.h @@ -12,11 +12,6 @@ // If we want to include the editor //#define JA2EDITOR -// Kaiden: So only the JA2EDITOR define needs to be uncommented -#ifdef JA2EDITOR - #define JA2TBETAVERSION -#endif - #ifdef _DEBUG #ifndef JA2TESTVERSION #define JA2TESTVERSION @@ -30,13 +25,14 @@ #endif -// Kaiden: Comment out this section when building the EDITOR -// It slows the thing down horribly and isn't neccessary -// Unless a debug version is needed. +// Kaiden: Not defining these for Editor unless we +// end up needing a debug version for it. #ifdef JA2BETAVERSION - #define SGP_DEBUG - #define FORCE_ASSERTS_ON - #define SGP_VIDEO_DEBUGGING + #ifndef JA2EDITOR + #define SGP_DEBUG + #define FORCE_ASSERTS_ON + #define SGP_VIDEO_DEBUGGING + #endif #endif //#define CRIPPLED_VERSION