Skip to content

Commit 0af6e60

Browse files
author
nitrocaster
committed
Fix release compilation (game only).
1 parent 96fc6cf commit 0af6e60

File tree

63 files changed

+83
-38
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+83
-38
lines changed

src/xrEngine/xr_object.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,10 @@ class IGameObject :
135135
//virtual void SetCForm(ICollisionForm *cform) override = 0;
136136
//virtual ICollisionForm *GetCForm() const override = 0;
137137
// ~ICollidable
138-
138+
#ifdef DEBUG
139139
virtual u32 GetDbgUpdateFrame() const = 0;
140140
virtual void SetDbgUpdateFrame(u32 value) = 0;
141+
#endif
141142
virtual u32 GetUpdateFrame() const = 0;
142143
virtual void SetUpdateFrame(u32 value) = 0;
143144
virtual u32 GetCrowUpdateFrame() const = 0;

src/xrGame/CarInput.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ float CCar::FireDirDiff()
212212
return 0.0f;
213213
}
214214
#include "script_game_object.h"
215+
#include "script_game_object_impl.h"
215216
#include "car_memory.h"
216217
#include "visual_memory_manager.h"
217218

src/xrGame/CustomMonster.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include "item_manager.h"
2424
#include "danger_manager.h"
2525
#include "xrAICore/Navigation/ai_object_location.h"
26+
#include "xrAICore/Navigation/ai_object_location_impl.h"
2627
#include "xrAICore/Navigation/level_graph.h"
2728
#include "xrAICore/Navigation/game_graph.h"
2829
#include "movement_manager.h"

src/xrGame/GameObject.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ BOOL CGameObject::net_Spawn (CSE_Abstract* DC)
607607
}
608608
BOOL ret = scriptBinder.net_Spawn(DC);
609609
#else
610-
return (CScriptBinder::net_Spawn(DC));
610+
return (scriptBinder.net_Spawn(DC));
611611
#endif
612612

613613
#ifdef DEBUG

src/xrGame/GameObject.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,10 @@ class CGameObject :
102102
CGameObject();
103103
virtual ~CGameObject();
104104
// XXX: review
105+
#ifdef DEBUG
105106
virtual u32 GetDbgUpdateFrame() const override { return dbg_update_cl; }
106107
virtual void SetDbgUpdateFrame(u32 value) override { dbg_update_cl = value; }
108+
#endif
107109
virtual u32 GetUpdateFrame() const override { return dwFrame_UpdateCL; }
108110
virtual void SetUpdateFrame(u32 value) override { dwFrame_UpdateCL = value; }
109111
virtual u32 GetCrowUpdateFrame() const override { return dwFrame_AsCrow; }

src/xrGame/Helicopter2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "helicopter.h"
33

44
#include "script_game_object.h"
5-
5+
#include "script_game_object_impl.h"
66
#include "Include/xrRender/Kinematics.h"
77
#include "xrEngine/LightAnimLibrary.h"
88

src/xrGame/Level.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,9 @@ class CLevel :
395395
u8* m_lzo_working_buffer = nullptr;
396396
void init_compression();
397397
void deinit_compression();
398+
#ifdef DEBUG
398399
LevelGraphDebugRender *GetLevelGraphDebugRender() const { return levelGraphDebugRender; }
400+
#endif
399401
};
400402

401403
// XXX nitrocaster: should not cast to inherited

src/xrGame/ai/monsters/basemonster/base_monster.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
#include "ai/Monsters/ai_monster_squad.h"
4040
#include "Actor.h"
4141
#include "xrAICore/Navigation/ai_object_location.h"
42+
#include "xrAICore/Navigation/ai_object_location_impl.h"
4243
#include "ai_space.h"
4344
#include "xrScriptEngine/script_engine.hpp"
4445
#include "ai/Monsters/anti_aim_ability.h"

src/xrGame/ai/monsters/rats/ai_rat.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "Include/xrRender/KinematicsAnimated.h"
1818
#include "detail_path_manager.h"
1919
#include "xrAICore/Navigation/ai_object_location.h"
20+
#include "xrAICore/Navigation/ai_object_location_impl.h"
2021
#include "movement_manager.h"
2122
#include "location_manager.h"
2223
#include "xrServerEntities/ai_sounds.h"

src/xrGame/ai/stalker/ai_stalker.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
#include "memory_manager.h"
3939
#include "sight_manager.h"
4040
#include "xrAICore/Navigation/ai_object_location.h"
41+
#include "xrAICore/Navigation/ai_object_location_impl.h"
4142
#include "stalker_movement_manager_smart_cover.h"
4243
#include "EntityCondition.h"
4344
#include "xrScriptEngine/script_engine.hpp"

0 commit comments

Comments
 (0)