Fix release compilation (game only).

src/xrEngine/xr_object.h

@@ -135,9 +135,10 @@ class IGameObject :
     //virtual void SetCForm(ICollisionForm *cform) override = 0;
     //virtual ICollisionForm *GetCForm() const override = 0;
     // ~ICollidable
-
+#ifdef DEBUG
     virtual u32 GetDbgUpdateFrame() const = 0;
     virtual void SetDbgUpdateFrame(u32 value) = 0;
+#endif
     virtual u32 GetUpdateFrame() const = 0;
     virtual void SetUpdateFrame(u32 value) = 0;
     virtual u32 GetCrowUpdateFrame() const = 0;

src/xrGame/CarInput.cpp

@@ -212,6 +212,7 @@ float CCar::FireDirDiff()
 	return 0.0f;
 }
 #include "script_game_object.h"
+#include "script_game_object_impl.h"
 #include "car_memory.h"
 #include "visual_memory_manager.h"
 

src/xrGame/CustomMonster.cpp

@@ -23,6 +23,7 @@
 #include "item_manager.h"
 #include "danger_manager.h"
 #include "xrAICore/Navigation/ai_object_location.h"
+#include "xrAICore/Navigation/ai_object_location_impl.h"
 #include "xrAICore/Navigation/level_graph.h"
 #include "xrAICore/Navigation/game_graph.h"
 #include "movement_manager.h"

src/xrGame/GameObject.cpp

@@ -607,7 +607,7 @@ BOOL CGameObject::net_Spawn		(CSE_Abstract*	DC)
 	}
 	BOOL ret = scriptBinder.net_Spawn(DC);
 #else
-	return						(CScriptBinder::net_Spawn(DC));
+	return						(scriptBinder.net_Spawn(DC));
 #endif
 
 #ifdef DEBUG

src/xrGame/GameObject.h

@@ -102,8 +102,10 @@ class CGameObject :
 	CGameObject();
 	virtual ~CGameObject();
     // XXX: review
+#ifdef DEBUG
     virtual u32 GetDbgUpdateFrame() const override { return dbg_update_cl; }
     virtual void SetDbgUpdateFrame(u32 value) override { dbg_update_cl = value; }
+#endif
     virtual u32 GetUpdateFrame() const override { return dwFrame_UpdateCL; }
     virtual void SetUpdateFrame(u32 value) override { dwFrame_UpdateCL = value; }
     virtual u32 GetCrowUpdateFrame() const override { return dwFrame_AsCrow; }

src/xrGame/Helicopter2.cpp

@@ -2,7 +2,7 @@
 #include "helicopter.h"
 
 #include "script_game_object.h"
-
+#include "script_game_object_impl.h"
 #include "Include/xrRender/Kinematics.h"
 #include "xrEngine/LightAnimLibrary.h"
 

src/xrGame/Level.h

@@ -395,7 +395,9 @@ class CLevel :
     u8* m_lzo_working_buffer = nullptr;
     void init_compression();
     void deinit_compression();
+#ifdef DEBUG
     LevelGraphDebugRender *GetLevelGraphDebugRender() const { return levelGraphDebugRender; }
+#endif
 };
 
 // XXX nitrocaster: should not cast to inherited

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

@@ -39,6 +39,7 @@
 #include "ai/Monsters/ai_monster_squad.h"
 #include "Actor.h"
 #include "xrAICore/Navigation/ai_object_location.h"
+#include "xrAICore/Navigation/ai_object_location_impl.h"
 #include "ai_space.h"
 #include "xrScriptEngine/script_engine.hpp"
 #include "ai/Monsters/anti_aim_ability.h"

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

@@ -17,6 +17,7 @@
 #include "Include/xrRender/KinematicsAnimated.h"
 #include "detail_path_manager.h"
 #include "xrAICore/Navigation/ai_object_location.h"
+#include "xrAICore/Navigation/ai_object_location_impl.h"
 #include "movement_manager.h"
 #include "location_manager.h"
 #include "xrServerEntities/ai_sounds.h"

src/xrGame/ai/stalker/ai_stalker.cpp

@@ -38,6 +38,7 @@
 #include "memory_manager.h"
 #include "sight_manager.h"
 #include "xrAICore/Navigation/ai_object_location.h"
+#include "xrAICore/Navigation/ai_object_location_impl.h"
 #include "stalker_movement_manager_smart_cover.h"
 #include "EntityCondition.h"
 #include "xrScriptEngine/script_engine.hpp"

src/xrGame/attachable_item.cpp

@@ -18,7 +18,7 @@
 	CAttachableItem*	CAttachableItem::m_dbgItem = NULL;
 #endif
 
-IC	CPhysicsShellHolder &CAttachableItem::object	() const
+CPhysicsShellHolder &CAttachableItem::object	() const
 {
 	return				(item().object());
 }

src/xrGame/attachable_item.h

@@ -37,7 +37,7 @@ class CAttachableItem {
 	virtual	void				afterAttach				();
 	virtual	void				afterDetach				();
 	IC		CInventoryItem		&item					() const;
-	IC		CPhysicsShellHolder	&object					() const;
+			CPhysicsShellHolder	&object					() const;
 	IC		shared_str			bone_name				() const;
 	IC		u16					bone_id					() const;
 	IC		void				set_bone_id				(u16 bone_id);

src/xrGame/ef_storage_script.cpp

@@ -10,6 +10,7 @@
 #include "ef_storage.h"
 #include "ai_space.h"
 #include "script_game_object.h"
+#include "script_game_object_impl.h"
 #include "entity_alive.h"
 #include "xrScriptEngine/script_engine.hpp"
 #include "ef_base.h"

src/xrGame/level_changer.cpp

@@ -13,6 +13,7 @@
 #include "xrserver_objects_alife.h"
 #include "Level.h"
 #include "xrAICore/Navigation/ai_object_location.h"
+#include "xrAICore/Navigation/ai_object_location_impl.h"
 #include "ai_space.h"
 #include "xrAICore/Navigation/level_graph.h"
 #include "xrAICore/Navigation/game_level_cross_table.h"

src/xrGame/object_actions.cpp

@@ -18,6 +18,7 @@
 #include "object_handler_space.h"
 #include "stalker_animation_manager.h"
 #include "object_handler_planner.h"
+#include "object_handler_planner_impl.h"
 
 //////////////////////////////////////////////////////////////////////////
 // CObjectActionCommand

src/xrGame/screenshot_manager.cpp

@@ -13,7 +13,6 @@
 #include "ximage.h"
 #include "xmemfile.h"
 
-#pragma comment(lib,"cximage.lib")
 #pragma comment(lib,"libjpeg.lib")
 
 void*	cxalloc(size_t size)

src/xrGame/script_sound.cpp

@@ -9,6 +9,7 @@
 #include "stdafx.h"
 #include "script_sound.h"
 #include "script_game_object.h"
+#include "script_game_object_impl.h"
 #include "gameobject.h"
 #include "ai_space.h"
 #include "xrScriptEngine/script_engine.hpp"

src/xrGame/smart_cover_animation_planner.cpp

@@ -8,6 +8,7 @@
 #include "pch_script.h"
 #include "smart_cover_animation_planner.h"
 #include "script_game_object.h"
+#include "script_game_object_impl.h"
 #include "ai/stalker/ai_stalker.h"
 #include "ai/stalker/ai_stalker_impl.h"
 #include "ai/stalker/ai_stalker_space.h"

src/xrGame/smart_cover_evaluators.cpp

@@ -9,6 +9,7 @@
 #include "smart_cover_evaluators.h"
 #include "stalker_property_evaluators.h"
 #include "script_game_object.h"
+#include "script_game_object_impl.h"
 #include "stalker_decision_space.h"
 #include "ai/stalker/ai_stalker.h"
 #include "ai_space.h"

src/xrGame/smart_cover_loophole_planner_actions.cpp

@@ -8,6 +8,7 @@
 #include "pch_script.h"
 #include "smart_cover_loophole_planner_actions.h"
 #include "script_game_object.h"
+#include "script_game_object_impl.h"
 #include "ai/stalker/ai_stalker.h"
 #include "ai/stalker/ai_stalker_impl.h"
 #include "ai/stalker/ai_stalker_space.h"

src/xrGame/smart_cover_planner_actions.cpp

@@ -8,12 +8,12 @@
 #include "pch_script.h"
 #include "smart_cover_planner_actions.h"
 #include "script_game_object.h"
+#include "script_game_object_impl.h"
 #include "ai/stalker/ai_stalker.h"
 #include "ai/stalker/ai_stalker_impl.h"
 #include "ai/stalker/ai_stalker_space.h"
 #include "stalker_movement_manager_smart_cover.h"
 #include "sight_manager.h"
-#include "stalker_movement_manager_smart_cover.h"
 #include "movement_manager_space.h"
 #include "sight_manager_space.h"
 #include "smart_cover.h"

src/xrGame/space_restriction_manager.cpp

@@ -93,14 +93,14 @@ shared_str	CSpaceRestrictionManager::base_out_restrictions		(ALife::_OBJECT_ID i
 	return							((*I).second.m_base_out_restrictions);
 }
 
-IC	CSpaceRestrictionManager::CRestrictionPtr CSpaceRestrictionManager::restriction	(ALife::_OBJECT_ID id)
+CSpaceRestrictionManager::CRestrictionPtr CSpaceRestrictionManager::restriction	(ALife::_OBJECT_ID id)
 {
 	CLIENT_RESTRICTIONS::iterator	I = m_clients->find(id);
 	VERIFY							(m_clients->end() != I);
 	return							((*I).second.m_restriction);
 }
 
-IC	void CSpaceRestrictionManager::collect_garbage				()
+void CSpaceRestrictionManager::collect_garbage				()
 {
 	SPACE_RESTRICTIONS::iterator	I = m_space_restrictions.begin(), J;
 	SPACE_RESTRICTIONS::iterator	E = m_space_restrictions.end();
@@ -190,7 +190,7 @@ u32	CSpaceRestrictionManager::accessible_nearest			(ALife::_OBJECT_ID id, const
 	return						(client_restriction->accessible_nearest(position,result));
 }
 
-IC	bool CSpaceRestrictionManager::restriction_presented	(shared_str restrictions, shared_str restriction) const
+bool CSpaceRestrictionManager::restriction_presented	(shared_str restrictions, shared_str restriction) const
 {
 	string4096					m_temp;
 	for (u32 i=0, n=_GetItemCount(*restrictions); i<n; ++i)
@@ -199,7 +199,7 @@ IC	bool CSpaceRestrictionManager::restriction_presented	(shared_str restrictions
 	return						(false);
 }
 
-IC	void CSpaceRestrictionManager::join_restrictions		(shared_str &restrictions, shared_str update)
+void CSpaceRestrictionManager::join_restrictions		(shared_str &restrictions, shared_str update)
 {
 	string4096					m_temp1;
 	string4096					m_temp2;
@@ -214,7 +214,7 @@ IC	void CSpaceRestrictionManager::join_restrictions		(shared_str &restrictions,
 	restrictions				= shared_str(m_temp2);
 }
 
-IC	void CSpaceRestrictionManager::difference_restrictions	(shared_str &restrictions, shared_str update)
+void CSpaceRestrictionManager::difference_restrictions	(shared_str &restrictions, shared_str update)
 {
 	string4096					m_temp1;
 	string4096					m_temp2;

src/xrGame/space_restriction_manager.h

@@ -38,11 +38,11 @@ class CSpaceRestrictionManager : public CSpaceRestrictionHolder {
 	using CSpaceRestrictionHolder::restriction;
 
 protected:
-	IC		void				join_restrictions				(shared_str &restrictions, shared_str update);
-	IC		void				difference_restrictions			(shared_str &restrictions, shared_str update);
-	IC		CRestrictionPtr		restriction						(ALife::_OBJECT_ID id);
-			CRestrictionPtr		restriction						(shared_str out_restrictors, shared_str in_restrictors);
-	IC		void				collect_garbage					();
+	void				join_restrictions				(shared_str &restrictions, shared_str update);
+	void				difference_restrictions			(shared_str &restrictions, shared_str update);
+	CRestrictionPtr		restriction						(ALife::_OBJECT_ID id);
+	CRestrictionPtr		restriction						(shared_str out_restrictors, shared_str in_restrictors);
+	void				collect_garbage					();
 	virtual void				on_default_restrictions_changed	();
 
 public:
@@ -69,7 +69,7 @@ class CSpaceRestrictionManager : public CSpaceRestrictionHolder {
 			bool				accessible						(ALife::_OBJECT_ID id, u32 level_vertex_id, float radius);
 			u32					accessible_nearest				(ALife::_OBJECT_ID id, const Fvector &position, Fvector &result);
 
-	IC		bool				restriction_presented			(shared_str restrictions, shared_str restriction) const;
+			bool				restriction_presented			(shared_str restrictions, shared_str restriction) const;
 
 #ifdef DEBUG
 	IC		const SPACE_RESTRICTIONS &restrictions				() const;

src/xrGame/stalker_alife_actions.cpp

@@ -11,6 +11,7 @@
 #include "ai/stalker/ai_stalker.h"
 #include "inventory_item.h"
 #include "script_game_object.h"
+#include "script_game_object_impl.h"
 #include "inventory.h"
 #include "weaponmagazined.h"
 #include "movement_manager_space.h"

src/xrGame/stalker_alife_planner.cpp

@@ -14,6 +14,7 @@
 #include "stalker_property_evaluators.h"
 #include "ai/stalker/ai_stalker.h"
 #include "script_game_object.h"
+#include "script_game_object_impl.h"
 
 using namespace StalkerDecisionSpace;
 

src/xrGame/stalker_alife_task_actions.cpp

@@ -13,6 +13,7 @@
 #include "inventory_item.h"
 #include "weapon.h"
 #include "script_game_object.h"
+#include "script_game_object_impl.h"
 #include "inventory.h"
 #include "alife_simulator.h"
 #include "alife_object_registry.h"

src/xrGame/stalker_anomaly_actions.cpp

@@ -10,6 +10,7 @@
 #include "stalker_anomaly_actions.h"
 #include "ai/stalker/ai_stalker.h"
 #include "script_game_object.h"
+#include "script_game_object_impl.h"
 #include "stalker_decision_space.h"
 #include "customzone.h"
 #include "space_restriction_manager.h"

src/xrGame/stalker_anomaly_planner.cpp

@@ -13,6 +13,7 @@
 #include "stalker_property_evaluators.h"
 #include "ai/stalker/ai_stalker.h"
 #include "script_game_object.h"
+#include "script_game_object_impl.h"
 
 using namespace StalkerDecisionSpace;
 

src/xrGame/stalker_base_action.cpp

@@ -10,6 +10,7 @@
 #include "stalker_base_action.h"
 #include "ai/stalker/ai_stalker.h"
 #include "script_game_object.h"
+#include "script_game_object_impl.h"
 #include "stalker_animation_manager.h"
 #include "stalker_planner.h"
 #include "ai/stalker/ai_stalker_space.h"

src/xrGame/stalker_combat_action_base.cpp

@@ -10,6 +10,7 @@
 #include "stalker_combat_action_base.h"
 #include "ai/stalker/ai_stalker.h"
 #include "script_game_object.h"
+#include "script_game_object_impl.h"
 #include "sound_player.h"
 #include "ai/stalker/ai_stalker_space.h"
 #include "memory_manager.h"

src/xrGame/stalker_combat_actions.cpp

@@ -10,6 +10,7 @@
 #include "stalker_combat_actions.h"
 #include "ai/stalker/ai_stalker.h"
 #include "script_game_object.h"
+#include "script_game_object_impl.h"
 #include "stalker_decision_space.h"
 #include "inventory.h"
 #include "cover_evaluators.h"

src/xrGame/stalker_combat_planner.cpp

@@ -15,6 +15,7 @@
 #include "ai/stalker/ai_stalker.h"
 #include "ai/stalker/ai_stalker_impl.h"
 #include "script_game_object.h"
+#include "script_game_object_impl.h"
 #include "cover_evaluators.h"
 #include "cover_manager.h"
 #include "cover_point.h"

src/xrGame/stalker_danger_by_sound_actions.cpp

@@ -10,6 +10,7 @@
 #include "stalker_danger_by_sound_actions.h"
 #include "ai/stalker/ai_stalker.h"
 #include "script_game_object.h"
+#include "script_game_object_impl.h"
 #include "stalker_movement_manager_smart_cover.h"
 #include "sight_manager.h"
 #include "object_handler.h"

src/xrGame/stalker_danger_by_sound_planner.cpp

@@ -10,6 +10,7 @@
 #include "stalker_danger_by_sound_planner.h"
 #include "ai/stalker/ai_stalker.h"
 #include "script_game_object.h"
+#include "script_game_object_impl.h"
 #include "stalker_danger_by_sound_actions.h"
 #include "stalker_decision_space.h"
 #include "stalker_danger_property_evaluators.h"

src/xrGame/stalker_danger_grenade_actions.cpp

@@ -10,6 +10,7 @@
 #include "stalker_danger_grenade_actions.h"
 #include "ai/stalker/ai_stalker.h"
 #include "script_game_object.h"
+#include "script_game_object_impl.h"
 #include "stalker_movement_manager_smart_cover.h"
 #include "sight_manager.h"
 #include "object_handler.h"

src/xrGame/stalker_danger_grenade_planner.cpp

@@ -10,6 +10,7 @@
 #include "stalker_danger_grenade_planner.h"
 #include "ai/stalker/ai_stalker.h"
 #include "script_game_object.h"
+#include "script_game_object_impl.h"
 #include "stalker_danger_grenade_actions.h"
 #include "stalker_decision_space.h"
 #include "stalker_danger_property_evaluators.h"

src/xrGame/stalker_danger_in_direction_actions.cpp

@@ -10,6 +10,7 @@
 #include "stalker_danger_in_direction_actions.h"
 #include "ai/stalker/ai_stalker.h"
 #include "script_game_object.h"
+#include "script_game_object_impl.h"
 #include "stalker_movement_manager_smart_cover.h"
 #include "sight_manager.h"
 #include "object_handler.h"

src/xrGame/stalker_danger_in_direction_planner.cpp

@@ -10,6 +10,7 @@
 #include "stalker_danger_in_direction_planner.h"
 #include "ai/stalker/ai_stalker.h"
 #include "script_game_object.h"
+#include "script_game_object_impl.h"
 #include "stalker_danger_in_direction_actions.h"
 #include "stalker_decision_space.h"
 #include "stalker_danger_property_evaluators.h"

src/xrGame/stalker_danger_planner.cpp

@@ -12,6 +12,7 @@
 #include "ai/stalker/ai_stalker_space.h"
 #include "sound_player.h"
 #include "script_game_object.h"
+#include "script_game_object_impl.h"
 #include "stalker_decision_space.h"
 #include "stalker_danger_property_evaluators.h"
 #include "memory_manager.h"

src/xrGame/stalker_danger_property_evaluators.cpp

@@ -10,6 +10,7 @@
 #include "stalker_danger_property_evaluators.h"
 #include "ai/stalker/ai_stalker.h"
 #include "script_game_object.h"
+#include "script_game_object_impl.h"
 #include "stalker_decision_space.h"
 #include "memory_manager.h"
 #include "danger_manager.h"