1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-26 14:30:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation

Browse Source
This commit is contained in:
Asdow
2025-12-25 20:17:02 +02:00
parent f075963bca
commit 2e3e4b38d9
6 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Boxing.cpp
+1
View File
@@ -21,6 +21,7 @@
#include "GameSettings.h" // added by SANDRO #include "GameSettings.h" // added by SANDRO
#include <Font Control.h> #include <Font Control.h>
#include <message.h> #include <message.h>
#include "Soldier macros.h"
INT32 gsBoxerGridNo[ NUM_BOXERS ] = { 11393, 11233, 11073 }; INT32 gsBoxerGridNo[ NUM_BOXERS ] = { 11393, 11233, 11073 };
SoldierID gubBoxerID[ NUM_BOXERS ] = { NOBODY, NOBODY, NOBODY }; SoldierID gubBoxerID[ NUM_BOXERS ] = { NOBODY, NOBODY, NOBODY };
Tactical/Handle UI.cpp
+1 -1
View File
@@ -519,7 +519,7 @@ void HandleRenderDebugInfoModes()
static INT32 previousLocation = NOWHERE; static INT32 previousLocation = NOWHERE;
static UINT8 previousStance = 0; static UINT8 previousStance = 0;
UINT16 usSoldierIndex = NOBODY; SoldierID usSoldierIndex = NOBODY;
UINT32 uiMercFlags; UINT32 uiMercFlags;
FindSoldierFromMouse(&usSoldierIndex, &uiMercFlags); FindSoldierFromMouse(&usSoldierIndex, &uiMercFlags);
if (usSoldierIndex == NOBODY) if (usSoldierIndex == NOBODY)
Tactical/Handle UI.h
+1
View File
@@ -184,6 +184,7 @@ extern UINT32 guiCurrentEvent;
extern INT16 gsSelectedLevel; extern INT16 gsSelectedLevel;
extern BOOLEAN gfPlotNewMovement; extern BOOLEAN gfPlotNewMovement;
extern UINT32 guiPendingOverrideEvent; extern UINT32 guiPendingOverrideEvent;
extern UINT8 gRenderDebugInfoMode;
// GLOBALS // GLOBALS
Tactical/PATHAI.cpp
+3
View File
@@ -36,6 +36,9 @@
#include "BinaryHeap.hpp" #include "BinaryHeap.hpp"
#include "opplist.h" #include "opplist.h"
#include "Weapons.h" #include "Weapons.h"
#include "renderworld.h"
#include "Cheats.h"
#include "Handle UI.h"
//forward declarations of common classes to eliminate includes //forward declarations of common classes to eliminate includes
class OBJECTTYPE; class OBJECTTYPE;
TacticalAI/AIMain.cpp
-9
View File
@@ -463,13 +463,6 @@ BOOLEAN InitAI( void )
FILE * DebugFile; FILE * DebugFile;
#endif #endif
#ifdef _DEBUG
if (gfDisplayCoverValues)
{
//memset( gsCoverValue, 0x7F, sizeof( INT16 ) * WORLD_MAX );
}
#endif
//If we are not loading a saved game ( if we are, this has already been called ) //If we are not loading a saved game ( if we are, this has already been called )
if( !( gTacticalStatus.uiFlags & LOADING_SAVED_GAME ) ) if( !( gTacticalStatus.uiFlags & LOADING_SAVED_GAME ) )
{ {
@@ -849,10 +842,8 @@ void HandleSoldierAI( SOLDIERTYPE *pSoldier ) // FIXME - this function is named
#ifdef JA2TESTVERSION #ifdef JA2TESTVERSION
// display deadlock message // display deadlock message
gfUIInDeadlock = TRUE; gfUIInDeadlock = TRUE;
gUIDeadlockedSoldier = pSoldier->ubID;
DebugAI( String("DEADLOCK soldier %d action %s ABC %d", pSoldier->ubID.i, gzActionStr[pSoldier->aiData.bAction], gTacticalStatus.ubAttackBusyCount ) ); DebugAI( String("DEADLOCK soldier %d action %s ABC %d", pSoldier->ubID.i, gzActionStr[pSoldier->aiData.bAction], gTacticalStatus.ubAttackBusyCount ) );
#else #else
// If we are in beta version, also report message! // If we are in beta version, also report message!
#ifdef JA2BETAVERSION #ifdef JA2BETAVERSION
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_ERROR, L"Aborting AI deadlock for %d. Please sent DEBUG.TXT file and SAVE.", pSoldier->ubID.i ); ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_ERROR, L"Aborting AI deadlock for %d. Please sent DEBUG.TXT file and SAVE.", pSoldier->ubID.i );
TileEngine/renderworld.cpp
+16
View File
@@ -8005,6 +8005,11 @@ void RenderRoomInfo( INT16 sStartPointX_M, INT16 sStartPointY_M, INT16 sStartPoi
#ifdef _DEBUG #ifdef _DEBUG
// From fov.cpp
extern UINT8* gubGridNoMarkers;
extern UINT8 gubGridNoValue;
extern UINT8* gubFOVDebugInfoInfo;
void RenderFOVDebugInfo( INT16 sStartPointX_M, INT16 sStartPointY_M, INT16 sStartPointX_S, INT16 sStartPointY_S, INT16 sEndXS, INT16 sEndYS ) void RenderFOVDebugInfo( INT16 sStartPointX_M, INT16 sStartPointY_M, INT16 sStartPointX_S, INT16 sStartPointY_S, INT16 sEndXS, INT16 sEndYS )
{ {
INT8 bXOddFlag = 0; INT8 bXOddFlag = 0;
@@ -8215,6 +8220,17 @@ void RenderGridNoVisibleDebugInfo( INT16 sStartPointX_M, INT16 sStartPointY_M, I
UnLockVideoSurface( FRAME_BUFFER ); UnLockVideoSurface( FRAME_BUFFER );
} }
void RenderFOVDebug()
{
RenderFOVDebugInfo(gsStartPointX_M, gsStartPointY_M, gsStartPointX_S, gsStartPointY_S, gsEndXS, gsEndYS);
}
void RenderGridNoVisibleDebug()
{
RenderGridNoVisibleDebugInfo(gsStartPointX_M, gsStartPointY_M, gsStartPointX_S, gsStartPointY_S, gsEndXS, gsEndYS);
}
#endif #endif