diff --git a/src/xrEngine/Feel_Touch.cpp b/src/xrEngine/Feel_Touch.cpp index dbabe5f0587..5f2aecec71f 100644 --- a/src/xrEngine/Feel_Touch.cpp +++ b/src/xrEngine/Feel_Touch.cpp @@ -12,9 +12,9 @@ Touch::~Touch() { } -BOOL Touch::feel_touch_contact (CObject* O) +bool Touch::feel_touch_contact (CObject* O) { - return TRUE; + return true; } void Touch::feel_touch_deny (CObject* O, DWORD T) diff --git a/src/xrEngine/Feel_Touch.h b/src/xrEngine/Feel_Touch.h index 12dbed23661..a02a0d651fc 100644 --- a/src/xrEngine/Feel_Touch.h +++ b/src/xrEngine/Feel_Touch.h @@ -27,7 +27,7 @@ namespace Feel Touch (); virtual ~Touch (); - virtual BOOL feel_touch_contact (CObject* O); + virtual bool feel_touch_contact (CObject* O); virtual void feel_touch_update (Fvector& P, float R); virtual void feel_touch_deny (CObject* O, DWORD T); virtual void feel_touch_new (CObject* O) { }; diff --git a/src/xrEngine/Feel_Vision.h b/src/xrEngine/Feel_Vision.h index 4468c4c631b..0c965bfc793 100644 --- a/src/xrEngine/Feel_Vision.h +++ b/src/xrEngine/Feel_Vision.h @@ -63,7 +63,7 @@ namespace Feel VERIFY2 (0, "There is no such object in the potentially visible list" ); return Fvector().set(flt_max,flt_max,flt_max); } - virtual BOOL feel_vision_isRelevant (CObject* O) = 0; + virtual bool feel_vision_isRelevant (CObject* O) = 0; virtual float feel_vision_mtl_transp (CObject* O, u32 element) = 0; }; }; diff --git a/src/xrEngine/IGame_Level.cpp b/src/xrEngine/IGame_Level.cpp index a3702faf7e4..c835c26f065 100644 --- a/src/xrEngine/IGame_Level.cpp +++ b/src/xrEngine/IGame_Level.cpp @@ -79,7 +79,7 @@ static void __stdcall build_callback (Fvector* V, int Vcnt, CDB::TRI* T, int Tcn g_pGameLevel->Load_GameSpecific_CFORM( T, Tcnt ); } -BOOL IGame_Level::Load (u32 dwNum) +bool IGame_Level::Load (u32 dwNum) { SECUROM_MARKER_PERFORMANCE_ON(10) @@ -139,7 +139,7 @@ BOOL IGame_Level::Load (u32 dwNum) SECUROM_MARKER_PERFORMANCE_OFF(10) - return TRUE; + return true; } #ifndef _EDITOR diff --git a/src/xrEngine/IGame_Level.h b/src/xrEngine/IGame_Level.h index c35f9aee8d6..42491abf608 100644 --- a/src/xrEngine/IGame_Level.h +++ b/src/xrEngine/IGame_Level.h @@ -82,21 +82,21 @@ class ENGINE_API IGame_Level : virtual shared_str name () const = 0; virtual void GetLevelInfo ( CServerInfo* si ) = 0; - virtual BOOL net_Start ( LPCSTR op_server, LPCSTR op_client) = 0; - virtual void net_Load ( LPCSTR name ) = 0; - virtual void net_Save ( LPCSTR name ) = 0; + virtual bool net_Start ( const char* op_server, const char* op_client) = 0; + virtual void net_Load ( const char* name ) = 0; + virtual void net_Save ( const char* name ) = 0; virtual void net_Stop ( ); virtual void net_Update ( ) = 0; - virtual BOOL Load ( u32 dwNum ); - virtual BOOL Load_GameSpecific_Before( ) { return TRUE; }; // before object loading - virtual BOOL Load_GameSpecific_After ( ) { return TRUE; }; // after object loading + virtual bool Load ( u32 dwNum ); + virtual bool Load_GameSpecific_Before( ) { return TRUE; }; // before object loading + virtual bool Load_GameSpecific_After ( ) { return TRUE; }; // after object loading virtual void Load_GameSpecific_CFORM ( CDB::TRI* T, u32 count ) = 0; virtual void _BCL OnFrame ( void ); virtual void OnRender ( void ); - virtual shared_str OpenDemoFile (LPCSTR demo_file_name) = 0; + virtual shared_str OpenDemoFile (const char* demo_file_name) = 0; virtual void net_StartPlayDemo () = 0; // Main interface diff --git a/src/xrGame/Actor.h b/src/xrGame/Actor.h index 1b2b5499b36..46a619a806e 100644 --- a/src/xrGame/Actor.h +++ b/src/xrGame/Actor.h @@ -337,8 +337,8 @@ struct SDefNewsMsg{ public: virtual void feel_touch_new (CObject* O); virtual void feel_touch_delete (CObject* O); - virtual BOOL feel_touch_contact (CObject* O); - virtual BOOL feel_touch_on_contact (CObject* O); + virtual bool feel_touch_contact (CObject* O); + virtual bool feel_touch_on_contact (CObject* O); CGameObject* ObjectWeLookingAt () {return m_pObjectWeLookingAt;} CInventoryOwner* PersonWeLookingAt () {return m_pPersonWeLookingAt;} diff --git a/src/xrGame/Actor_Feel.cpp b/src/xrGame/Actor_Feel.cpp index db81ee12078..4f99f06cae4 100644 --- a/src/xrGame/Actor_Feel.cpp +++ b/src/xrGame/Actor_Feel.cpp @@ -33,37 +33,37 @@ void CActor::feel_touch_delete (CObject* O) if(sh&&sh->character_physics_support()) m_feel_touch_characters--; } -BOOL CActor::feel_touch_contact (CObject *O) +bool CActor::feel_touch_contact (CObject *O) { CInventoryItem *item = smart_cast(O); CInventoryOwner *inventory_owner = smart_cast(O); if (item && item->Useful() && !item->object().H_Parent()) - return TRUE; + return true; if(inventory_owner && inventory_owner != smart_cast(this)) { //CPhysicsShellHolder* sh=smart_cast(O); //if(sh&&sh->character_physics_support()) m_feel_touch_characters++; - return TRUE; + return true; } - return (FALSE); + return (false); } -BOOL CActor::feel_touch_on_contact (CObject *O) +bool CActor::feel_touch_on_contact (CObject *O) { CCustomZone *custom_zone = smart_cast(O); if (!custom_zone) - return (TRUE); + return (true); Fsphere sphere; Center (sphere.P); sphere.R = 0.1f; if (custom_zone->inside(sphere)) - return (TRUE); + return (true); - return (FALSE); + return (false); } ICF static BOOL info_trace_callback(collide::rq_result& result, LPVOID params) diff --git a/src/xrGame/BastArtifact.cpp b/src/xrGame/BastArtifact.cpp index 03c89df0665..fbeef566e68 100644 --- a/src/xrGame/BastArtifact.cpp +++ b/src/xrGame/BastArtifact.cpp @@ -260,14 +260,14 @@ void CBastArtefact::feel_touch_delete(CObject* O) } } -BOOL CBastArtefact::feel_touch_contact(CObject* O) +bool CBastArtefact::feel_touch_contact(CObject* O) { CEntityAlive* pEntityAlive = smart_cast(O); if(pEntityAlive && pEntityAlive->g_Alive()) - return TRUE; + return true; else - return FALSE; + return false; } void CBastArtefact::setup_physic_shell () diff --git a/src/xrGame/BastArtifact.h b/src/xrGame/BastArtifact.h index 5bdfa34a231..9a1815e8c88 100644 --- a/src/xrGame/BastArtifact.h +++ b/src/xrGame/BastArtifact.h @@ -37,7 +37,7 @@ class CBastArtefact : public CArtefact, virtual void feel_touch_new (CObject* O); virtual void feel_touch_delete (CObject* O); - virtual BOOL feel_touch_contact (CObject* O); + virtual bool feel_touch_contact (CObject* O); bool IsAttacking() {return NULL!=m_AttakingEntity;} diff --git a/src/xrGame/BlackGraviArtifact.cpp b/src/xrGame/BlackGraviArtifact.cpp index b8d92131e3c..76cb4844698 100644 --- a/src/xrGame/BlackGraviArtifact.cpp +++ b/src/xrGame/BlackGraviArtifact.cpp @@ -158,14 +158,14 @@ void CBlackGraviArtefact::feel_touch_delete(CObject* O) } } -BOOL CBlackGraviArtefact::feel_touch_contact(CObject* O) +bool CBlackGraviArtefact::feel_touch_contact(CObject* O) { CGameObject* pGameObject = static_cast(O); if(pGameObject) - return TRUE; + return true; else - return FALSE; + return false; } void CBlackGraviArtefact::GraviStrike() diff --git a/src/xrGame/BlackGraviArtifact.h b/src/xrGame/BlackGraviArtifact.h index 3c139ce6f84..95f0fd787e8 100644 --- a/src/xrGame/BlackGraviArtifact.h +++ b/src/xrGame/BlackGraviArtifact.h @@ -30,7 +30,7 @@ class CBlackGraviArtefact: public CGraviArtefact, virtual void feel_touch_new (CObject* O); virtual void feel_touch_delete (CObject* O); - virtual BOOL feel_touch_contact (CObject* O); + virtual bool feel_touch_contact (CObject* O); protected: virtual void net_Relcase (CObject* O ); diff --git a/src/xrGame/CustomDetector.cpp b/src/xrGame/CustomDetector.cpp index 5b2ca1785c1..c030fc43b21 100644 --- a/src/xrGame/CustomDetector.cpp +++ b/src/xrGame/CustomDetector.cpp @@ -339,7 +339,7 @@ void CCustomDetector::UpdateNightVisionMode(bool b_on) { } -BOOL CAfList::feel_touch_contact (CObject* O) +bool CAfList::feel_touch_contact (CObject* O) { TypesMapIt it = m_TypesMap.find(O->cNameSect()); diff --git a/src/xrGame/CustomDetector.h b/src/xrGame/CustomDetector.h index e51c524ee85..023eff50d6a 100644 --- a/src/xrGame/CustomDetector.h +++ b/src/xrGame/CustomDetector.h @@ -103,7 +103,7 @@ class CDetectList : public Feel::Touch class CAfList :public CDetectList { protected: - virtual BOOL feel_touch_contact (CObject* O); + virtual bool feel_touch_contact (CObject* O); public: CAfList ():m_af_rank(0){} int m_af_rank; @@ -169,7 +169,7 @@ class CCustomDetector : public CHudItemObject class CZoneList : public CDetectList { protected: - virtual BOOL feel_touch_contact( CObject* O ); + virtual bool feel_touch_contact( CObject* O ); public: CZoneList(); virtual ~CZoneList(); diff --git a/src/xrGame/CustomMonster.cpp b/src/xrGame/CustomMonster.cpp index 1d2fc8238eb..ae2189cd40a 100644 --- a/src/xrGame/CustomMonster.cpp +++ b/src/xrGame/CustomMonster.cpp @@ -861,34 +861,34 @@ void CCustomMonster::PitchCorrection() } -BOOL CCustomMonster::feel_touch_on_contact (CObject *O) +bool CCustomMonster::feel_touch_on_contact (CObject *O) { CCustomZone *custom_zone = smart_cast(O); if (!custom_zone) - return (TRUE); + return (true); Fsphere sphere; sphere.P = Position(); sphere.R = EPS_L; if (custom_zone->inside(sphere)) - return (TRUE); + return (true); - return (FALSE); + return (false); } -BOOL CCustomMonster::feel_touch_contact (CObject *O) +bool CCustomMonster::feel_touch_contact (CObject *O) { CCustomZone *custom_zone = smart_cast(O); if (!custom_zone) - return (TRUE); + return (true); Fsphere sphere; sphere.P = Position(); sphere.R = 0.f; if (custom_zone->inside(sphere)) - return (TRUE); + return (true); - return (FALSE); + return (false); } void CCustomMonster::set_ready_to_save () diff --git a/src/xrGame/CustomMonster.h b/src/xrGame/CustomMonster.h index b943baf6d0c..e3c248613a7 100644 --- a/src/xrGame/CustomMonster.h +++ b/src/xrGame/CustomMonster.h @@ -114,8 +114,8 @@ class CCustomMonster : u32 NET_Time; // server time of last update //------------------------------ - virtual BOOL feel_touch_on_contact (CObject *); - virtual BOOL feel_touch_contact (CObject *); + virtual bool feel_touch_on_contact (CObject *); + virtual bool feel_touch_contact (CObject *); // utils void mk_orientation ( Fvector& dir, Fmatrix& mR ); void mk_rotation ( Fvector& dir, SRotation &R); diff --git a/src/xrGame/CustomZone.cpp b/src/xrGame/CustomZone.cpp index 9a10577d8d4..25d69dcf773 100644 --- a/src/xrGame/CustomZone.cpp +++ b/src/xrGame/CustomZone.cpp @@ -620,7 +620,7 @@ void CCustomZone::feel_touch_delete(CObject* O) } } -BOOL CCustomZone::feel_touch_contact(CObject* O) +bool CCustomZone::feel_touch_contact(CObject* O) { if (smart_cast(O)) return FALSE; if (smart_cast(O)) return FALSE; @@ -1391,10 +1391,10 @@ void CCustomZone::GoEnabledState() u_EventSend (P); } -BOOL CCustomZone::feel_touch_on_contact (CObject *O) +bool CCustomZone::feel_touch_on_contact (CObject *O) { if ((spatial.type | STYPE_VISIBLEFORAI) != spatial.type) - return (FALSE); + return (false); return (inherited::feel_touch_on_contact(O)); } diff --git a/src/xrGame/CustomZone.h b/src/xrGame/CustomZone.h index 5b2165c3907..eb79f7ac2f6 100644 --- a/src/xrGame/CustomZone.h +++ b/src/xrGame/CustomZone.h @@ -59,8 +59,8 @@ class CCustomZone : public CSpaceRestrictor, virtual void exit_Zone (SZoneObjectInfo& io); virtual void feel_touch_new (CObject* O); virtual void feel_touch_delete (CObject* O); - virtual BOOL feel_touch_contact (CObject* O); - virtual BOOL feel_touch_on_contact (CObject* O); + virtual bool feel_touch_contact (CObject* O); + virtual bool feel_touch_on_contact (CObject* O); float effective_radius (float nearest_shape_radius); virtual void net_Relcase (CObject* O); diff --git a/src/xrGame/GameObject.h b/src/xrGame/GameObject.h index 53079244087..448aff3bb27 100644 --- a/src/xrGame/GameObject.h +++ b/src/xrGame/GameObject.h @@ -90,7 +90,7 @@ class CGameObject : virtual CBaseMonster* cast_base_monster () {return NULL;} public: - virtual BOOL feel_touch_on_contact (CObject *) {return TRUE;} + virtual bool feel_touch_on_contact (CObject *) {return TRUE;} virtual bool use (CGameObject* who_use) {return CUsableScriptObject::use(who_use);}; public: diff --git a/src/xrGame/Level.cpp b/src/xrGame/Level.cpp index c7bdc79889d..e502411db4d 100644 --- a/src/xrGame/Level.cpp +++ b/src/xrGame/Level.cpp @@ -242,7 +242,7 @@ int CLevel::get_RPID(LPCSTR /**name/**/) return -1; } -BOOL g_bDebugEvents = FALSE; +bool g_bDebugEvents = false; void CLevel::cl_Process_Event(u16 dest, u16 type, NET_Packet& P) { @@ -1041,7 +1041,7 @@ CZoneList* CLevel::create_hud_zones_list() return hud_zones_list; } -BOOL CZoneList::feel_touch_contact(CObject* O) +bool CZoneList::feel_touch_contact(CObject* O) { TypesMapIt it = m_TypesMap.find(O->cNameSect()); bool res = (it != m_TypesMap.end()); diff --git a/src/xrGame/Level.h b/src/xrGame/Level.h index 35177373eb0..275be1dca7f 100644 --- a/src/xrGame/Level.h +++ b/src/xrGame/Level.h @@ -114,9 +114,9 @@ class CLevel : void OnSecureKeySync(NET_Packet& P); void SecureSend(NET_Packet& P, u32 dwFlags = DPNSEND_GUARANTEED, u32 dwTimeout = 0); secure_messaging::key_t m_secret_key; - BOOL m_bNeed_CrPr = false; + bool m_bNeed_CrPr = false; u32 m_dwNumSteps = 0; - BOOL m_bIn_CrPr = false; + bool m_bIn_CrPr = false; xr_vector pObjects4CrPr; xr_vector pActors4CrPr; CObject* pCurrentControlEntity = nullptr; @@ -135,7 +135,7 @@ class CLevel : u32 m_dwLastNetUpdateTime = 0; void UpdateDeltaUpd(u32 LastTime); void BlockCheatLoad(); - BOOL Connect2Server(LPCSTR options); + bool Connect2Server(const char* options); void SendClientDigestToServer(); shared_str m_client_digest; // for screenshots @@ -155,8 +155,8 @@ class CLevel : DEFINE_VECTOR(CParticlesObject*, POVec, POIt); POVec m_StaticParticles; game_cl_GameState* game = nullptr; - BOOL m_bGameConfigStarted = false; - BOOL game_configured = false; + bool m_bGameConfigStarted = false; + bool game_configured = false; NET_Queue_Event* game_events = nullptr; xr_deque game_spawn_queue; xrServer* Server = nullptr; @@ -170,13 +170,13 @@ class CLevel : SoundRegistryMap sound_registry; public: - void PrefetchSound(LPCSTR name); + void PrefetchSound(const char* name); protected: - BOOL net_start_result_total; - BOOL connected_to_server; - BOOL deny_m_spawn; // only for debug... - BOOL sended_request_connection_data; + bool net_start_result_total; + bool connected_to_server; + bool deny_m_spawn; // only for debug... + bool sended_request_connection_data; void MakeReconnect(); LevelMapSyncData map_data; bool synchronize_map_data(); @@ -203,20 +203,20 @@ class CLevel : shared_str m_caServerOptions; shared_str m_caClientOptions; // Starting/Loading - virtual BOOL net_Start(LPCSTR op_server, LPCSTR op_client); - virtual void net_Load(LPCSTR name); - virtual void net_Save(LPCSTR name); + virtual bool net_Start(const char* op_server, const char* op_client); + virtual void net_Load(const char* name); + virtual void net_Save(const char* name); virtual void net_Stop(); - virtual BOOL net_Start_client(LPCSTR name); + virtual bool net_Start_client(const char* name); virtual void net_Update(); - virtual BOOL Load_GameSpecific_Before(); - virtual BOOL Load_GameSpecific_After(); + virtual bool Load_GameSpecific_Before(); + virtual bool Load_GameSpecific_After(); virtual void Load_GameSpecific_CFORM(CDB::TRI* T, u32 count); // Events virtual void OnEvent(EVENT E, u64 P1, u64 P2); virtual void _BCL OnFrame(void); virtual void OnRender(); - virtual shared_str OpenDemoFile(LPCSTR demo_file_name); + virtual shared_str OpenDemoFile(const char* demo_file_name); virtual void net_StartPlayDemo(); void cl_Process_Event(u16 dest, u16 type, NET_Packet& P); void cl_Process_Spawn(NET_Packet& P); @@ -395,5 +395,5 @@ IC bool OnServer() { return Level().IsServer(); } IC bool OnClient() { return Level().IsClient(); } IC bool IsGameTypeSingle() { return (g_pGamePersistent->GameType() == eGameIDSingle); } -extern BOOL g_bDebugEvents; +extern bool g_bDebugEvents; diff --git a/src/xrGame/Level_load.cpp b/src/xrGame/Level_load.cpp index dfd644f8e1e..fb0f4b692e3 100644 --- a/src/xrGame/Level_load.cpp +++ b/src/xrGame/Level_load.cpp @@ -15,7 +15,7 @@ ENGINE_API bool g_dedicated_server; -BOOL CLevel::Load_GameSpecific_Before() +bool CLevel::Load_GameSpecific_Before() { // AI space // g_pGamePersistent->LoadTitle ("st_loading_ai_objects"); @@ -34,7 +34,7 @@ BOOL CLevel::Load_GameSpecific_Before() return (TRUE); } -BOOL CLevel::Load_GameSpecific_After() +bool CLevel::Load_GameSpecific_After() { R_ASSERT(m_StaticParticles.empty()); // loading static particles diff --git a/src/xrGame/Level_network.cpp b/src/xrGame/Level_network.cpp index d1ca5df6f2d..921c16f7116 100644 --- a/src/xrGame/Level_network.cpp +++ b/src/xrGame/Level_network.cpp @@ -336,7 +336,7 @@ pureFrame* g_pNetProcessor = &NET_processor; const int ConnectionTimeOut = 60000; //1 min -BOOL CLevel::Connect2Server (LPCSTR options) +bool CLevel::Connect2Server (const char* options) { NET_Packet P; m_bConnectResultReceived = false ; diff --git a/src/xrGame/Level_network_start_client.cpp b/src/xrGame/Level_network_start_client.cpp index daef55c03f2..253619c10b6 100644 --- a/src/xrGame/Level_network_start_client.cpp +++ b/src/xrGame/Level_network_start_client.cpp @@ -18,9 +18,9 @@ #include "physics_game.h" extern pureFrame* g_pNetProcessor; -BOOL CLevel::net_Start_client ( LPCSTR options ) +bool CLevel::net_Start_client ( const char* options ) { - return FALSE; + return false; } #include "string_table.h" bool CLevel::net_start_client1 () diff --git a/src/xrGame/Level_start.cpp b/src/xrGame/Level_start.cpp index dbc71b530e2..4d607b18251 100644 --- a/src/xrGame/Level_start.cpp +++ b/src/xrGame/Level_start.cpp @@ -17,7 +17,7 @@ int g_cl_save_demo = 0; extern XRCORE_API bool g_allow_heap_min; -shared_str CLevel::OpenDemoFile(LPCSTR demo_file_name) +shared_str CLevel::OpenDemoFile(const char* demo_file_name) { PrepareToPlayDemo(demo_file_name); return m_demo_server_options; @@ -27,7 +27,7 @@ void CLevel::net_StartPlayDemo() net_Start(m_demo_server_options.c_str(), "localhost"); } -BOOL CLevel::net_Start ( LPCSTR op_server, LPCSTR op_client ) +bool CLevel::net_Start(const char* op_server, const char* op_client) { net_start_result_total = TRUE; diff --git a/src/xrGame/Mincer.cpp b/src/xrGame/Mincer.cpp index 764ba0c2393..b6b1f0046af 100644 --- a/src/xrGame/Mincer.cpp +++ b/src/xrGame/Mincer.cpp @@ -75,7 +75,7 @@ void CMincer::feel_touch_new (CObject* O) Telekinesis().activate(GO, m_fThrowInImpulse, m_fTeleHeight, 100000); } } -BOOL CMincer::feel_touch_contact (CObject* O) +bool CMincer::feel_touch_contact (CObject* O) { return inherited::feel_touch_contact(O)&&smart_cast(O); } diff --git a/src/xrGame/Mincer.h b/src/xrGame/Mincer.h index 82ce97f44ba..ab2107a1fe4 100644 --- a/src/xrGame/Mincer.h +++ b/src/xrGame/Mincer.h @@ -33,7 +33,7 @@ class CMincer : virtual ~CMincer (); // virtual void SwitchZoneState (EZoneState new_state); virtual void OnStateSwitch (EZoneState new_state); - virtual BOOL feel_touch_contact (CObject* O); + virtual bool feel_touch_contact (CObject* O); virtual void feel_touch_new (CObject* O); virtual void Load (LPCSTR section); virtual bool BlowoutState (); diff --git a/src/xrGame/PDA.cpp b/src/xrGame/PDA.cpp index f0a1f0e81b9..36c9ce9423c 100644 --- a/src/xrGame/PDA.cpp +++ b/src/xrGame/PDA.cpp @@ -104,13 +104,13 @@ void CPda::feel_touch_delete(CObject* O) } } -BOOL CPda::feel_touch_contact(CObject* O) +bool CPda::feel_touch_contact(CObject* O) { CEntityAlive* entity_alive = smart_cast(O); if ( entity_alive && entity_alive->cast_base_monster() ) { - return TRUE; + return true; } else if ( CInventoryOwner* pInvOwner = smart_cast(O) ) { @@ -118,12 +118,12 @@ BOOL CPda::feel_touch_contact(CObject* O) { CEntityAlive* pEntityAlive = smart_cast(O); if(pEntityAlive) - return TRUE; + return true; }else - return FALSE; + return false; } - return FALSE; + return false; } void CPda::OnH_A_Chield() diff --git a/src/xrGame/PDA.h b/src/xrGame/PDA.h index 6ca5b0ba599..1f8495ea6b0 100644 --- a/src/xrGame/PDA.h +++ b/src/xrGame/PDA.h @@ -33,7 +33,7 @@ class CPda : virtual void feel_touch_new (CObject* O); virtual void feel_touch_delete (CObject* O); - virtual BOOL feel_touch_contact (CObject* O); + virtual bool feel_touch_contact (CObject* O); virtual u16 GetOriginalOwnerID () {return m_idOriginalOwner;} diff --git a/src/xrGame/RadioactiveZone.cpp b/src/xrGame/RadioactiveZone.cpp index e6fa083f65f..0f9db1be69d 100644 --- a/src/xrGame/RadioactiveZone.cpp +++ b/src/xrGame/RadioactiveZone.cpp @@ -88,16 +88,16 @@ void CRadioactiveZone::feel_touch_new (CObject* O ) }; #include "actor.h" -BOOL CRadioactiveZone::feel_touch_contact(CObject* O) +bool CRadioactiveZone::feel_touch_contact(CObject* O) { CActor* A = smart_cast(O); if ( A ) { - if (!((CCF_Shape*)CFORM())->Contact(O)) return FALSE; + if (!((CCF_Shape*)CFORM())->Contact(O)) return false; return A->feel_touch_on_contact(this); }else - return FALSE; + return false; } void CRadioactiveZone::UpdateWorkload (u32 dt) diff --git a/src/xrGame/RadioactiveZone.h b/src/xrGame/RadioactiveZone.h index 3cfe15eaeff..5f2ac27f1b6 100644 --- a/src/xrGame/RadioactiveZone.h +++ b/src/xrGame/RadioactiveZone.h @@ -14,7 +14,7 @@ class CRadioactiveZone : public CCustomZone virtual void Affect (SZoneObjectInfo* O); virtual void feel_touch_new (CObject* O ); virtual void UpdateWorkload (u32 dt ); // related to fast-mode optimizations - virtual BOOL feel_touch_contact (CObject* O ); + virtual bool feel_touch_contact (CObject* O ); float nearest_shape_radius (SZoneObjectInfo* O); protected: diff --git a/src/xrGame/actor_memory.cpp b/src/xrGame/actor_memory.cpp index 585f92cc93c..2a6e84e0437 100644 --- a/src/xrGame/actor_memory.cpp +++ b/src/xrGame/actor_memory.cpp @@ -22,13 +22,13 @@ CActorMemory::CActorMemory (CActor *actor) : VERIFY (m_actor); } -BOOL CActorMemory::feel_vision_isRelevant (CObject* O) +bool CActorMemory::feel_vision_isRelevant (CObject* O) { CEntityAlive *entity_alive = smart_cast(O); if (!entity_alive) - return (FALSE); + return (false); - return (TRUE); + return (true); } void CActorMemory::camera ( diff --git a/src/xrGame/actor_memory.h b/src/xrGame/actor_memory.h index 5435902c256..18cb9a96715 100644 --- a/src/xrGame/actor_memory.h +++ b/src/xrGame/actor_memory.h @@ -21,7 +21,7 @@ class CActorMemory : public vision_client { public: CActorMemory (CActor *actor); - virtual BOOL feel_vision_isRelevant (CObject *object); + virtual bool feel_vision_isRelevant (CObject *object); virtual void camera ( Fvector &position, Fvector &direction, diff --git a/src/xrGame/ai/monsters/basemonster/base_monster.cpp b/src/xrGame/ai/monsters/basemonster/base_monster.cpp index 0e188e8fc50..bc25e8d57cb 100644 --- a/src/xrGame/ai/monsters/basemonster/base_monster.cpp +++ b/src/xrGame/ai/monsters/basemonster/base_monster.cpp @@ -600,12 +600,12 @@ void CBaseMonster::set_state_sound(u32 type, bool once) m_prev_sound_type = type; } -BOOL CBaseMonster::feel_touch_on_contact (CObject *O) +bool CBaseMonster::feel_touch_on_contact (CObject *O) { return (inherited::feel_touch_on_contact(O)); } -BOOL CBaseMonster::feel_touch_contact(CObject *O) +bool CBaseMonster::feel_touch_contact(CObject *O) { m_anomaly_detector->on_contact(O); return inherited::feel_touch_contact(O); diff --git a/src/xrGame/ai/monsters/basemonster/base_monster.h b/src/xrGame/ai/monsters/basemonster/base_monster.h index caeee17d1e9..b5fb5fbdc6b 100644 --- a/src/xrGame/ai/monsters/basemonster/base_monster.h +++ b/src/xrGame/ai/monsters/basemonster/base_monster.h @@ -118,9 +118,9 @@ class CBaseMonster : public CCustomMonster, public CStepManager virtual void init () {} virtual void feel_sound_new (CObject* who, int eType, CSound_UserDataPtr user_data, const Fvector &Position, float power); - virtual BOOL feel_vision_isRelevant (CObject* O); - virtual BOOL feel_touch_on_contact (CObject* O); - virtual BOOL feel_touch_contact (CObject *); + virtual bool feel_vision_isRelevant (CObject* O); + virtual bool feel_touch_on_contact (CObject* O); + virtual bool feel_touch_contact (CObject *); virtual bool useful (const CItemManager *manager, const CGameObject *object) const; virtual float evaluate (const CItemManager *manager, const CGameObject *object) const; diff --git a/src/xrGame/ai/monsters/basemonster/base_monster_feel.cpp b/src/xrGame/ai/monsters/basemonster/base_monster_feel.cpp index e878410bebe..d35eb50796e 100644 --- a/src/xrGame/ai/monsters/basemonster/base_monster_feel.cpp +++ b/src/xrGame/ai/monsters/basemonster/base_monster_feel.cpp @@ -195,15 +195,15 @@ void CBaseMonster::HitEntity(const CEntity *pEntity, float fDamage, float impuls } -BOOL CBaseMonster::feel_vision_isRelevant(CObject* O) +bool CBaseMonster::feel_vision_isRelevant(CObject* O) { - if (!g_Alive()) return FALSE; - if (0==smart_cast(O)) return FALSE; + if (!g_Alive()) return false; + if (0==smart_cast(O)) return false; - if ((O->spatial.type & STYPE_VISIBLEFORAI) != STYPE_VISIBLEFORAI) return FALSE; + if ((O->spatial.type & STYPE_VISIBLEFORAI) != STYPE_VISIBLEFORAI) return false; // если спит, то ничего не видит - if (m_bSleep) return FALSE; + if (m_bSleep) return false; // если не враг - не видит CEntityAlive* entity = smart_cast (O); @@ -212,11 +212,11 @@ BOOL CBaseMonster::feel_vision_isRelevant(CObject* O) // если видит друга - проверить наличие у него врагов CBaseMonster *monster = smart_cast(entity); if (monster && !m_skip_transfer_enemy) EnemyMan.transfer_enemy(monster); - return FALSE; + return false; } } - return TRUE; + return true; } void CBaseMonster::HitSignal(float amount, Fvector& vLocalDir, CObject* who, s16 element) diff --git a/src/xrGame/ai/monsters/psy_aura.h b/src/xrGame/ai/monsters/psy_aura.h index ca148f430ab..4eab2e9d30c 100644 --- a/src/xrGame/ai/monsters/psy_aura.h +++ b/src/xrGame/ai/monsters/psy_aura.h @@ -19,7 +19,7 @@ class CPsyAura : public Feel::Touch, public CEnergyHolder { virtual ~CPsyAura (); void init_external (CBaseMonster *obj) {m_object = obj;} - virtual BOOL feel_touch_contact (CObject* O){return FALSE;} + virtual bool feel_touch_contact (CObject* O){return FALSE;} virtual void schedule_update (); virtual void process_objects_in_aura () {} diff --git a/src/xrGame/ai/monsters/rats/ai_rat.h b/src/xrGame/ai/monsters/rats/ai_rat.h index 89a1a390186..14c5782f239 100644 --- a/src/xrGame/ai/monsters/rats/ai_rat.h +++ b/src/xrGame/ai/monsters/rats/ai_rat.h @@ -375,8 +375,8 @@ class CAI_Rat : public CCustomMonster, public CEatableItem virtual void Exec_Action (float dt); virtual void feel_sound_new (CObject* who, int type, CSound_UserDataPtr user_data, const Fvector &Position, float power); virtual void feel_touch_new (CObject* O); - virtual BOOL feel_touch_on_contact (CObject* O); - virtual BOOL feel_vision_isRelevant (CObject*); + virtual bool feel_touch_on_contact (CObject* O); + virtual bool feel_vision_isRelevant(CObject*); virtual void shedule_Update (u32 dt); virtual void UpdateCL (); virtual void Hit (SHit* pHDS); diff --git a/src/xrGame/ai/monsters/rats/ai_rat_feel.cpp b/src/xrGame/ai/monsters/rats/ai_rat_feel.cpp index f84e1cb3b9a..bd65e6de5c9 100644 --- a/src/xrGame/ai/monsters/rats/ai_rat_feel.cpp +++ b/src/xrGame/ai/monsters/rats/ai_rat_feel.cpp @@ -12,12 +12,12 @@ #include "../../../enemy_manager.h" #include "../../../../xrServerEntities/ai_sounds.h" -BOOL CAI_Rat::feel_vision_isRelevant(CObject* O) +bool CAI_Rat::feel_vision_isRelevant(CObject* O) { CEntityAlive* E = smart_cast (O); - if (!E) return FALSE; - if ((E->g_Team() == g_Team()) && (E->g_Alive())) return FALSE; - return TRUE; + if (!E) return false; + if ((E->g_Team() == g_Team()) && (E->g_Alive())) return false; + return true; } void CAI_Rat::feel_sound_new(CObject* who, int eType, CSound_UserDataPtr user_data, const Fvector &Position, float power) @@ -49,7 +49,7 @@ void CAI_Rat::feel_sound_new(CObject* who, int eType, CSound_UserDataPtr user_da inherited::feel_sound_new (who,eType,user_data,Position,power); } -BOOL CAI_Rat::feel_touch_on_contact (CObject *O) +bool CAI_Rat::feel_touch_on_contact (CObject *O) { return (inherited::feel_touch_on_contact(O)); } diff --git a/src/xrGame/ai/stalker/ai_stalker.h b/src/xrGame/ai/stalker/ai_stalker.h index 8f0f05a9591..141ce6dfdcb 100644 --- a/src/xrGame/ai/stalker/ai_stalker.h +++ b/src/xrGame/ai/stalker/ai_stalker.h @@ -211,7 +211,7 @@ class CAI_Stalker : virtual void Exec_Look (float dt); virtual void Hit (SHit* pHDS); virtual void PHHit (SHit &H); - virtual BOOL feel_vision_isRelevant (CObject* who); + virtual bool feel_vision_isRelevant (CObject* who); virtual float Radius () const; #ifdef DEBUG virtual void OnHUDDraw (CCustomHUD* hud); @@ -303,8 +303,8 @@ class CAI_Stalker : bool fire_make_sense (); virtual LPCSTR Name () const; - virtual BOOL feel_touch_contact (CObject* O); - virtual BOOL feel_touch_on_contact (CObject* O); + virtual bool feel_touch_contact (CObject* O); + virtual bool feel_touch_on_contact (CObject* O); //флаги, какие действия совершал актер по отношению к сталкеру //(помог, атаковал и т.д.) diff --git a/src/xrGame/ai/stalker/ai_stalker_feel.cpp b/src/xrGame/ai/stalker/ai_stalker_feel.cpp index a9abdb4d1bc..8726df73377 100644 --- a/src/xrGame/ai/stalker/ai_stalker_feel.cpp +++ b/src/xrGame/ai/stalker/ai_stalker_feel.cpp @@ -20,15 +20,15 @@ extern Flags32 psAI_Flags; #endif // DEBUG -BOOL CAI_Stalker::feel_vision_isRelevant(CObject* O) +bool CAI_Stalker::feel_vision_isRelevant(CObject* O) { if (!g_Alive()) - return FALSE; + return false; CEntityAlive* E = smart_cast (O); CInventoryItem* I = smart_cast (O); - if (!E && !I) return (FALSE); -// if (E && (E->g_Team() == g_Team())) return FALSE; - return(TRUE); + if (!E && !I) return (false); +// if (E && (E->g_Team() == g_Team())) return false; + return(true); } void CAI_Stalker::renderable_Render () @@ -56,30 +56,30 @@ bool CAI_Stalker::bfCheckForNodeVisibility(u32 dwNodeID, bool bIfRayPick) return (memory().visual().visible(dwNodeID,movement().m_head.current.yaw,ffGetFov())); } -BOOL CAI_Stalker::feel_touch_contact (CObject *O) +bool CAI_Stalker::feel_touch_contact (CObject *O) { if ( !m_take_items_enabled && smart_cast(O) ) - return (FALSE); + return (false); if (O == this) - return (FALSE); + return (false); if (!inherited::feel_touch_contact(O)) - return (FALSE); + return (false); CGameObject *game_object = smart_cast(O); if (!game_object) - return (FALSE); + return (false); return (game_object->feel_touch_on_contact(this)); } -BOOL CAI_Stalker::feel_touch_on_contact (CObject *O) +bool CAI_Stalker::feel_touch_on_contact (CObject *O) { VERIFY (O != this); if ((O->spatial.type | STYPE_VISIBLEFORAI) != O->spatial.type) - return (FALSE); + return (false); return (inherited::feel_touch_on_contact(O)); } diff --git a/src/xrGame/car_memory.cpp b/src/xrGame/car_memory.cpp index 72ef5f4e67a..88878201f78 100644 --- a/src/xrGame/car_memory.cpp +++ b/src/xrGame/car_memory.cpp @@ -32,10 +32,10 @@ void car_memory::reload(LPCSTR section) m_far_plane = pSettings->r_float(section,"view_far_plane"); } #include "actor.h" -BOOL car_memory::feel_vision_isRelevant (CObject *object) +bool car_memory::feel_vision_isRelevant (CObject *object) { return (NULL!=smart_cast(object)); -//. return (FALSE); +//. return (false); } void car_memory::camera ( diff --git a/src/xrGame/car_memory.h b/src/xrGame/car_memory.h index 01b4f9b70c9..2bb4044a819 100644 --- a/src/xrGame/car_memory.h +++ b/src/xrGame/car_memory.h @@ -31,7 +31,7 @@ class car_memory : public vision_client { virtual void reload (LPCSTR section); - virtual BOOL feel_vision_isRelevant (CObject *object); + virtual bool feel_vision_isRelevant (CObject *object); virtual void camera ( Fvector &position, Fvector &direction, diff --git a/src/xrGame/level_changer.cpp b/src/xrGame/level_changer.cpp index d5d9f802c89..615f4d6f66f 100644 --- a/src/xrGame/level_changer.cpp +++ b/src/xrGame/level_changer.cpp @@ -162,9 +162,9 @@ bool CLevelChanger::get_reject_pos(Fvector& p, Fvector& r) return false; } -BOOL CLevelChanger::feel_touch_contact (CObject *object) +bool CLevelChanger::feel_touch_contact (CObject *object) { - BOOL bRes = (((CCF_Shape*)CFORM())->Contact(object)); + bool bRes = (((CCF_Shape*)CFORM())->Contact(object)); bRes = bRes && smart_cast(object) && smart_cast(object)->g_Alive(); return bRes; } diff --git a/src/xrGame/level_changer.h b/src/xrGame/level_changer.h index 86613bf41a2..b86c84fd116 100644 --- a/src/xrGame/level_changer.h +++ b/src/xrGame/level_changer.h @@ -37,7 +37,7 @@ class CLevelChanger : public CGameObject, public Feel::Touch { virtual float Radius () const; virtual void shedule_Update (u32 dt); virtual void feel_touch_new (CObject* O); - virtual BOOL feel_touch_contact (CObject* O); + virtual bool feel_touch_contact (CObject* O); virtual bool IsVisibleForZones() { return false;} void EnableLevelChanger (bool b) {m_b_enabled=b;} diff --git a/src/xrGame/script_zone.cpp b/src/xrGame/script_zone.cpp index c9d0d923d7a..6e07a761fea 100644 --- a/src/xrGame/script_zone.cpp +++ b/src/xrGame/script_zone.cpp @@ -88,7 +88,7 @@ void CScriptZone::net_Relcase (CObject *O) } } -BOOL CScriptZone::feel_touch_contact (CObject* O) +bool CScriptZone::feel_touch_contact (CObject* O) { return (((CCF_Shape*)CFORM())->Contact(O)); } diff --git a/src/xrGame/script_zone.h b/src/xrGame/script_zone.h index 29bce1c921e..ed24bb4615c 100644 --- a/src/xrGame/script_zone.h +++ b/src/xrGame/script_zone.h @@ -28,7 +28,7 @@ class CScriptZone : public CSpaceRestrictor, public Feel::Touch { virtual void shedule_Update (u32 dt); virtual void feel_touch_new (CObject* O); virtual void feel_touch_delete (CObject* O); - virtual BOOL feel_touch_contact (CObject* O); + virtual bool feel_touch_contact (CObject* O); bool active_contact (u16 id) const; virtual bool IsVisibleForZones () {return false;} virtual bool register_schedule () const {return true;} diff --git a/src/xrGame/smart_cover_object.h b/src/xrGame/smart_cover_object.h index 141a7979b29..40698733461 100644 --- a/src/xrGame/smart_cover_object.h +++ b/src/xrGame/smart_cover_object.h @@ -30,7 +30,7 @@ class object : public: virtual void Load (LPCSTR section); - virtual BOOL feel_touch_on_contact (CObject *) { return FALSE; } + virtual bool feel_touch_on_contact (CObject *) { return FALSE; } virtual bool use (CGameObject* who_use) { return false; } virtual BOOL net_Spawn (CSE_Abstract* DC); virtual void UpdateCL (); diff --git a/src/xrGame/team_base_zone.cpp b/src/xrGame/team_base_zone.cpp index ffd2e2b260d..52e66dd4af0 100644 --- a/src/xrGame/team_base_zone.cpp +++ b/src/xrGame/team_base_zone.cpp @@ -136,10 +136,10 @@ void CTeamBaseZone::feel_touch_delete (CObject *tpObject) }; } -BOOL CTeamBaseZone::feel_touch_contact (CObject* O) +bool CTeamBaseZone::feel_touch_contact (CObject* O) { CActor* pActor = smart_cast(O); - if (!pActor) return (FALSE); + if (!pActor) return (false); return ((CCF_Shape*)CFORM())->Contact(O); } diff --git a/src/xrGame/team_base_zone.h b/src/xrGame/team_base_zone.h index 632ddfa9da8..f7e54583e3d 100644 --- a/src/xrGame/team_base_zone.h +++ b/src/xrGame/team_base_zone.h @@ -29,7 +29,7 @@ class CTeamBaseZone : public CGameObject, public Feel::Touch { virtual void shedule_Update (u32 dt); virtual void feel_touch_new (CObject* O); virtual void feel_touch_delete (CObject* O); - virtual BOOL feel_touch_contact (CObject* O); + virtual bool feel_touch_contact (CObject* O); virtual u8 GetZoneTeam () { return m_Team; }; #ifdef DEBUG diff --git a/src/xrGame/vision_client.h b/src/xrGame/vision_client.h index 994600d7f42..69091354767 100644 --- a/src/xrGame/vision_client.h +++ b/src/xrGame/vision_client.h @@ -52,7 +52,7 @@ class vision_client : virtual float feel_vision_mtl_transp (CObject *object, u32 element); public: - virtual BOOL feel_vision_isRelevant (CObject *object) = 0; + virtual bool feel_vision_isRelevant (CObject *object) = 0; virtual void camera ( Fvector &position, Fvector &direction,