mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
Got Editor Working Again... YAY!
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@581 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
AcyForsythe
@@ -142,6 +142,7 @@ BOOLEAN gfRenderGrid;
|
||||
//layer. When clear, the entire map is shown in full color.
|
||||
BOOLEAN gfRenderProgress;
|
||||
//When set, only the map section is rerendered.
|
||||
|
||||
extern BOOLEAN gfRenderMap; // symbol already declared globally in AI Viewer.cpp (jonathanl)
|
||||
//Set whenever the ctrl key is held down. This is used in conjunction with gfFileIO to determine whether the
|
||||
//selected sector is to be saved instead of loaded when clear.
|
||||
@@ -201,12 +202,13 @@ INT16 gsSectorX, gsSectorY;
|
||||
//The layer of the sector that is currently loaded in memory.
|
||||
INT32 gsSectorLayer;
|
||||
//The sector coordinates of the mouse position (yellow)
|
||||
|
||||
extern INT16 gsHiSectorX; // symbol already declared globally in AI Viewer.cpp (jonathanl)
|
||||
extern INT16 gsHiSectorY; // symbol already declared globally in AI Viewer.cpp (jonathanl)
|
||||
//The sector coordinates of the selected sector (red)
|
||||
|
||||
extern INT16 gsSelSectorX; // symbol already declared globally in AI Viewer.cpp (jonathanl)
|
||||
extern INT16 gsSelSectorY; // symbol already declared globally in AI Viewer.cpp (jonathanl)
|
||||
|
||||
//Used to determine how long the F5 key has been held down for to determine whether or not the
|
||||
//summary is going to be persistant or not.
|
||||
UINT32 giInitTimer;
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
--------------------Configuration: TileEngine - Win32 Release--------------------
|
||||
</h3>
|
||||
<h3>Command Lines</h3>
|
||||
Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP4F.tmp" with contents
|
||||
Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1A7.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\RSP4F.tmp" with content
|
||||
"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\RSP4F.tmp"
|
||||
Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP50.tmp" with contents
|
||||
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
|
||||
[
|
||||
/nologo /out:"Release\TileEngine.lib"
|
||||
".\Release\Ambient Control.obj"
|
||||
@@ -87,7 +87,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP50.tmp" with content
|
||||
.\Release\worldman.obj
|
||||
.\Release\XML_ExplosionData.obj
|
||||
]
|
||||
Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP50.tmp"
|
||||
Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1A8.tmp"
|
||||
<h3>Output Window</h3>
|
||||
Compiling...
|
||||
Ambient Control.cpp
|
||||
@@ -132,7 +132,7 @@ Creating library...
|
||||
--------------------Configuration: Standard Gaming Platform - Win32 Release--------------------
|
||||
</h3>
|
||||
<h3>Command Lines</h3>
|
||||
Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP51.tmp" with contents
|
||||
Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1A9.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\RSP51.tmp" with content
|
||||
"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\RSP51.tmp"
|
||||
Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP52.tmp" with contents
|
||||
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
|
||||
[
|
||||
/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\RSP52.tmp"
|
||||
Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP53.tmp" with contents
|
||||
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
|
||||
[
|
||||
/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\RSP53.tmp" with content
|
||||
".\Release\WinFont.obj"
|
||||
".\ddraw.lib"
|
||||
]
|
||||
Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP53.tmp"
|
||||
Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1AB.tmp"
|
||||
<h3>Output Window</h3>
|
||||
Compiling...
|
||||
Button Sound Control.cpp
|
||||
@@ -275,7 +275,7 @@ Creating library...
|
||||
--------------------Configuration: Tactical - Win32 Release--------------------
|
||||
</h3>
|
||||
<h3>Command Lines</h3>
|
||||
Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP54.tmp" with contents
|
||||
Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1AC.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\RSP54.tmp" with content
|
||||
"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\RSP54.tmp"
|
||||
Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP55.tmp" with contents
|
||||
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
|
||||
[
|
||||
/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\RSP55.tmp"
|
||||
Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP56.tmp" with contents
|
||||
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
|
||||
[
|
||||
/nologo /out:"Release\Tactical.lib"
|
||||
".\Release\Air Raid.obj"
|
||||
@@ -477,7 +477,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP56.tmp" with content
|
||||
.\Release\XML_Sounds.obj
|
||||
.\Release\XML_TonyInventory.obj
|
||||
]
|
||||
Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP56.tmp"
|
||||
Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1AE.tmp"
|
||||
<h3>Output Window</h3>
|
||||
Compiling...
|
||||
Air Raid.cpp
|
||||
@@ -586,7 +586,7 @@ Creating library...
|
||||
--------------------Configuration: Utils - Win32 Release--------------------
|
||||
</h3>
|
||||
<h3>Command Lines</h3>
|
||||
Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP57.tmp" with contents
|
||||
Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1AF.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\RSP57.tmp" with content
|
||||
"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\RSP57.tmp"
|
||||
Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP58.tmp" with contents
|
||||
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
|
||||
[
|
||||
/nologo /out:"Release\Utils.lib"
|
||||
.\Release\_DutchText.obj
|
||||
@@ -673,7 +673,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP58.tmp" with content
|
||||
.\Release\XML_Strings.obj
|
||||
.\Release\XML_Strings2.obj
|
||||
]
|
||||
Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP58.tmp"
|
||||
Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B0.tmp"
|
||||
<h3>Output Window</h3>
|
||||
Compiling...
|
||||
_DutchText.cpp
|
||||
@@ -732,7 +732,7 @@ Creating library...
|
||||
--------------------Configuration: TacticalAI - Win32 Release--------------------
|
||||
</h3>
|
||||
<h3>Command Lines</h3>
|
||||
Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP59.tmp" with contents
|
||||
Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B1.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\RSP59.tmp" with content
|
||||
"C:\JA2\Build\TacticalAI\QuestDebug.cpp"
|
||||
"C:\JA2\Build\TacticalAI\Realtime.cpp"
|
||||
]
|
||||
Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP59.tmp"
|
||||
Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP5A.tmp" with contents
|
||||
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
|
||||
[
|
||||
/nologo /out:"Release\TacticalAI.lib"
|
||||
.\Release\AIList.obj
|
||||
@@ -769,7 +769,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP5A.tmp" with content
|
||||
.\Release\QuestDebug.obj
|
||||
.\Release\Realtime.obj
|
||||
]
|
||||
Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP5A.tmp"
|
||||
Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B2.tmp"
|
||||
<h3>Output Window</h3>
|
||||
Compiling...
|
||||
AIList.cpp
|
||||
@@ -792,7 +792,7 @@ Creating library...
|
||||
--------------------Configuration: Editor - Win32 Release--------------------
|
||||
</h3>
|
||||
<h3>Command Lines</h3>
|
||||
Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP5B.tmp" with contents
|
||||
Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B3.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\RSP5B.tmp" with content
|
||||
"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\RSP5B.tmp"
|
||||
Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP5C.tmp" with contents
|
||||
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
|
||||
[
|
||||
/nologo /out:"Release\Editor.lib"
|
||||
".\Release\Cursor Modes.obj"
|
||||
@@ -849,10 +849,11 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP5C.tmp" with content
|
||||
.\Release\smooth.obj
|
||||
".\Release\Smoothing Utils.obj"
|
||||
]
|
||||
Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP5C.tmp"
|
||||
Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B4.tmp"
|
||||
<h3>Output Window</h3>
|
||||
Compiling...
|
||||
Cursor Modes.cpp
|
||||
GENERATED PCH FOR EDITOR PROJECT.
|
||||
edit_sys.cpp
|
||||
Editor Callbacks.cpp
|
||||
Editor Modes.cpp
|
||||
@@ -881,7 +882,7 @@ Creating library...
|
||||
--------------------Configuration: Laptop - Win32 Release--------------------
|
||||
</h3>
|
||||
<h3>Command Lines</h3>
|
||||
Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP5D.tmp" with contents
|
||||
Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B5.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"
|
||||
@@ -942,8 +943,8 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP5D.tmp" with content
|
||||
"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\RSP5D.tmp"
|
||||
Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP5E.tmp" with contents
|
||||
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
|
||||
[
|
||||
/nologo /out:"Release\Laptop.lib"
|
||||
.\Release\aim.obj
|
||||
@@ -1004,7 +1005,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP5E.tmp" with content
|
||||
.\Release\sirtech.obj
|
||||
".\Release\Store Inventory.obj"
|
||||
]
|
||||
Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP5E.tmp"
|
||||
Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B6.tmp"
|
||||
<h3>Output Window</h3>
|
||||
Compiling...
|
||||
aim.cpp
|
||||
@@ -1070,7 +1071,7 @@ Creating library...
|
||||
--------------------Configuration: Strategic - Win32 Release--------------------
|
||||
</h3>
|
||||
<h3>Command Lines</h3>
|
||||
Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP5F.tmp" with contents
|
||||
Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B7.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"
|
||||
@@ -1117,8 +1118,8 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP5F.tmp" with content
|
||||
"C:\JA2\Build\Strategic\MilitiaSquads.cpp"
|
||||
"C:\JA2\Build\Strategic\Reinforcement.cpp"
|
||||
]
|
||||
Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP5F.tmp"
|
||||
Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP60.tmp" with contents
|
||||
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
|
||||
[
|
||||
/nologo /out:"Release\Strategic.lib"
|
||||
".\Release\AI Viewer.obj"
|
||||
@@ -1165,7 +1166,7 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP60.tmp" with content
|
||||
.\Release\MilitiaSquads.obj
|
||||
.\Release\Reinforcement.obj
|
||||
]
|
||||
Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP60.tmp"
|
||||
Creating command line "link.exe -lib @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B8.tmp"
|
||||
<h3>Output Window</h3>
|
||||
Compiling...
|
||||
AI Viewer.cpp
|
||||
@@ -1218,7 +1219,7 @@ Creating library...
|
||||
</h3>
|
||||
<h3>Command Lines</h3>
|
||||
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\RSP61.tmp" with contents
|
||||
Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1B9.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"
|
||||
@@ -1245,8 +1246,8 @@ Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP61.tmp" with content
|
||||
"C:\JA2\Build\SCREENS.cpp"
|
||||
"C:\JA2\Build\Sys Globals.cpp"
|
||||
]
|
||||
Creating command line "cl.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP61.tmp"
|
||||
Creating temporary file "C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP62.tmp" with contents
|
||||
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
|
||||
[
|
||||
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
|
||||
@@ -1283,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\RSP62.tmp"
|
||||
Creating command line "link.exe @C:\DOCUME~1\Owner\LOCALS~1\Temp\RSP1BA.tmp"
|
||||
<h3>Output Window</h3>
|
||||
Compiling resources...
|
||||
Compiling...
|
||||
@@ -1306,6 +1307,7 @@ Init.cpp
|
||||
Intro.cpp
|
||||
JA2 Splash.cpp
|
||||
jascreens.cpp
|
||||
C:\JA2\Build\jascreens.cpp(269) : warning C4101: 'str' : unreferenced local variable
|
||||
Loading Screen.cpp
|
||||
MainMenuScreen.cpp
|
||||
MessageBoxScreen.cpp
|
||||
@@ -1320,7 +1322,7 @@ LINK : warning LNK4089: all references to "ADVAPI32.dll" discarded by /OPT:REF
|
||||
|
||||
|
||||
<h3>Results</h3>
|
||||
ja2_cvs.exe - 0 error(s), 1 warning(s)
|
||||
ja2_cvs.exe - 0 error(s), 2 warning(s)
|
||||
</pre>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
+2
-1
@@ -24,7 +24,8 @@ UINT32 SaveLoadScreenHandle( void );
|
||||
UINT32 SaveLoadScreenInit( void );
|
||||
|
||||
template <typename string2>
|
||||
BOOLEAN DoSaveLoadMessageBox( UINT8 ubStyle, string2 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback );
|
||||
//Kaiden : Trying to get Editor to work
|
||||
extern BOOLEAN DoSaveLoadMessageBox( UINT8 ubStyle, string2 zString, UINT32 uiExitScreen, UINT16 usFlags, MSGBOX_CALLBACK ReturnCallback );
|
||||
|
||||
BOOLEAN InitSaveGameArray();
|
||||
|
||||
|
||||
@@ -80,7 +80,13 @@ extern UINT8 gubAssertString[128];
|
||||
|
||||
//*******************************************************************************************
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
// Kaiden: Added this for Map Editor
|
||||
#ifdef JA2BETAVERSION
|
||||
extern UINT8 gubAssertString[128];
|
||||
#endif
|
||||
|
||||
// Moved these out of the defines - debug mgr always initialized
|
||||
#define InitializeDebugManager() DbgInitialize()
|
||||
#define ShutdownDebugManager() DbgShutdown()
|
||||
|
||||
+18
-12
@@ -236,8 +236,10 @@ BOOLEAN CreateAIViewer()
|
||||
UINT16 str[6];
|
||||
|
||||
//Kaiden: Loading INI file to read Values...
|
||||
CIniReader iniReader("..\\Ja2_Options.ini");
|
||||
INT32 iMaxEnemyGroupSize = iniReader.ReadInteger("Options","MAX_STRATEGIC_TEAM_SIZE",20);
|
||||
// Here's another one of those INI reads
|
||||
// killing the Map Editor>
|
||||
//CIniReader iniReader("..\\Ja2_Options.ini");
|
||||
//INT32 iMaxEnemyGroupSize = iniReader.ReadInteger("Options","MAX_STRATEGIC_TEAM_SIZE",20);
|
||||
|
||||
//Check to see if data exists.
|
||||
if( !FileExists( "DevTools\\arulco.sti" ) ||
|
||||
@@ -377,13 +379,13 @@ BOOLEAN CreateAIViewer()
|
||||
|
||||
//Add the enemy population override fields
|
||||
InitTextInputModeWithScheme( DEFAULT_SCHEME );
|
||||
StringFromValue( str, gsAINumAdmins, iMaxEnemyGroupSize );
|
||||
StringFromValue( str, gsAINumAdmins, gGameExternalOptions.iMaxEnemyGroupSize );
|
||||
AddTextInputField( 10, VIEWER_BOTTOM + 30, 25, 15, MSYS_PRIORITY_NORMAL, str, 2, INPUTTYPE_NUMERICSTRICT );
|
||||
StringFromValue( str, gsAINumTroops, iMaxEnemyGroupSize );
|
||||
StringFromValue( str, gsAINumTroops, gGameExternalOptions.iMaxEnemyGroupSize );
|
||||
AddTextInputField( 10, VIEWER_BOTTOM + 50, 25, 15, MSYS_PRIORITY_NORMAL, str, 2, INPUTTYPE_NUMERICSTRICT );
|
||||
StringFromValue( str, gsAINumElites, iMaxEnemyGroupSize );
|
||||
StringFromValue( str, gsAINumElites, gGameExternalOptions.iMaxEnemyGroupSize );
|
||||
AddTextInputField( 10, VIEWER_BOTTOM + 70, 25, 15, MSYS_PRIORITY_NORMAL, str, 2, INPUTTYPE_NUMERICSTRICT );
|
||||
StringFromValue( str, gsAINumCreatures, iMaxEnemyGroupSize );
|
||||
StringFromValue( str, gsAINumCreatures, gGameExternalOptions.iMaxEnemyGroupSize );
|
||||
AddTextInputField( 10, VIEWER_BOTTOM + 90, 25, 15, MSYS_PRIORITY_NORMAL, str, 2, INPUTTYPE_NUMERICSTRICT );
|
||||
|
||||
//Press buttons in based on current settings
|
||||
@@ -1428,19 +1430,23 @@ void ExtractAndUpdatePopulations()
|
||||
|
||||
|
||||
//Kaiden: Loading INI file to read Values...
|
||||
CIniReader iniReader("..\\Ja2_Options.ini");
|
||||
INT32 iMaxEnemyGroupSize = iniReader.ReadInteger("Options","MAX_STRATEGIC_TEAM_SIZE",20);
|
||||
//Tag for later - this is one of the reasons the
|
||||
// Map Editor won't compile. And I feel stupid about it.
|
||||
// Pointing to a static location for the INI file.
|
||||
// Not only bad, the file is no longer there.
|
||||
//CIniReader iniReader("..\\Ja2_Options.ini");
|
||||
//INT32 iMaxEnemyGroupSize = iniReader.ReadInteger("Options","MAX_STRATEGIC_TEAM_SIZE",20);
|
||||
|
||||
gsAINumAdmins = min( GetNumericStrictValueFromField( 0 ), iMaxEnemyGroupSize );
|
||||
gsAINumAdmins = min( GetNumericStrictValueFromField( 0 ), gGameExternalOptions.iMaxEnemyGroupSize );
|
||||
SetInputFieldStringWithNumericStrictValue( 0, gsAINumAdmins );
|
||||
|
||||
gsAINumTroops = min( GetNumericStrictValueFromField( 1 ), iMaxEnemyGroupSize );
|
||||
gsAINumTroops = min( GetNumericStrictValueFromField( 1 ), gGameExternalOptions.iMaxEnemyGroupSize );
|
||||
SetInputFieldStringWithNumericStrictValue( 1, gsAINumTroops );
|
||||
|
||||
gsAINumElites = min( GetNumericStrictValueFromField( 2 ), iMaxEnemyGroupSize );
|
||||
gsAINumElites = min( GetNumericStrictValueFromField( 2 ), gGameExternalOptions.iMaxEnemyGroupSize );
|
||||
SetInputFieldStringWithNumericStrictValue( 2, gsAINumElites );
|
||||
|
||||
gsAINumCreatures = min( GetNumericStrictValueFromField( 3 ), iMaxEnemyGroupSize );
|
||||
gsAINumCreatures = min( GetNumericStrictValueFromField( 3 ), gGameExternalOptions.iMaxEnemyGroupSize );
|
||||
SetInputFieldStringWithNumericStrictValue( 3, gsAINumCreatures );
|
||||
}
|
||||
|
||||
|
||||
+10
-1
@@ -4,7 +4,7 @@
|
||||
#include "Language Defines.h"
|
||||
|
||||
// Beta version
|
||||
// #define JA2BETAVERSION
|
||||
//#define JA2BETAVERSION
|
||||
|
||||
// Normal test version
|
||||
// #define JA2TESTVERSION
|
||||
@@ -12,6 +12,11 @@
|
||||
// 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
|
||||
@@ -24,6 +29,10 @@
|
||||
#define JA2EDITOR
|
||||
#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.
|
||||
#ifdef JA2BETAVERSION
|
||||
#define SGP_DEBUG
|
||||
#define FORCE_ASSERTS_ON
|
||||
|
||||
+2
-1
@@ -286,6 +286,7 @@ UINT32 ErrorScreenHandle(void)
|
||||
mprintf( 50, 255, L"%S", gubErrorText );
|
||||
SetFontForeground( FONT_LTRED );
|
||||
|
||||
/*
|
||||
#ifdef JA2BETAVERSION
|
||||
|
||||
if( gubAssertString[0] )
|
||||
@@ -294,7 +295,7 @@ UINT32 ErrorScreenHandle(void)
|
||||
DisplayWrappedString( 50, 270, 560, 2, FONT12ARIAL, FONT_RED, str, FONT_BLACK, TRUE, LEFT_JUSTIFIED );
|
||||
}
|
||||
#endif
|
||||
|
||||
*/
|
||||
if ( !fFirstTime )
|
||||
{
|
||||
DebugMsg(TOPIC_JA2, DBG_LEVEL_0, String( "Runtime Error: %s ", gubErrorText ) );
|
||||
|
||||
Reference in New Issue
Block a user