From 0c0834b3c6900448c04e995d4638182d90a93531 Mon Sep 17 00:00:00 2001 From: tamlin-mike Date: Fri, 22 Jul 2016 17:40:57 +0200 Subject: [PATCH] More cleaning/decoupling. Some 'override' added. Fixed up stricmp -> _stricmp & co. Replace _stricmp & co. to instead use xr_-prepended function names in the code, and select impl. from a header depending on compiler used. Tagged up CKinematics with 'override' where appropriate. Removed a bunch of compiler warnings (unused function arguments, re-defining variable name in function (sometimes with different type even)). Moved a few Lock instances in a class to be Lock* (compile-time complexity reduction). Xottab_DUTY: removed some include guards --- src/Common/Compiler.inl | 18 ++++ src/Layers/xrRender/AnimationKeyCalculate.h | 6 +- src/Layers/xrRender/Blender_Recorder_R2.cpp | 2 +- src/Layers/xrRender/D3DUtils.cpp | 36 ++++---- src/Layers/xrRender/DetailManager_VS.cpp | 2 +- src/Layers/xrRender/FHierrarhyVisual.cpp | 2 +- src/Layers/xrRender/HOM.cpp | 6 +- src/Layers/xrRender/HW.cpp | 2 +- src/Layers/xrRender/ModelPool.cpp | 4 +- src/Layers/xrRender/NvTriStrip.cpp | 3 +- src/Layers/xrRender/PSLibrary.cpp | 12 +-- src/Layers/xrRender/ParticleGroup.cpp | 14 +-- src/Layers/xrRender/ParticleGroup.h | 2 +- src/Layers/xrRender/ResourceManager.cpp | 15 +-- .../xrRender/ResourceManager_Resources.cpp | 12 +-- src/Layers/xrRender/SH_Texture.cpp | 4 +- src/Layers/xrRender/ShaderResourceTraits.h | 2 +- src/Layers/xrRender/SkeletonAnimated.cpp | 2 +- src/Layers/xrRender/SkeletonCustom.cpp | 4 +- src/Layers/xrRender/SkeletonCustom.h | 92 ++++++++++--------- src/Layers/xrRender/Texture.cpp | 12 +-- src/Layers/xrRender/TextureDescrManager.cpp | 4 +- src/Layers/xrRender/blenders/Blender.cpp | 2 +- .../xrRender/blenders/Blender_Palette.cpp | 2 +- .../xrRender/blenders/Blender_Recorder.cpp | 4 +- src/Layers/xrRender/r__dsgraph_build.cpp | 6 ++ .../3DFluid/dx103DFluidObstacles.cpp | 2 +- .../xrRenderDX10/Blender_Recorder_R3.cpp | 2 +- src/Layers/xrRenderDX10/dx10HW.cpp | 2 +- .../dx10ResourceManager_Resources.cpp | 10 +- src/Layers/xrRenderDX10/dx10SH_Texture.cpp | 4 +- src/Layers/xrRenderDX10/dx10Texture.cpp | 6 +- src/Layers/xrRenderGL/Blender_Recorder_GL.cpp | 2 +- src/Layers/xrRenderGL/glHW.cpp | 2 +- src/Layers/xrRenderGL/glSH_Texture.cpp | 4 +- .../glResourceManager_Resources.cpp | 10 +- src/Layers/xrRenderPC_GL/glTexture.cpp | 12 +-- src/Layers/xrRenderPC_GL/r3_R_sun_support.h | 2 +- src/Layers/xrRenderPC_R1/Blender_LaEmB.cpp | 2 +- src/Layers/xrRenderPC_R4/CSCompiler.cpp | 2 +- src/editors/ActorEditor/BonePart.cpp | 2 +- src/editors/ActorEditor/BottomBar.cpp | 2 +- src/editors/ActorEditor/UI_ActorToolsUndo.cpp | 12 +-- src/editors/ECore/Editor/EditMesh.cpp | 2 +- src/editors/ECore/Editor/EditObject.cpp | 4 +- src/editors/ECore/Editor/EditObjectImport.cpp | 2 +- .../ECore/Editor/EditObjectMotions.cpp | 12 +-- src/editors/ECore/Editor/ExportSkeleton.cpp | 2 +- src/editors/ECore/Editor/Library.cpp | 2 +- src/editors/ECore/Editor/UI_MainCommand.cpp | 4 +- src/editors/ECore/Editor/UI_ToolsCustom.cpp | 8 +- src/editors/ECore/Editor/xrLoadSurface.cpp | 2 +- src/editors/LevelEditor/BottomBar.cpp | 2 +- .../LevelEditor/Edit/BuilderRemote.cpp | 2 +- src/editors/LevelEditor/Edit/CustomObject.h | 2 +- .../LevelEditor/Edit/EParticlesObject.h | 2 +- .../Edit/ESceneDOTools_Generate.cpp | 4 +- .../LevelEditor/Edit/ESceneObjectTools.cpp | 2 +- .../LevelEditor/Edit/ESceneObjectTools_.cpp | 2 +- .../LevelEditor/Edit/ESceneObjectTools__.cpp | 2 +- .../LevelEditor/Edit/SceneSummaryInfo.cpp | 12 +-- src/editors/LevelEditor/Edit/SceneUndo.cpp | 12 +-- src/editors/LevelEditor/Edit/sector.cpp | 2 +- src/editors/LevelEditor/EditLibrary.cpp | 2 +- src/editors/LevelEditor/ShaderFunction.cpp | 2 +- src/editors/ParticleEditor/BottomBar.cpp | 2 +- .../ParticleEditor/ParticleEffectEditor.cpp | 2 +- .../ParticleEditor/ParticleEffectParser.cpp | 4 +- .../ParticleEditor/UI_ParticleTools.cpp | 4 +- src/editors/ShaderEditor/BottomBar.cpp | 2 +- src/plugins/Shared/Helper.h | 2 +- src/utils/Shader_xrLC.h | 6 +- src/utils/xrAI/game_spawn_constructor.cpp | 2 +- src/utils/xrAI/xrAI.cpp | 2 +- src/utils/xrAI/xr_graph_merge.cpp | 8 +- src/utils/xrCompress/xrCompress.cpp | 44 ++++----- src/utils/xrDO_Light/xrDO_Light.cpp | 2 +- src/utils/xrDXT/DXT.cpp | 2 +- src/utils/xrDXT/Image_DXTC.cpp | 2 +- src/utils/xrLC/Build_Load.cpp | 12 +-- src/utils/xrLC/xrLC.cpp | 2 +- src/utils/xrLC/xrSaveOGF.cpp | 2 +- .../xrLCUtil/LevelCompilerLoggerWindow.cpp | 2 +- src/utils/xrLC_Light/file_compress.cpp | 4 +- src/utils/xrLC_Light/gl_base_cl_data.cpp | 2 +- .../xrLC_Light/global_calculation_data.cpp | 8 +- src/utils/xrLC_Light/lm_net_global_data.cpp | 2 +- .../xrLC_Light/ref_model_net_global_data.cpp | 2 +- src/utils/xrLC_Light/xrLightVertex.cpp | 1 + src/utils/xrLC_Light/xrLight_Implicit.cpp | 1 + src/xrCDB/Frustum.h | 1 + src/xrCDB/ISpatial.cpp | 23 +++-- src/xrCDB/ISpatial.h | 8 +- src/xrCDB/ISpatial_q_box.cpp | 5 +- src/xrCDB/ISpatial_q_frustum.cpp | 5 +- src/xrCDB/ISpatial_q_ray.cpp | 5 +- src/xrCDB/xrCDB.cpp | 20 +++- src/xrCDB/xrCDB.h | 17 ++-- src/xrCDB/xr_area.cpp | 9 +- src/xrCDB/xr_area.h | 17 ++-- src/xrCDB/xr_area_raypick.cpp | 12 +-- src/xrCommon/predicates.h | 2 +- src/xrCore/Animation/Motion.cpp | 2 +- src/xrCore/LocatorAPI.cpp | 10 +- src/xrCore/SubAlloc.hpp | 6 +- src/xrCore/_std_extensions.h | 8 +- src/xrCore/clsid.h | 3 +- src/xrCore/xrCore.cpp | 2 +- src/xrCore/xrCore.h | 20 +--- src/xrCore/xrCore.vcxproj | 1 + src/xrCore/xrCore.vcxproj.filters | 3 + src/xrCore/xrCore_benchmark_macros.h | 21 +++++ src/xrCore/xr_ini.cpp | 2 +- src/xrCore/xr_trims.cpp | 2 +- src/xrCore/xrstring.cpp | 4 +- src/xrEngine/EngineAPI.h | 2 +- src/xrEngine/EventAPI.cpp | 10 +- src/xrEngine/FDemoRecord.cpp | 6 +- src/xrEngine/GameMtlLib.h | 2 +- src/xrEngine/IGame_ObjectPool.cpp | 2 +- src/xrEngine/Render.h | 6 +- src/xrEngine/Stats.h | 7 +- src/xrEngine/Text_Console.cpp | 2 +- src/xrEngine/XR_IOConsole.cpp | 34 ++++--- src/xrEngine/device.cpp | 2 +- src/xrEngine/edit_actions.cpp | 2 +- src/xrEngine/x_ray.cpp | 8 +- src/xrEngine/xrLoadSurface.cpp | 2 +- src/xrEngine/xrSheduler.h | 2 + src/xrEngine/xr_collide_form.cpp | 4 +- src/xrEngine/xr_ioc_cmd.cpp | 4 +- src/xrEngine/xr_ioc_cmd.h | 4 +- src/xrGame/Actor.cpp | 6 +- src/xrGame/ActorAnimation.cpp | 8 +- src/xrGame/CharacterPhysicsSupport.cpp | 4 +- src/xrGame/GameObject.cpp | 10 +- src/xrGame/GamePersistent.cpp | 2 +- src/xrGame/HudSound.h | 2 +- src/xrGame/Level_network_digest_computer.cpp | 2 +- src/xrGame/Level_start.cpp | 2 +- src/xrGame/NET_Queue.h | 2 +- src/xrGame/PHMovementControl.cpp | 16 ++-- src/xrGame/Torch.cpp | 2 +- src/xrGame/UIGameCTA.cpp | 4 +- src/xrGame/action_planner_inline.h | 2 +- src/xrGame/ai/ai_monsters_misc.cpp | 4 +- src/xrGame/ai/monsters/control_animation.cpp | 12 +++ src/xrGame/ai/monsters/control_animation.h | 14 +-- .../ai/monsters/control_animation_base.cpp | 12 +-- src/xrGame/alife_simulator_base.cpp | 4 +- src/xrGame/console_commands_mp.cpp | 2 +- src/xrGame/encyclopedia_article.cpp | 8 +- src/xrGame/game_cl_artefacthunt.cpp | 2 +- src/xrGame/game_cl_capture_the_artefact.cpp | 2 +- ..._capture_the_artefact_captions_manager.cpp | 2 +- src/xrGame/game_cl_deathmatch.cpp | 2 +- src/xrGame/game_cl_deathmatch_buywnd.cpp | 2 +- src/xrGame/game_cl_mp.cpp | 4 +- src/xrGame/game_sv_base.cpp | 2 +- src/xrGame/game_sv_mp.cpp | 12 +-- src/xrGame/ik/IKLimb.cpp | 2 +- src/xrGame/reward_manager.cpp | 4 +- src/xrGame/seniority_hierarchy_space.h | 2 +- src/xrGame/ui/ServerList.cpp | 2 +- src/xrGame/ui/TeamInfo.cpp | 4 +- src/xrGame/ui/UIGameTutorial.cpp | 6 +- src/xrGame/ui/UIGameTutorialSimpleItem.cpp | 18 ++-- src/xrGame/ui/UIGameTutorialVideoItem.cpp | 10 +- src/xrGame/ui/UIKickPlayer.cpp | 4 +- src/xrGame/ui/UIMainIngameWnd.cpp | 2 +- src/xrGame/ui/UIMessageBox.cpp | 20 ++-- src/xrGame/ui/UIProgressShape.cpp | 2 +- src/xrGame/ui/UISkinSelector.cpp | 2 +- src/xrGame/ui/UISpinNum.cpp | 2 +- src/xrGame/ui/UIXmlInit.cpp | 22 ++--- src/xrGame/xrGameSpyServer.cpp | 6 +- src/xrGame/xrServer.cpp | 14 +-- src/xrGame/xr_level_controller.cpp | 4 +- src/xrGameSpy/GameSpy_GCD_Client.cpp | 2 +- src/xrNetServer/NET_Client.cpp | 2 +- src/xrNetServer/NET_Server.cpp | 2 +- src/xrPhysics/MathUtils.cpp | 52 +++++------ src/xrPhysics/PHUpdateObject.h | 1 + src/xrScriptEngine/script_debugger.cpp | 2 +- src/xrScriptEngine/script_lua_helper.cpp | 2 +- src/xrServerEntities/alife_space.cpp | 22 ++--- .../xrServer_Objects_ALife.cpp | 2 +- src/xrServerEntities/xrServer_Objects_ALife.h | 4 +- .../xrServer_Objects_ALife_Items.h | 2 +- .../xrServer_Objects_ALife_Monsters.cpp | 4 +- src/xrSound/OpenALDeviceList.cpp | 6 +- .../SoundRender_Core_SourceManager.cpp | 2 +- src/xrSound/SoundRender_Environment.cpp | 6 +- src/xrSound/SoundRender_Source_loader.cpp | 2 +- 194 files changed, 662 insertions(+), 586 deletions(-) create mode 100644 src/xrCore/xrCore_benchmark_macros.h diff --git a/src/Common/Compiler.inl b/src/Common/Compiler.inl index c3b1c8475ef..414d26a2887 100644 --- a/src/Common/Compiler.inl +++ b/src/Common/Compiler.inl @@ -31,3 +31,21 @@ #define XR_NOEXCEPT noexcept #define XR_NOEXCEPT_OP(x) noexcept(x) #endif + +#ifdef _MSC_VER +// We use xr_* instead of defining e.g. strupr => _strupr, since the macro definition could +// come before the std. header file declaring it, and thereby renaming that one too. +#define xr_strupr _strupr +#define xr_strlwr _strlwr +#define xr_stricmp _stricmp +#define xr_strcmpi _strcmpi +#define xr_unlink _unlink +#define xr_itoa _itoa +#else +#define xr_strupr strupr +#define xr_strlwr strlwr +#define xr_stricmp stricmp +#define xr_strcmpi strcmpi +#define xr_unlink unlink +#define xr_itoa itoa +#endif diff --git a/src/Layers/xrRender/AnimationKeyCalculate.h b/src/Layers/xrRender/AnimationKeyCalculate.h index 8479dc48cb6..04dfeb3ccb3 100644 --- a/src/Layers/xrRender/AnimationKeyCalculate.h +++ b/src/Layers/xrRender/AnimationKeyCalculate.h @@ -89,8 +89,8 @@ IC void Dequantize(CKey& K, const CBlend& BD, const CMotion& M) // rotation if (M.test_flag(flRKeyAbsent)) { - const CKeyQR* K = &M._keysR[0]; - QR2Quat(*K, D->Q); + const CKeyQR* K2 = &M._keysR[0]; + QR2Quat(*K2, D->Q); } else { @@ -394,7 +394,7 @@ IC void MixAdd(CKey& Result, const CKey* R, const float* BA, int b_count) MixinAdd(Result, R, BA, b_count); } IC void process_single_channel( - CKey& Result, const animation::channel_def& ch, const CKey* R, const CBlend* const BA[MAX_BLENDED], int b_count) + CKey& Result, const animation::channel_def& /*ch*/, const CKey* R, const CBlend* const BA[MAX_BLENDED], int b_count) { MixInterlerp(Result, R, BA, b_count); VERIFY(_valid(Result.T)); diff --git a/src/Layers/xrRender/Blender_Recorder_R2.cpp b/src/Layers/xrRender/Blender_Recorder_R2.cpp index 20883d04e44..f0564616523 100644 --- a/src/Layers/xrRender/Blender_Recorder_R2.cpp +++ b/src/Layers/xrRender/Blender_Recorder_R2.cpp @@ -40,7 +40,7 @@ void CBlender_Compile::r_Pass(LPCSTR _vs, LPCSTR _ps, bool bFog, BOOL bZtest, BO ctable.merge(&vs->constants); // Last Stage - disable - if (0 == _stricmp(_ps, "null")) + if (0 == xr_stricmp(_ps, "null")) { RS.SetTSS(0, D3DTSS_COLOROP, D3DTOP_DISABLE); RS.SetTSS(0, D3DTSS_ALPHAOP, D3DTOP_DISABLE); diff --git a/src/Layers/xrRender/D3DUtils.cpp b/src/Layers/xrRender/D3DUtils.cpp index ee37dc8cab2..7893448e8f5 100644 --- a/src/Layers/xrRender/D3DUtils.cpp +++ b/src/Layers/xrRender/D3DUtils.cpp @@ -396,17 +396,19 @@ void CDrawUtilities::DrawEntity(u32 clr, ref_shader s) // fill VB _VertexStream* Stream = &RCache.Vertex; u32 vBase; - FVF::L* pv = (FVF::L*)Stream->Lock(5, vs_L->vb_stride, vBase); - pv->set(0.f, 0.f, 0.f, clr); - pv++; - pv->set(0.f, 1.f, 0.f, clr); - pv++; - pv->set(0.f, 1.f, .5f, clr); - pv++; - pv->set(0.f, .5f, .5f, clr); - pv++; - pv->set(0.f, .5f, 0.f, clr); - pv++; + { + FVF::L* pv = (FVF::L*)Stream->Lock(5, vs_L->vb_stride, vBase); + pv->set(0.f, 0.f, 0.f, clr); + pv++; + pv->set(0.f, 1.f, 0.f, clr); + pv++; + pv->set(0.f, 1.f, .5f, clr); + pv++; + pv->set(0.f, .5f, .5f, clr); + pv++; + pv->set(0.f, .5f, 0.f, clr); + pv++; + } Stream->Unlock(5, vs_L->vb_stride); // render flagshtok DU_DRAW_SH(RImplementation.m_WireShader); @@ -441,11 +443,13 @@ void CDrawUtilities::DrawFlag( // fill VB _VertexStream* Stream = &RCache.Vertex; u32 vBase; - FVF::L* pv = (FVF::L*)Stream->Lock(2, vs_L->vb_stride, vBase); - pv->set(p, clr); - pv++; - pv->set(p.x, p.y + height, p.z, clr); - pv++; + { + FVF::L* pv = (FVF::L*)Stream->Lock(2, vs_L->vb_stride, vBase); + pv->set(p, clr); + pv++; + pv->set(p.x, p.y + height, p.z, clr); + pv++; + } Stream->Unlock(2, vs_L->vb_stride); // and Render it as triangle list DU_DRAW_DP(D3DPT_LINELIST, vs_L, vBase, 1); diff --git a/src/Layers/xrRender/DetailManager_VS.cpp b/src/Layers/xrRender/DetailManager_VS.cpp index e4db0482bbb..215e6c7c7a1 100644 --- a/src/Layers/xrRender/DetailManager_VS.cpp +++ b/src/Layers/xrRender/DetailManager_VS.cpp @@ -232,7 +232,7 @@ void CDetailManager::hw_Render() hw_Render_dump(&*hwc_s_array, 0, 1, c_hdr); } -void CDetailManager::hw_Render_dump(ref_constant x_array, u32 var_id, u32 lod_id, u32 c_offset) +void CDetailManager::hw_Render_dump(ref_constant x_array, u32 var_id, u32 lod_id, u32 /*c_offset*/) { RImplementation.BasicStats.DetailCount = 0; diff --git a/src/Layers/xrRender/FHierrarhyVisual.cpp b/src/Layers/xrRender/FHierrarhyVisual.cpp index 176ab3c2d5e..2d5b0fd8c30 100644 --- a/src/Layers/xrRender/FHierrarhyVisual.cpp +++ b/src/Layers/xrRender/FHierrarhyVisual.cpp @@ -71,7 +71,7 @@ void FHierrarhyVisual::Load(const char* N, IReader* data, u32 dwFlags) xr_strcpy(short_name, N); if (strext(short_name)) *strext(short_name) = 0; - strconcat(sizeof(name_load), name_load, short_name, ":", _itoa(count, num, 10)); + strconcat(sizeof(name_load), name_load, short_name, ":", xr_itoa(count, num, 10)); children.push_back((dxRender_Visual*)GEnv.Render->model_CreateChild(name_load, O)); O->close(); O = OBJ->open_chunk(count); diff --git a/src/Layers/xrRender/HOM.cpp b/src/Layers/xrRender/HOM.cpp index 377b05cd4c1..cf17abbef49 100644 --- a/src/Layers/xrRender/HOM.cpp +++ b/src/Layers/xrRender/HOM.cpp @@ -217,11 +217,11 @@ void CHOM::Render_DB(CFrustum& base) stats.VisibleTriangleCount++; u32 pixels = 0; int limit = int(P->size()) - 1; - for (int v = 1; v < limit; v++) + for (int v2 = 1; v2 < limit; v2++) { m_xform.transform(T.raster[0], (*P)[0]); - m_xform.transform(T.raster[1], (*P)[v + 0]); - m_xform.transform(T.raster[2], (*P)[v + 1]); + m_xform.transform(T.raster[1], (*P)[v2 + 0]); + m_xform.transform(T.raster[2], (*P)[v2 + 1]); pixels += Raster.rasterize(&T); } if (0 == pixels) diff --git a/src/Layers/xrRender/HW.cpp b/src/Layers/xrRender/HW.cpp index ecef851fcea..21b7a0fe981 100644 --- a/src/Layers/xrRender/HW.cpp +++ b/src/Layers/xrRender/HW.cpp @@ -579,7 +579,7 @@ struct _uniq_mode { _uniq_mode(LPCSTR v) : _val(v) {} LPCSTR _val; - bool operator()(LPCSTR _other) { return !_stricmp(_val, _other); } + bool operator()(LPCSTR _other) { return !xr_stricmp(_val, _other); } }; #ifndef _EDITOR diff --git a/src/Layers/xrRender/ModelPool.cpp b/src/Layers/xrRender/ModelPool.cpp index 408cd75e14a..78b78679323 100644 --- a/src/Layers/xrRender/ModelPool.cpp +++ b/src/Layers/xrRender/ModelPool.cpp @@ -220,7 +220,7 @@ dxRender_Visual* CModelPool::Create(const char* name, IReader* data) string_path low_name; VERIFY(xr_strlen(name) < sizeof(low_name)); xr_strcpy(low_name, name); - _strlwr(low_name); + xd_strlwr(low_name); if (strext(low_name)) *strext(low_name) = 0; // Msg ("-CREATE %s",low_name); @@ -266,7 +266,7 @@ dxRender_Visual* CModelPool::CreateChild(LPCSTR name, IReader* data) string256 low_name; VERIFY(xr_strlen(name) < 256); xr_strcpy(low_name, name); - _strlwr(low_name); + xd_strlwr(low_name); if (strext(low_name)) *strext(low_name) = 0; diff --git a/src/Layers/xrRender/NvTriStrip.cpp b/src/Layers/xrRender/NvTriStrip.cpp index 4d5a43bb1fd..919eed9a5b0 100644 --- a/src/Layers/xrRender/NvTriStrip.cpp +++ b/src/Layers/xrRender/NvTriStrip.cpp @@ -65,8 +65,7 @@ void GenerateStrips(const u16* in_indices, const s32 in_numIndices, xr_vectorm_Name = _path; @@ -162,7 +162,7 @@ bool CPSLibrary::Load2() else xr_delete(def); } - else if (0 == _stricmp(p_ext, ".pg")) + else if (0 == xr_stricmp(p_ext, ".pg")) { PS::CPGDef* def = new PS::CPGDef(); def->m_Name = _path; diff --git a/src/Layers/xrRender/ParticleGroup.cpp b/src/Layers/xrRender/ParticleGroup.cpp index 99b125ea3aa..27b3fda8c8b 100644 --- a/src/Layers/xrRender/ParticleGroup.cpp +++ b/src/Layers/xrRender/ParticleGroup.cpp @@ -352,20 +352,20 @@ struct zero_vis_pred }; void CParticleGroup::SItem::OnFrame(u32 u_dt, const CPGDef::SEffect& def, Fbox& box, bool& bPlaying) { - CParticleEffect* E = static_cast(_effect); - if (E) + CParticleEffect* E1 = static_cast(_effect); + if (E1) { - E->OnFrame(u_dt); - if (E->IsPlaying()) + E1->OnFrame(u_dt); + if (E1->IsPlaying()) { bPlaying = true; - if (E->vis.box.is_valid()) - box.merge(E->vis.box); + if (E1->vis.box.is_valid()) + box.merge(E1->vis.box); if (def.m_Flags.is(CPGDef::SEffect::flOnPlayChild) && def.m_OnPlayChildName.size()) { PAPI::Particle* particles; u32 p_cnt; - PAPI::ParticleManager()->GetParticles(E->GetHandleEffect(), particles, p_cnt); + PAPI::ParticleManager()->GetParticles(E1->GetHandleEffect(), particles, p_cnt); VERIFY(p_cnt == _children_related.size()); if (p_cnt) { diff --git a/src/Layers/xrRender/ParticleGroup.h b/src/Layers/xrRender/ParticleGroup.h index 0e3e5e41031..0942bd8a95c 100644 --- a/src/Layers/xrRender/ParticleGroup.h +++ b/src/Layers/xrRender/ParticleGroup.h @@ -130,7 +130,7 @@ class ECORE_API CParticleGroup : public dxParticleCustom virtual ~CParticleGroup(); virtual void OnFrame(u32 dt); - virtual void Copy(dxRender_Visual* pFrom) { FATAL("Can't duplicate particle system - NOT IMPLEMENTED"); } + virtual void Copy(dxRender_Visual* /*pFrom*/) { FATAL("Can't duplicate particle system - NOT IMPLEMENTED"); } virtual void OnDeviceCreate(); virtual void OnDeviceDestroy(); diff --git a/src/Layers/xrRender/ResourceManager.cpp b/src/Layers/xrRender/ResourceManager.cpp index 67597f69556..705c3a56489 100644 --- a/src/Layers/xrRender/ResourceManager.cpp +++ b/src/Layers/xrRender/ResourceManager.cpp @@ -23,10 +23,10 @@ void fix_texture_name(LPSTR fn) { LPSTR _ext = strext(fn); if (_ext && - (0==_stricmp(_ext, ".tga") || - 0==_stricmp(_ext, ".dds") || - 0==_stricmp(_ext, ".bmp") || - 0==_stricmp(_ext, ".ogm"))) + (0==xr_stricmp(_ext, ".tga") || + 0==xr_stricmp(_ext, ".dds") || + 0==xr_stricmp(_ext, ".bmp") || + 0==xr_stricmp(_ext, ".ogm"))) *_ext = 0; } */ @@ -121,7 +121,7 @@ void CResourceManager::_ParseList(sh_list& dest, LPCSTR names) { // flush N.push_back(0); - _strlwr(N.begin()); + xd_strlwr(N.begin()); fix_texture_name(N.begin()); //. andy if (strext(N.begin())) *strext(N.begin())=0; @@ -138,7 +138,7 @@ void CResourceManager::_ParseList(sh_list& dest, LPCSTR names) { // flush N.push_back(0); - _strlwr(N.begin()); + xd_strlwr(N.begin()); fix_texture_name(N.begin()); //. andy if (strext(N.begin())) *strext(N.begin())=0; @@ -186,12 +186,15 @@ Shader* CResourceManager::_cpp_Create( C.bEditor = FALSE; C.bDetail = FALSE; #ifdef _EDITOR +<<<<<<< HEAD if (!C.BT) { ELog.Msg(mtError, "Can't find shader '%s'", s_shader); return 0; } C.bEditor = TRUE; +#else + UNUSED(s_shader); #endif // Parse names diff --git a/src/Layers/xrRender/ResourceManager_Resources.cpp b/src/Layers/xrRender/ResourceManager_Resources.cpp index f5e798031d9..e4e180737eb 100644 --- a/src/Layers/xrRender/ResourceManager_Resources.cpp +++ b/src/Layers/xrRender/ResourceManager_Resources.cpp @@ -180,7 +180,7 @@ SVS* CResourceManager::_CreateVS(LPCSTR _name) SVS* _vs = new SVS(); _vs->dwFlags |= xr_resource_flagged::RF_REGISTERED; m_vs.insert(std::make_pair(_vs->set_name(name), _vs)); - if (0 == _stricmp(_name, "null")) + if (0 == xr_stricmp(_name, "null")) { _vs->vs = nullptr; return _vs; @@ -266,7 +266,7 @@ SPS* CResourceManager::_CreatePS(LPCSTR name) SPS* _ps = new SPS(); _ps->dwFlags |= xr_resource_flagged::RF_REGISTERED; m_ps.insert(std::make_pair(_ps->set_name(name), _ps)); - if (0 == _stricmp(name, "null")) + if (0 == xr_stricmp(name, "null")) { _ps->ps = nullptr; return _ps; @@ -558,7 +558,7 @@ void CResourceManager::DBG_VerifyTextures() CMatrix* CResourceManager::_CreateMatrix(LPCSTR Name) { R_ASSERT(Name && Name[0]); - if (0 == _stricmp(Name, "$null")) + if (0 == xr_stricmp(Name, "$null")) return nullptr; LPSTR N = LPSTR(Name); @@ -596,7 +596,7 @@ void CResourceManager::ED_UpdateMatrix(LPCSTR Name, CMatrix* data) CConstant* CResourceManager::_CreateConstant(LPCSTR Name) { R_ASSERT(Name && Name[0]); - if (0 == _stricmp(Name, "$null")) + if (0 == xr_stricmp(Name, "$null")) return nullptr; LPSTR N = LPSTR(Name); @@ -784,7 +784,7 @@ SVS* CResourceManager::_CreateVS(LPCSTR _name) SVS* _vs = new SVS(); _vs->dwFlags |= xr_resource_flagged::RF_REGISTERED; m_vs.insert(std::make_pair(_vs->set_name(name), _vs)); - if (0 == _stricmp(_name, "null")) + if (0 == xr_stricmp(_name, "null")) { _vs->vs = NULL; return _vs; @@ -906,7 +906,7 @@ SPS* CResourceManager::_CreatePS(LPCSTR name) SPS* _ps = new SPS(); _ps->dwFlags |= xr_resource_flagged::RF_REGISTERED; m_ps.insert(std::make_pair(_ps->set_name(name), _ps)); - if (0 == _stricmp(name, "null")) + if (0 == xr_stricmp(name, "null")) { _ps->ps = NULL; return _ps; diff --git a/src/Layers/xrRender/SH_Texture.cpp b/src/Layers/xrRender/SH_Texture.cpp index 8a700a610b6..7536bb6e4b9 100644 --- a/src/Layers/xrRender/SH_Texture.cpp +++ b/src/Layers/xrRender/SH_Texture.cpp @@ -158,7 +158,7 @@ void CTexture::Load() flags.bUser = false; flags.MemoryUsage = 0; - if (0 == _stricmp(*cName, "$null")) + if (0 == xr_stricmp(*cName, "$null")) return; if (nullptr != strstr(*cName, "$user$")) { @@ -242,7 +242,7 @@ void CTexture::Load() flags.seqCycles = FALSE; _fs->r_string(buffer, sizeof(buffer)); - if (0 == _stricmp(buffer, "cycled")) + if (0 == xr_stricmp(buffer, "cycled")) { flags.seqCycles = TRUE; _fs->r_string(buffer, sizeof(buffer)); diff --git a/src/Layers/xrRender/ShaderResourceTraits.h b/src/Layers/xrRender/ShaderResourceTraits.h index c2940022652..d07d89cdee3 100644 --- a/src/Layers/xrRender/ShaderResourceTraits.h +++ b/src/Layers/xrRender/ShaderResourceTraits.h @@ -94,7 +94,7 @@ inline T* CResourceManager::CreateShader(const char* name) sh->dwFlags |= xr_resource_flagged::RF_REGISTERED; sh_map.insert(std::make_pair(sh->set_name(name), sh)); - if (0 == _stricmp(name, "null")) + if (0 == xr_stricmp(name, "null")) { sh->sh = NULL; return sh; diff --git a/src/Layers/xrRender/SkeletonAnimated.cpp b/src/Layers/xrRender/SkeletonAnimated.cpp index cfd9c303536..7369c643af2 100644 --- a/src/Layers/xrRender/SkeletonAnimated.cpp +++ b/src/Layers/xrRender/SkeletonAnimated.cpp @@ -172,7 +172,7 @@ u16 CKinematicsAnimated::LL_PartID(LPCSTR B) CPartDef& P = (*m_Partition)[id]; if (nullptr == P.Name) continue; - if (0 == _stricmp(B, *P.Name)) + if (0 == xr_stricmp(B, *P.Name)) return id; } return BI_NONE; diff --git a/src/Layers/xrRender/SkeletonCustom.cpp b/src/Layers/xrRender/SkeletonCustom.cpp index 1abd17b94e1..e70849823b3 100644 --- a/src/Layers/xrRender/SkeletonCustom.cpp +++ b/src/Layers/xrRender/SkeletonCustom.cpp @@ -237,7 +237,7 @@ void CKinematics::Load(const char* N, IReader* data, u32 dwFlags) // Bone u16 ID = u16(bones->size()); data->r_stringZ(buf, sizeof(buf)); - _strlwr(buf); + xr_strlwr(buf); CBoneData* pBone = CreateBoneData(ID); pBone->name = shared_str(buf); pBone->child_faces.resize(children.size()); @@ -247,7 +247,7 @@ void CKinematics::Load(const char* N, IReader* data, u32 dwFlags) // It's parent data->r_stringZ(buf, sizeof(buf)); - _strlwr(buf); + xr_strlwr(buf); L_parents.push_back(buf); data->r(&pBone->obb, sizeof(Fobb)); diff --git a/src/Layers/xrRender/SkeletonCustom.h b/src/Layers/xrRender/SkeletonCustom.h index 4f22c80d219..33c2b404bac 100644 --- a/src/Layers/xrRender/SkeletonCustom.h +++ b/src/Layers/xrRender/SkeletonCustom.h @@ -97,6 +97,8 @@ struct dbg_marker #define _DBG_SINGLE_USE_MARKER #endif +////////////////////////////////////////////////////////////////// + class CKinematics : public FHierrarhyVisual, public IKinematics { typedef FHierrarhyVisual inherited; @@ -107,11 +109,11 @@ class CKinematics : public FHierrarhyVisual, public IKinematics #ifdef DEBUG BOOL dbg_single_use_marker; #endif - void Bone_Calculate(CBoneData* bd, Fmatrix* parent); + void Bone_Calculate(CBoneData* bd, Fmatrix* parent) override; void CLBone(const CBoneData* bd, CBoneInstance& bi, const Fmatrix* parent, u8 mask_channel = (1 << 0)); void BoneChain_Calculate(const CBoneData* bd, CBoneInstance& bi, u8 channel_mask, bool ignore_callbacks); - void Bone_GetAnimPos(Fmatrix& pos, u16 id, u8 channel_mask, bool ignore_callbacks); + void Bone_GetAnimPos(Fmatrix& pos, u16 id, u8 channel_mask, bool ignore_callbacks) override; virtual void BuildBoneMatrix( const CBoneData* bd, CBoneInstance& bi, const Fmatrix* parent, u8 mask_channel = (1 << 0)); @@ -165,21 +167,21 @@ class CKinematics : public FHierrarhyVisual, public IKinematics public: bool PickBone(const Fmatrix& parent_xform, IKinematics::pick_result& r, float dist, const Fvector& start, - const Fvector& dir, u16 bone_id); - virtual void EnumBoneVertices(SEnumVerticesCallback& C, u16 bone_id); + const Fvector& dir, u16 bone_id) override; + void EnumBoneVertices(SEnumVerticesCallback& C, u16 bone_id) override; public: CKinematics(); virtual ~CKinematics(); // Low level interface - u16 LL_BoneID(LPCSTR B); - u16 LL_BoneID(const shared_str& B); - LPCSTR LL_BoneName_dbg(u16 ID); + u16 LL_BoneID(LPCSTR B) override; + u16 LL_BoneID(const shared_str& B) override; + LPCSTR LL_BoneName_dbg(u16 ID) override; - CInifile* LL_UserData() { return pUserData; } - accel* LL_Bones() { return bone_map_N; } - ICF CBoneInstance& LL_GetBoneInstance(u16 bone_id) + CInifile* LL_UserData() override { return pUserData; } + accel* LL_Bones() override { return bone_map_N; } + ICF CBoneInstance& LL_GetBoneInstance(u16 bone_id) override { VERIFY(bone_id < LL_BoneCount()); VERIFY(bone_instances); @@ -191,7 +193,7 @@ class CKinematics : public FHierrarhyVisual, public IKinematics VERIFY(bone_instances); return bone_instances[bone_id]; } - CBoneData& LL_GetData(u16 bone_id) + CBoneData& LL_GetData(u16 bone_id) override { VERIFY(bone_id < LL_BoneCount()); VERIFY(bones); @@ -199,7 +201,7 @@ class CKinematics : public FHierrarhyVisual, public IKinematics return bd; } - virtual const IBoneData& GetBoneData(u16 bone_id) const + const IBoneData& GetBoneData(u16 bone_id) const override { VERIFY(bone_id < LL_BoneCount()); VERIFY(bones); @@ -217,76 +219,76 @@ class CKinematics : public FHierrarhyVisual, public IKinematics CBoneData* bd = ((*bones)[bone_id]); return bd; } - u16 LL_BoneCount() const { return u16(bones->size()); } - u16 LL_VisibleBoneCount() + u16 LL_BoneCount() const override { return u16(bones->size()); } + u16 LL_VisibleBoneCount() override { u64 F = visimask.flags & ((u64(1) << u64(LL_BoneCount())) - 1); return (u16)btwCount1(F); } - ICF Fmatrix& LL_GetTransform(u16 bone_id) { return LL_GetBoneInstance(bone_id).mTransform; } - ICF const Fmatrix& LL_GetTransform(u16 bone_id) const { return LL_GetBoneInstance(bone_id).mTransform; } - ICF Fmatrix& LL_GetTransform_R(u16 bone_id) + ICF Fmatrix& LL_GetTransform(u16 bone_id) override { return LL_GetBoneInstance(bone_id).mTransform; } + ICF const Fmatrix& LL_GetTransform(u16 bone_id) const override { return LL_GetBoneInstance(bone_id).mTransform; } + ICF Fmatrix& LL_GetTransform_R(u16 bone_id) override { return LL_GetBoneInstance(bone_id).mRenderTransform; } // rendering only - Fobb& LL_GetBox(u16 bone_id) + Fobb& LL_GetBox(u16 bone_id) override { VERIFY(bone_id < LL_BoneCount()); return (*bones)[bone_id]->obb; } - const Fbox& GetBox() const { return vis.box; } - void LL_GetBindTransform(xr_vector& matrices); - int LL_GetBoneGroups(xr_vector>& groups); + const Fbox& GetBox() const override { return vis.box; } + void LL_GetBindTransform(xr_vector& matrices) override; + int LL_GetBoneGroups(xr_vector>& groups) override; - u16 LL_GetBoneRoot() { return iRoot; } - void LL_SetBoneRoot(u16 bone_id) + u16 LL_GetBoneRoot() override { return iRoot; } + void LL_SetBoneRoot(u16 bone_id) override { VERIFY(bone_id < LL_BoneCount()); iRoot = bone_id; } - BOOL LL_GetBoneVisible(u16 bone_id) + BOOL LL_GetBoneVisible(u16 bone_id) override { VERIFY(bone_id < LL_BoneCount()); return visimask.is(u64(1) << bone_id); } - void LL_SetBoneVisible(u16 bone_id, BOOL val, BOOL bRecursive); - u64 LL_GetBonesVisible() { return visimask.get(); } - void LL_SetBonesVisible(u64 mask); + void LL_SetBoneVisible(u16 bone_id, BOOL val, BOOL bRecursive) override; + u64 LL_GetBonesVisible() override { return visimask.get(); } + void LL_SetBonesVisible(u64 mask) override; // Main functionality - virtual void CalculateBones(BOOL bForceExact = FALSE); // Recalculate skeleton - void CalculateBones_Invalidate(); - void Callback(UpdateCallback C, void* Param) + void CalculateBones(BOOL bForceExact = FALSE) override; // Recalculate skeleton + void CalculateBones_Invalidate() override; + void Callback(UpdateCallback C, void* Param) override { Update_Callback = C; Update_Callback_Param = Param; } // Callback: data manipulation - virtual void SetUpdateCallback(UpdateCallback pCallback) { Update_Callback = pCallback; } - virtual void SetUpdateCallbackParam(void* pCallbackParam) { Update_Callback_Param = pCallbackParam; } - virtual UpdateCallback GetUpdateCallback() { return Update_Callback; } - virtual void* GetUpdateCallbackParam() { return Update_Callback_Param; } + void SetUpdateCallback(UpdateCallback pCallback) override { Update_Callback = pCallback; } + void SetUpdateCallbackParam(void* pCallbackParam) override { Update_Callback_Param = pCallbackParam; } + UpdateCallback GetUpdateCallback() override { return Update_Callback; } + void* GetUpdateCallbackParam() override { return Update_Callback_Param; } // debug #ifdef DEBUG - void DebugRender(Fmatrix& XFORM); + void DebugRender(Fmatrix& XFORM) override; protected: - virtual shared_str getDebugName() { return dbg_name; } + shared_str getDebugName() override { return dbg_name; } public: #endif // General "Visual" stuff - virtual void Copy(dxRender_Visual* pFrom); - virtual void Load(const char* N, IReader* data, u32 dwFlags); - virtual void Spawn(); - virtual void Depart(); - virtual void Release(); - - virtual IKinematicsAnimated* dcast_PKinematicsAnimated() { return nullptr; } - virtual IRenderVisual* dcast_RenderVisual() { return this; } - virtual IKinematics* dcast_PKinematics() { return this; } + void Copy(dxRender_Visual* pFrom) override; + void Load(const char* N, IReader* data, u32 dwFlags) override; + void Spawn() override; + void Depart() override; + void Release() override; + + IKinematicsAnimated* dcast_PKinematicsAnimated() override { return nullptr; } + IRenderVisual* dcast_RenderVisual() override { return this; } + IKinematics* dcast_PKinematics() override { return this; } //virtual CKinematics* dcast_PKinematics() { return this; } virtual u32 mem_usage(bool bInstance) diff --git a/src/Layers/xrRender/Texture.cpp b/src/Layers/xrRender/Texture.cpp index 3dc37d2fe1f..f45522d8712 100644 --- a/src/Layers/xrRender/Texture.cpp +++ b/src/Layers/xrRender/Texture.cpp @@ -13,8 +13,8 @@ void fix_texture_name(LPSTR fn) { LPSTR _ext = strext(fn); - if (_ext && (!_stricmp(_ext, ".tga") || !_stricmp(_ext, ".dds") || - !_stricmp(_ext, ".bmp") || !_stricmp(_ext, ".ogm"))) + if (_ext && (!xr_stricmp(_ext, ".tga") || !xr_stricmp(_ext, ".dds") || + !xr_stricmp(_ext, ".bmp") || !xr_stricmp(_ext, ".ogm"))) { *_ext = 0; } @@ -241,7 +241,7 @@ IC u32 it_gloss_rev(u32 d, u32 s) return color_rgba(color_get_A(s), // gloss color_get_B(d), color_get_G(d), color_get_R(d)); } -IC u32 it_gloss_rev_base(u32 d, u32 s) +IC u32 it_gloss_rev_base(u32 d, u32 /*s*/) { u32 occ = color_get_A(d) / 3; u32 def = 8; @@ -249,7 +249,7 @@ IC u32 it_gloss_rev_base(u32 d, u32 s) return color_rgba(gloss, // gloss color_get_B(d), color_get_G(d), color_get_R(d)); } -IC u32 it_difference(u32 d, u32 orig, u32 ucomp) +IC u32 it_difference(u32 /*d*/, u32 orig, u32 ucomp) { return color_rgba(128 + (int(color_get_R(orig)) - int(color_get_R(ucomp))) * 2, // R-error 128 + (int(color_get_G(orig)) - int(color_get_G(ucomp))) * 2, // G-error @@ -367,7 +367,7 @@ ID3DBaseTexture* CRender::texture_load(LPCSTR fRName, u32& ret_msize) } _DDS_2D: { - _strlwr(fn); + xr_strlwr(fn); // Load SYS-MEM-surface, bound to device restrictions ID3DTexture2D* T_sysmem; HRESULT const result = @@ -380,7 +380,7 @@ ID3DBaseTexture* CRender::texture_load(LPCSTR fRName, u32& ret_msize) Msg("! Can't load texture '%s'", fn); string_path temp; R_ASSERT(FS.exist(temp, "$game_textures$", "ed\\ed_not_existing_texture", ".dds")); - _strlwr(temp); + xr_strlwr(temp); R_ASSERT(xr_strcmp(temp, fn)); xr_strcpy(fn, temp); goto _DDS; diff --git a/src/Layers/xrRender/TextureDescrManager.cpp b/src/Layers/xrRender/TextureDescrManager.cpp index f20427299a3..94f0372c35a 100644 --- a/src/Layers/xrRender/TextureDescrManager.cpp +++ b/src/Layers/xrRender/TextureDescrManager.cpp @@ -17,8 +17,8 @@ class cl_dt_scaler : public R_constant_setup void fix_texture_thm_name(LPSTR fn) { LPSTR _ext = strext(fn); - if (_ext && (!_stricmp(_ext, ".tga") || !_stricmp(_ext, ".thm") || !_stricmp(_ext, ".dds") || - !_stricmp(_ext, ".bmp") || !_stricmp(_ext, ".ogm"))) + if (_ext && (!xr_stricmp(_ext, ".tga") || !xr_stricmp(_ext, ".thm") || !xr_stricmp(_ext, ".dds") || + !xr_stricmp(_ext, ".bmp") || !xr_stricmp(_ext, ".ogm"))) { *_ext = 0; } diff --git a/src/Layers/xrRender/blenders/Blender.cpp b/src/Layers/xrRender/blenders/Blender.cpp index 1dbd7880c8a..d39a9edcad3 100644 --- a/src/Layers/xrRender/blenders/Blender.cpp +++ b/src/Layers/xrRender/blenders/Blender.cpp @@ -16,7 +16,7 @@ void CBlender_DESC::Setup(LPCSTR N) VERIFY(xr_strlen(N) < 128); VERIFY(nullptr == strchr(N, '.')); xr_strcpy(cName, N); - _strlwr(cName); + xr_strlwr(cName); xr_strcpy(cComputer, Core.CompName); // Computer #ifndef _EDITOR diff --git a/src/Layers/xrRender/blenders/Blender_Palette.cpp b/src/Layers/xrRender/blenders/Blender_Palette.cpp index b43dff43f19..1ca9e60b7dd 100644 --- a/src/Layers/xrRender/blenders/Blender_Palette.cpp +++ b/src/Layers/xrRender/blenders/Blender_Palette.cpp @@ -5,7 +5,7 @@ ////////////////////////////////////////////////////////////////////// #include "blender_clsid.h" -IC bool p_sort(IBlender* A, IBlender* B) { return _stricmp(A->getComment(), B->getComment()) < 0; } +IC bool p_sort(IBlender* A, IBlender* B) { return xr_stricmp(A->getComment(), B->getComment()) < 0; } #ifdef __BORLANDC__ #define TYPES_EQUAL(A, B) (typeid(A) == typeid(B)) #else diff --git a/src/Layers/xrRender/blenders/Blender_Recorder.cpp b/src/Layers/xrRender/blenders/Blender_Recorder.cpp index 6728e8541fb..c7eb24bc9fa 100644 --- a/src/Layers/xrRender/blenders/Blender_Recorder.cpp +++ b/src/Layers/xrRender/blenders/Blender_Recorder.cpp @@ -205,13 +205,13 @@ void CBlender_Compile::PassEnd() void CBlender_Compile::PassSET_PS(LPCSTR name) { xr_strcpy(pass_ps, name); - _strlwr(pass_ps); + xr_strlwr(pass_ps); } void CBlender_Compile::PassSET_VS(LPCSTR name) { xr_strcpy(pass_vs, name); - _strlwr(pass_vs); + xr_strlwr(pass_vs); } void CBlender_Compile::PassSET_ZB(BOOL bZTest, BOOL bZWrite, BOOL bInvertZTest) diff --git a/src/Layers/xrRender/r__dsgraph_build.cpp b/src/Layers/xrRender/r__dsgraph_build.cpp index d428c9f9dde..a0d90d5882a 100644 --- a/src/Layers/xrRender/r__dsgraph_build.cpp +++ b/src/Layers/xrRender/r__dsgraph_build.cpp @@ -797,6 +797,8 @@ void D3DXRenderBase::setGamma(float fGamma) { #ifndef USE_OGL m_Gamma.Gamma(fGamma); +#else + UNUSED(fGamma); #endif } @@ -804,6 +806,8 @@ void D3DXRenderBase::setBrightness(float fGamma) { #ifndef USE_OGL m_Gamma.Brightness(fGamma); +#else + UNUSED(fGamma); #endif } @@ -811,6 +815,8 @@ void D3DXRenderBase::setContrast(float fGamma) { #ifndef USE_OGL m_Gamma.Contrast(fGamma); +#else + UNUSED(fGamma); #endif } diff --git a/src/Layers/xrRenderDX10/3DFluid/dx103DFluidObstacles.cpp b/src/Layers/xrRenderDX10/3DFluid/dx103DFluidObstacles.cpp index 3c1337e4420..3185ec2f82d 100644 --- a/src/Layers/xrRenderDX10/3DFluid/dx103DFluidObstacles.cpp +++ b/src/Layers/xrRenderDX10/3DFluid/dx103DFluidObstacles.cpp @@ -380,7 +380,7 @@ timestep) */ void dx103DFluidObstacles::RenderDynamicOOBB( - const IPhysicsGeometry& Geometry, const Fmatrix& WorldToFluid, float timestep) + const IPhysicsGeometry& Geometry, const Fmatrix& WorldToFluid, float /*timestep*/) { PIX_EVENT(RenderDynamicObstacle); diff --git a/src/Layers/xrRenderDX10/Blender_Recorder_R3.cpp b/src/Layers/xrRenderDX10/Blender_Recorder_R3.cpp index 1f5842e2679..a83f29506fc 100644 --- a/src/Layers/xrRenderDX10/Blender_Recorder_R3.cpp +++ b/src/Layers/xrRenderDX10/Blender_Recorder_R3.cpp @@ -203,7 +203,7 @@ void CBlender_Compile::r_Pass(LPCSTR _vs, LPCSTR _gs, LPCSTR _ps, bool bFog, BOO ctable.merge(&gs->constants); // Last Stage - disable - if (0 == _stricmp(_ps, "null")) + if (0 == xr_stricmp(_ps, "null")) { RS.SetTSS(0, D3DTSS_COLOROP, D3DTOP_DISABLE); RS.SetTSS(0, D3DTSS_ALPHAOP, D3DTOP_DISABLE); diff --git a/src/Layers/xrRenderDX10/dx10HW.cpp b/src/Layers/xrRenderDX10/dx10HW.cpp index 3795d6d68dd..cd8bb4b4a62 100644 --- a/src/Layers/xrRenderDX10/dx10HW.cpp +++ b/src/Layers/xrRenderDX10/dx10HW.cpp @@ -771,7 +771,7 @@ struct _uniq_mode { _uniq_mode(LPCSTR v) : _val(v) {} LPCSTR _val; - bool operator()(LPCSTR _other) { return !_stricmp(_val, _other); } + bool operator()(LPCSTR _other) { return !xr_stricmp(_val, _other); } }; #ifndef _EDITOR diff --git a/src/Layers/xrRenderDX10/dx10ResourceManager_Resources.cpp b/src/Layers/xrRenderDX10/dx10ResourceManager_Resources.cpp index 4fca177c9fd..811a13e5f0a 100644 --- a/src/Layers/xrRenderDX10/dx10ResourceManager_Resources.cpp +++ b/src/Layers/xrRenderDX10/dx10ResourceManager_Resources.cpp @@ -142,7 +142,7 @@ SVS* CResourceManager::_CreateVS(LPCSTR _name) m_vs.insert(std::make_pair(_vs->set_name(name), _vs)); //_vs->vs = NULL; //_vs->signature = NULL; - if (0 == _stricmp(_name, "null")) + if (0 == xr_stricmp(_name, "null")) { return _vs; } @@ -265,7 +265,7 @@ SPS* CResourceManager::_CreatePS(LPCSTR _name) SPS* _ps = new SPS(); _ps->dwFlags |= xr_resource_flagged::RF_REGISTERED; m_ps.insert(std::make_pair(_ps->set_name(name), _ps)); - if (0 == _stricmp(_name, "null")) + if (0 == xr_stricmp(_name, "null")) { _ps->ps = NULL; return _ps; @@ -370,7 +370,7 @@ SGS* CResourceManager::_CreateGS(LPCSTR name) SGS* _gs = new SGS(); _gs->dwFlags |= xr_resource_flagged::RF_REGISTERED; m_gs.insert(std::make_pair(_gs->set_name(name), _gs)); - if (0 == _stricmp(name, "null")) + if (0 == xr_stricmp(name, "null")) { _gs->gs = NULL; return _gs; @@ -685,7 +685,7 @@ void CResourceManager::DBG_VerifyTextures() CMatrix* CResourceManager::_CreateMatrix(LPCSTR Name) { R_ASSERT(Name && Name[0]); - if (0 == _stricmp(Name, "$null")) + if (0 == xr_stricmp(Name, "$null")) return NULL; LPSTR N = LPSTR(Name); @@ -723,7 +723,7 @@ void CResourceManager::ED_UpdateMatrix(LPCSTR Name, CMatrix* data) CConstant* CResourceManager::_CreateConstant(LPCSTR Name) { R_ASSERT(Name && Name[0]); - if (0 == _stricmp(Name, "$null")) + if (0 == xr_stricmp(Name, "$null")) return NULL; LPSTR N = LPSTR(Name); diff --git a/src/Layers/xrRenderDX10/dx10SH_Texture.cpp b/src/Layers/xrRenderDX10/dx10SH_Texture.cpp index 9635e0d9e0a..5d9f0f30a39 100644 --- a/src/Layers/xrRenderDX10/dx10SH_Texture.cpp +++ b/src/Layers/xrRenderDX10/dx10SH_Texture.cpp @@ -375,7 +375,7 @@ void CTexture::Load() flags.bUser = false; flags.MemoryUsage = 0; - if (0 == _stricmp(*cName, "$null")) + if (0 == xr_stricmp(*cName, "$null")) return; if (0 != strstr(*cName, "$user$")) { @@ -498,7 +498,7 @@ void CTexture::Load() flags.seqCycles = FALSE; _fs->r_string(buffer, sizeof(buffer)); - if (0 == _stricmp(buffer, "cycled")) + if (0 == xr_stricmp(buffer, "cycled")) { flags.seqCycles = TRUE; _fs->r_string(buffer, sizeof(buffer)); diff --git a/src/Layers/xrRenderDX10/dx10Texture.cpp b/src/Layers/xrRenderDX10/dx10Texture.cpp index 00c335174cb..7475d64bd66 100644 --- a/src/Layers/xrRenderDX10/dx10Texture.cpp +++ b/src/Layers/xrRenderDX10/dx10Texture.cpp @@ -11,8 +11,8 @@ void fix_texture_name(LPSTR fn) { LPSTR _ext = strext(fn); - if (_ext && (!_stricmp(_ext, ".tga") || !_stricmp(_ext, ".dds") || !_stricmp(_ext, ".bmp") || - !_stricmp(_ext, ".ogm"))) + if (_ext && (!xr_stricmp(_ext, ".tga") || !xr_stricmp(_ext, ".dds") || !xr_stricmp(_ext, ".bmp") || + !xr_stricmp(_ext, ".ogm"))) { *_ext = 0; } @@ -427,7 +427,7 @@ ID3DBaseTexture* CRender::texture_load(LPCSTR fRName, u32& ret_msize, bool bStag _DDS_2D: { // Check for LMAP and compress if needed - strlwr(fn); + xr_strlwr(fn); // Load SYS-MEM-surface, bound to device restrictions // ID3DTexture2D* T_sysmem; diff --git a/src/Layers/xrRenderGL/Blender_Recorder_GL.cpp b/src/Layers/xrRenderGL/Blender_Recorder_GL.cpp index 36cdfed5c87..94841de35d4 100644 --- a/src/Layers/xrRenderGL/Blender_Recorder_GL.cpp +++ b/src/Layers/xrRenderGL/Blender_Recorder_GL.cpp @@ -76,7 +76,7 @@ void CBlender_Compile::r_Pass (LPCSTR _vs, LPCSTR _gs, LPCSTR _ps, bool bFog, B ctable.merge (&gs->constants); // Last Stage - disable - if (0==_stricmp(_ps,"null")) { + if (0==xr_stricmp(_ps,"null")) { RS.SetTSS (0,D3DTSS_COLOROP,D3DTOP_DISABLE); RS.SetTSS (0,D3DTSS_ALPHAOP,D3DTOP_DISABLE); } diff --git a/src/Layers/xrRenderGL/glHW.cpp b/src/Layers/xrRenderGL/glHW.cpp index 6c13297af1a..e9af26afc90 100644 --- a/src/Layers/xrRenderGL/glHW.cpp +++ b/src/Layers/xrRenderGL/glHW.cpp @@ -274,7 +274,7 @@ struct _uniq_mode { _uniq_mode(LPCSTR v):_val(v){} LPCSTR _val; - bool operator() (LPCSTR _other) {return !_stricmp(_val,_other);} + bool operator() (LPCSTR _other) {return !xr_stricmp(_val,_other);} }; #ifndef _EDITOR diff --git a/src/Layers/xrRenderGL/glSH_Texture.cpp b/src/Layers/xrRenderGL/glSH_Texture.cpp index 59d1a478cea..cf73c626d48 100644 --- a/src/Layers/xrRenderGL/glSH_Texture.cpp +++ b/src/Layers/xrRenderGL/glSH_Texture.cpp @@ -143,7 +143,7 @@ void CTexture::Load () flags.bUser = false; flags.MemoryUsage = 0; - if (0 == _stricmp(*cName, "$null")) return; + if (0 == xr_stricmp(*cName, "$null")) return; if (0 != strstr(*cName, "$user$")) { flags.bUser = true; return; @@ -233,7 +233,7 @@ void CTexture::Load () flags.seqCycles = FALSE; _fs->r_string(buffer, sizeof(buffer)); - if (0 == _stricmp(buffer, "cycled")) + if (0 == xr_stricmp(buffer, "cycled")) { flags.seqCycles = TRUE; _fs->r_string(buffer, sizeof(buffer)); diff --git a/src/Layers/xrRenderPC_GL/glResourceManager_Resources.cpp b/src/Layers/xrRenderPC_GL/glResourceManager_Resources.cpp index 3e4169c0bf2..b66743df088 100644 --- a/src/Layers/xrRenderPC_GL/glResourceManager_Resources.cpp +++ b/src/Layers/xrRenderPC_GL/glResourceManager_Resources.cpp @@ -177,7 +177,7 @@ SVS* CResourceManager::_CreateVS (LPCSTR _name) m_vs.insert (std::make_pair(_vs->set_name(name),_vs)); //_vs->vs = NULL; //_vs->signature = NULL; - VERIFY(_strcmpi(name, "null") != 0); + VERIFY(xr_strcmpi(name, "null") != 0); string_path shName; { @@ -266,7 +266,7 @@ SPS* CResourceManager::_CreatePS (LPCSTR _name) SPS* _ps = new SPS (); _ps->dwFlags |= xr_resource_flagged::RF_REGISTERED; m_ps.insert (std::make_pair(_ps->set_name(name),_ps)); - VERIFY(_strcmpi(name, "null") != 0); + VERIFY(xr_strcmpi(name, "null") != 0); string_path shName; const char* pchr = strchr(_name, '('); @@ -345,7 +345,7 @@ SGS* CResourceManager::_CreateGS (LPCSTR name) SGS* _gs = new SGS (); _gs->dwFlags |= xr_resource_flagged::RF_REGISTERED; m_gs.insert (std::make_pair(_gs->set_name(name),_gs)); - if (0==_stricmp(name,"null")) { + if (0==xr_stricmp(name,"null")) { _gs->gs = NULL; return _gs; } @@ -574,7 +574,7 @@ void CResourceManager::DBG_VerifyTextures () CMatrix* CResourceManager::_CreateMatrix (LPCSTR Name) { R_ASSERT(Name && Name[0]); - if (0==_stricmp(Name,"$null")) return NULL; + if (0==xr_stricmp(Name,"$null")) return NULL; LPSTR N = LPSTR(Name); map_Matrix::iterator I = m_matrices.find (N); @@ -608,7 +608,7 @@ void CResourceManager::ED_UpdateMatrix (LPCSTR Name, CMatrix* data) CConstant* CResourceManager::_CreateConstant (LPCSTR Name) { R_ASSERT(Name && Name[0]); - if (0==_stricmp(Name,"$null")) return NULL; + if (0==xr_stricmp(Name,"$null")) return NULL; LPSTR N = LPSTR(Name); map_Constant::iterator I = m_constants.find (N); diff --git a/src/Layers/xrRenderPC_GL/glTexture.cpp b/src/Layers/xrRenderPC_GL/glTexture.cpp index 45cdb8be088..b168a769b8c 100644 --- a/src/Layers/xrRenderPC_GL/glTexture.cpp +++ b/src/Layers/xrRenderPC_GL/glTexture.cpp @@ -10,10 +10,10 @@ void fix_texture_name(LPSTR fn) { LPSTR _ext = strext(fn); if (_ext && - (0 == _stricmp(_ext, ".tga") || - 0 == _stricmp(_ext, ".dds") || - 0 == _stricmp(_ext, ".bmp") || - 0 == _stricmp(_ext, ".ogm"))) + (0 == xr_stricmp(_ext, ".tga") || + 0 == xr_stricmp(_ext, ".dds") || + 0 == xr_stricmp(_ext, ".bmp") || + 0 == xr_stricmp(_ext, ".ogm"))) *_ext = 0; } @@ -154,7 +154,7 @@ GLuint CRender::texture_load(LPCSTR fRName, u32& ret_msize, GLenum& ret_desc) _DDS_3D: { // Check for LMAP and compress if needed - _strlwr(fn); + xr_strlwr(fn); // Load SYS-MEM-surface, bound to device restrictions @@ -191,7 +191,7 @@ GLuint CRender::texture_load(LPCSTR fRName, u32& ret_msize, GLenum& ret_desc) _DDS_2D: { // Check for LMAP and compress if needed - _strlwr(fn); + xr_strlwr(fn); // Load SYS-MEM-surface, bound to device restrictions diff --git a/src/Layers/xrRenderPC_GL/r3_R_sun_support.h b/src/Layers/xrRenderPC_GL/r3_R_sun_support.h index 2c1bf83d062..cea91da8955 100644 --- a/src/Layers/xrRenderPC_GL/r3_R_sun_support.h +++ b/src/Layers/xrRenderPC_GL/r3_R_sun_support.h @@ -291,7 +291,7 @@ class DumbConvexVolume { int p0,p1; int counter; - _edge (int _p0, int _p1, int m) : p0(_p0), p1(_p1), counter(m){ if (p0>p1) swap(p0,p1); } + _edge (int _p0, int _p1, int m) : p0(_p0), p1(_p1), counter(m){ if (p0>p1) std::swap(p0,p1); } bool equal (_edge& E) { return p0==E.p0 && p1==E.p1; } }; public: diff --git a/src/Layers/xrRenderPC_R1/Blender_LaEmB.cpp b/src/Layers/xrRenderPC_R1/Blender_LaEmB.cpp index cd29805c923..5c5fdca35ce 100644 --- a/src/Layers/xrRenderPC_R1/Blender_LaEmB.cpp +++ b/src/Layers/xrRenderPC_R1/Blender_LaEmB.cpp @@ -42,7 +42,7 @@ void CBlender_LaEmB::Compile(CBlender_Compile& C) { IBlender::Compile(C); - BOOL bConstant = (0 != _stricmp(oT2_const, "$null")); + BOOL bConstant = (0 != xr_stricmp(oT2_const, "$null")); if (C.bEditor) { if (bConstant) diff --git a/src/Layers/xrRenderPC_R4/CSCompiler.cpp b/src/Layers/xrRenderPC_R4/CSCompiler.cpp index 5e82e3eef85..6c661d2d0c7 100644 --- a/src/Layers/xrRenderPC_R4/CSCompiler.cpp +++ b/src/Layers/xrRenderPC_R4/CSCompiler.cpp @@ -179,7 +179,7 @@ void CSCompiler::end() void CSCompiler::compile(const char* name) { - if (0 == _stricmp(name, "null")) + if (0 == xr_stricmp(name, "null")) { m_cs = 0; return; diff --git a/src/editors/ActorEditor/BonePart.cpp b/src/editors/ActorEditor/BonePart.cpp index d54c785c934..028389068f8 100644 --- a/src/editors/ActorEditor/BonePart.cpp +++ b/src/editors/ActorEditor/BonePart.cpp @@ -282,7 +282,7 @@ void __fastcall TfrmBonePart::ebLoadFromClick(TObject* Sender) CInifile::SectCIt e = S.Data.end(); for (; it != e; ++it) { - if (0 != _stricmp(it->first.c_str(), "partition_name")) + if (0 != xr_stricmp(it->first.c_str(), "partition_name")) { FHelper.AppendObject(T[i], it->first.c_str(), false, true); } diff --git a/src/editors/ActorEditor/BottomBar.cpp b/src/editors/ActorEditor/BottomBar.cpp index 888d1e59dff..c29258fde06 100644 --- a/src/editors/ActorEditor/BottomBar.cpp +++ b/src/editors/ActorEditor/BottomBar.cpp @@ -199,7 +199,7 @@ void __fastcall TfraBottomBar::pmOptionsPopup(TObject* Sender) { TMenuItem* mi = miWeather->Items[i]; BOOL bch; - bch = ((EPrefs->sWeather.size()) && (0 == _stricmp(mi->Caption.c_str(), EPrefs->sWeather.c_str()))) || + bch = ((EPrefs->sWeather.size()) && (0 == xr_stricmp(mi->Caption.c_str(), EPrefs->sWeather.c_str()))) || (mi->Caption == "none" && EPrefs->sWeather.size() == 0); mi->Checked = bch; } diff --git a/src/editors/ActorEditor/UI_ActorToolsUndo.cpp b/src/editors/ActorEditor/UI_ActorToolsUndo.cpp index 9c5b46e0f87..dece0658402 100644 --- a/src/editors/ActorEditor/UI_ActorToolsUndo.cpp +++ b/src/editors/ActorEditor/UI_ActorToolsUndo.cpp @@ -9,12 +9,12 @@ void CActorTools::UndoClear() { while (!m_RedoStack.empty()) { - _unlink(m_RedoStack.back().m_FileName); + xr_unlink(m_RedoStack.back().m_FileName); m_RedoStack.pop_back(); } while (!m_UndoStack.empty()) { - _unlink(m_UndoStack.back().m_FileName); + xr_unlink(m_UndoStack.back().m_FileName); m_UndoStack.pop_back(); } } @@ -33,13 +33,13 @@ void CActorTools::UndoSave() while (!m_RedoStack.empty()) { - _unlink(m_RedoStack.back().m_FileName); + xr_unlink(m_RedoStack.back().m_FileName); m_RedoStack.pop_back(); } if (m_UndoStack.size() > EPrefs->scene_undo_level) { - _unlink(m_UndoStack.front().m_FileName); + xr_unlink(m_UndoStack.front().m_FileName); m_UndoStack.pop_front(); } } @@ -54,7 +54,7 @@ bool CActorTools::Undo() if (m_RedoStack.size() > EPrefs->scene_undo_level) { - _unlink(m_RedoStack.front().m_FileName); + xr_unlink(m_RedoStack.front().m_FileName); m_RedoStack.pop_front(); } @@ -83,7 +83,7 @@ bool CActorTools::Redo() if (m_UndoStack.size() > EPrefs->scene_undo_level) { - _unlink(m_UndoStack.front().m_FileName); + xr_unlink(m_UndoStack.front().m_FileName); m_UndoStack.pop_front(); } diff --git a/src/editors/ECore/Editor/EditMesh.cpp b/src/editors/ECore/Editor/EditMesh.cpp index 8c0677554ce..584fc2559bd 100644 --- a/src/editors/ECore/Editor/EditMesh.cpp +++ b/src/editors/ECore/Editor/EditMesh.cpp @@ -543,7 +543,7 @@ int CEditableMesh::FindVMapByName(VMapVec& vmaps, const char* name, u8 t, bool p { for (VMapIt vm_it = vmaps.begin(); vm_it != vmaps.end(); vm_it++) { - if (((*vm_it)->type == t) && (_stricmp((*vm_it)->name.c_str(), name) == 0) && (polymap == (*vm_it)->polymap)) + if (((*vm_it)->type == t) && (xr_stricmp((*vm_it)->name.c_str(), name) == 0) && (polymap == (*vm_it)->polymap)) return vm_it - vmaps.begin(); } return -1; diff --git a/src/editors/ECore/Editor/EditObject.cpp b/src/editors/ECore/Editor/EditObject.cpp index bb456219401..26b09d37481 100644 --- a/src/editors/ECore/Editor/EditObject.cpp +++ b/src/editors/ECore/Editor/EditObject.cpp @@ -96,7 +96,7 @@ bool CEditableObject::ContainsMesh(const CEditableMesh* m) CEditableMesh* CEditableObject::FindMeshByName(const char* name, CEditableMesh* Ignore) { for (EditMeshIt m = m_Meshes.begin(); m != m_Meshes.end(); m++) - if ((Ignore != (*m)) && (_stricmp((*m)->Name().c_str(), name) == 0)) + if ((Ignore != (*m)) && (xr_stricmp((*m)->Name().c_str(), name) == 0)) return (*m); return 0; } @@ -194,7 +194,7 @@ void CEditableObject::TranslateToWorld(const Fmatrix& parent) CSurface* CEditableObject::FindSurfaceByName(const char* surf_name, int* s_id) { for (SurfaceIt s_it = m_Surfaces.begin(); s_it != m_Surfaces.end(); s_it++) - if (_stricmp((*s_it)->_Name(), surf_name) == 0) + if (xr_stricmp((*s_it)->_Name(), surf_name) == 0) { if (s_id) *s_id = s_it - m_Surfaces.begin(); diff --git a/src/editors/ECore/Editor/EditObjectImport.cpp b/src/editors/ECore/Editor/EditObjectImport.cpp index 7267e90fcfd..58a44044ff9 100644 --- a/src/editors/ECore/Editor/EditObjectImport.cpp +++ b/src/editors/ECore/Editor/EditObjectImport.cpp @@ -53,7 +53,7 @@ bool CEditableObject::ImportLWO(const char* fn, bool optimize) surf->SetName(lwSurf->name && lwSurf->name[0] ? lwSurf->name : "Default"); surf->m_Flags.set(CSurface::sf2Sided, lwSurf->sideflags == 3); AnsiString enName = "default", lcName = "default", gmName = "default"; - if (lwSurf->nshaders && !_stricmp(lwSurf->shader->name, SH_PLUGIN_NAME)) + if (lwSurf->nshaders && !xr_stricmp(lwSurf->shader->name, SH_PLUGIN_NAME)) { auto shader = (XRShader*)lwSurf->shader->data; enName = shader->en_name; diff --git a/src/editors/ECore/Editor/EditObjectMotions.cpp b/src/editors/ECore/Editor/EditObjectMotions.cpp index 4b60198b868..146acdfd0f6 100644 --- a/src/editors/ECore/Editor/EditObjectMotions.cpp +++ b/src/editors/ECore/Editor/EditObjectMotions.cpp @@ -313,7 +313,7 @@ bool CEditableObject::RemoveSMotion(const char* name) { SMotionVec& lst = m_SMotions; for (SMotionIt m = lst.begin(); m != lst.end(); m++) - if ((_stricmp((*m)->Name(), name) == 0)) + if ((xr_stricmp((*m)->Name(), name) == 0)) { if (m_ActiveSMotion == *m) SetActiveSMotion(0); @@ -361,7 +361,7 @@ bool CEditableObject::AppendSMotion(LPCSTR fname, SMotionVec* inserted) bool bRes = true; LPCSTR ext = strext(fname); - if (0 == _stricmp(ext, ".skl")) + if (0 == xr_stricmp(ext, ".skl")) { CSMotion* M = new CSMotion(); if (!M->LoadMotion(fname)) @@ -394,7 +394,7 @@ bool CEditableObject::AppendSMotion(LPCSTR fname, SMotionVec* inserted) } } } - else if (0 == _stricmp(ext, ".skls")) + else if (0 == xr_stricmp(ext, ".skls")) { IReader* F = FS.r_open(fname); if (!F) @@ -460,7 +460,7 @@ bool CEditableObject::SaveSMotions(const char* fname) bool CEditableObject::RenameSMotion(const char* old_name, const char* new_name) { - if (_stricmp(old_name, new_name) == 0) + if (xr_stricmp(old_name, new_name) == 0) return true; if (FindSMotionByName(new_name)) return false; @@ -476,7 +476,7 @@ CSMotion* CEditableObject::FindSMotionByName(const char* name, const CSMotion* I { SMotionVec& lst = m_SMotions; for (SMotionIt m = lst.begin(); m != lst.end(); m++) - if ((Ignore != (*m)) && (_stricmp((*m)->Name(), name) == 0)) + if ((Ignore != (*m)) && (xr_stricmp((*m)->Name(), name) == 0)) return (*m); } return 0; @@ -491,7 +491,7 @@ void CEditableObject::GenerateSMotionName(char* buffer, const char* start_name, sprintf(buffer, "%s_%2d", start_name, idx); idx++; } - _strlwr(buffer); + xr_strlwr(buffer); } ICF diff --git a/src/editors/ECore/Editor/ExportSkeleton.cpp b/src/editors/ECore/Editor/ExportSkeleton.cpp index 6f598db7560..95c75ed1677 100644 --- a/src/editors/ECore/Editor/ExportSkeleton.cpp +++ b/src/editors/ECore/Editor/ExportSkeleton.cpp @@ -1244,7 +1244,7 @@ bool CExportSkeleton::ExportMotionDefs(IWriter& F) { string512 buff; strcpy(buff, bp_it->alias.c_str()); - _strlwr(buff); + xr_strlwr(buff); F.w_stringZ(buff); F.w_u16((u16)bp_it->bones.size()); for (int i = 0; i < int(bp_it->bones.size()); ++i) diff --git a/src/editors/ECore/Editor/Library.cpp b/src/editors/ECore/Editor/Library.cpp index efb2a5080f4..a690eb44fa6 100644 --- a/src/editors/ECore/Editor/Library.cpp +++ b/src/editors/ECore/Editor/Library.cpp @@ -78,7 +78,7 @@ void ELibrary::ReloadObject(LPCSTR nm) R_ASSERT(nm && nm[0]); string512 name; strcpy(name, nm); - _strlwr(name); + xr_strlwr(name); EditObjPairIt it = m_EditObjects.find(name); if (it != m_EditObjects.end()) it->second->Reload(); diff --git a/src/editors/ECore/Editor/UI_MainCommand.cpp b/src/editors/ECore/Editor/UI_MainCommand.cpp index 75ee5ad7f57..58f8dd8a3cd 100644 --- a/src/editors/ECore/Editor/UI_MainCommand.cpp +++ b/src/editors/ECore/Editor/UI_MainCommand.cpp @@ -58,7 +58,7 @@ SECommand* FindCommandByName(LPCSTR nm) for (u32 cmd_idx = 0; cmd_idx < cmds.size(); cmd_idx++) { SECommand*& CMD = cmds[cmd_idx]; - if (CMD && (0 == _stricmp(CMD->name, nm))) + if (CMD && (0 == xr_stricmp(CMD->name, nm))) return CMD; } return 0; @@ -70,7 +70,7 @@ SESubCommand* FindSubCommandByName(SECommand* CMD, LPCSTR nm) for (u32 sub_cmd_idx = 0; sub_cmd_idx < CMD->sub_commands.size(); sub_cmd_idx++) { SESubCommand* SUB_CMD = CMD->sub_commands[sub_cmd_idx]; - if (0 == _stricmp(SUB_CMD->desc.c_str(), nm)) + if (0 == xr_stricmp(SUB_CMD->desc.c_str(), nm)) return SUB_CMD; } return 0; diff --git a/src/editors/ECore/Editor/UI_ToolsCustom.cpp b/src/editors/ECore/Editor/UI_ToolsCustom.cpp index 15b357c9b65..d9dad704410 100644 --- a/src/editors/ECore/Editor/UI_ToolsCustom.cpp +++ b/src/editors/ECore/Editor/UI_ToolsCustom.cpp @@ -180,13 +180,13 @@ bool __fastcall CToolCustom::MouseStart(TShiftState Shift) if (pinfo.e_mesh) { LPCSTR mn = pinfo.e_mesh->Name().c_str(); - if (0 == _stricmp(mn, "axis_x")) + if (0 == xr_stricmp(mn, "axis_x")) SetAxis(etAxisX); - else if (0 == _stricmp(mn, "axis_y")) + else if (0 == xr_stricmp(mn, "axis_y")) SetAxis(etAxisY); - else if (0 == _stricmp(mn, "axis_z")) + else if (0 == xr_stricmp(mn, "axis_z")) SetAxis(etAxisZ); - else if (0 == _stricmp(mn, "center")) + else if (0 == xr_stricmp(mn, "center")) SetAxis(etAxisZX); else R_ASSERT2(0, "fix axis name"); diff --git a/src/editors/ECore/Editor/xrLoadSurface.cpp b/src/editors/ECore/Editor/xrLoadSurface.cpp index 0017960cde2..102557f2b2a 100644 --- a/src/editors/ECore/Editor/xrLoadSurface.cpp +++ b/src/editors/ECore/Editor/xrLoadSurface.cpp @@ -12,7 +12,7 @@ struct SExts if (ext && ext[0]) { for (u32 i = 0; i < exts.size(); i++) - if (0 == _stricmp(exts[i], ext)) + if (0 == xr_stricmp(exts[i], ext)) return; exts.push_back(xr_strdup(ext)); } diff --git a/src/editors/LevelEditor/BottomBar.cpp b/src/editors/LevelEditor/BottomBar.cpp index 4db82b72b6b..1e126d6bff8 100644 --- a/src/editors/LevelEditor/BottomBar.cpp +++ b/src/editors/LevelEditor/BottomBar.cpp @@ -196,7 +196,7 @@ void __fastcall TfraBottomBar::pmOptionsPopup(TObject* Sender) { TMenuItem* mi = miWeather->Items[i]; BOOL bch; - bch = ((EPrefs->sWeather.size()) && (0 == _stricmp(mi->Caption.c_str(), EPrefs->sWeather.c_str()))) || + bch = ((EPrefs->sWeather.size()) && (0 == xr_stricmp(mi->Caption.c_str(), EPrefs->sWeather.c_str()))) || (mi->Caption == "none" && EPrefs->sWeather.size() == 0); mi->Checked = bch; } diff --git a/src/editors/LevelEditor/Edit/BuilderRemote.cpp b/src/editors/LevelEditor/Edit/BuilderRemote.cpp index 34d6374e957..21061ede023 100644 --- a/src/editors/LevelEditor/Edit/BuilderRemote.cpp +++ b/src/editors/LevelEditor/Edit/BuilderRemote.cpp @@ -1274,7 +1274,7 @@ int SceneBuilder::BuildShaderXRLC(const char* s) int SceneBuilder::FindInTextures(const char* name) { for (u32 i = 0; i < l_textures.size(); i++) - if (_stricmp(l_textures[i].name, name) == 0) + if (xr_stricmp(l_textures[i].name, name) == 0) return i; return -1; } diff --git a/src/editors/LevelEditor/Edit/CustomObject.h b/src/editors/LevelEditor/Edit/CustomObject.h index 3098558ea39..bc5022ee556 100644 --- a/src/editors/LevelEditor/Edit/CustomObject.h +++ b/src/editors/LevelEditor/Edit/CustomObject.h @@ -118,7 +118,7 @@ class ECORE_API CCustomObject { string256 tmp; strcpy(tmp, N); - _strlwr(tmp); + xr_strlwr(tmp); FName = tmp; } diff --git a/src/editors/LevelEditor/Edit/EParticlesObject.h b/src/editors/LevelEditor/Edit/EParticlesObject.h index e7235fd39dc..962597f3ffb 100644 --- a/src/editors/LevelEditor/Edit/EParticlesObject.h +++ b/src/editors/LevelEditor/Edit/EParticlesObject.h @@ -55,7 +55,7 @@ class EParticlesObject : public CCustomObject RefCompare(LPCSTR ref_name) { VERIFY(ref_name && ref_name[0]); - return (0 == _stricmp(ref_name, GetReferenceName())); + return (0 == xr_stricmp(ref_name, GetReferenceName())); } bool Compile(LPCSTR ref_name); diff --git a/src/editors/LevelEditor/Edit/ESceneDOTools_Generate.cpp b/src/editors/LevelEditor/Edit/ESceneDOTools_Generate.cpp index d818da9cdd0..aea1490c564 100644 --- a/src/editors/LevelEditor/Edit/ESceneDOTools_Generate.cpp +++ b/src/editors/LevelEditor/Edit/ESceneDOTools_Generate.cpp @@ -514,7 +514,7 @@ bool EDetailManager::UpdateObjects(bool bUpdateTex, bool bUpdateSelectedOnly) CDetailManager::DetailIt EDetailManager::FindDOByNameIt(LPCSTR name) { for (DetailIt it = objects.begin(); it != objects.end(); it++) - if (_stricmp(((EDetail*)(*it))->GetName(), name) == 0) + if (xr_stricmp(((EDetail*)(*it))->GetName(), name) == 0) return it; return objects.end(); } @@ -588,7 +588,7 @@ EDetail* EDetailManager::FindObjectInColorIndices(u32 index, LPCSTR name) { DOVec& lst = CI->second; for (DOIt it = lst.begin(); it != lst.end(); it++) - if (_stricmp((*it)->GetName(), name) == 0) + if (xr_stricmp((*it)->GetName(), name) == 0) return *it; } return 0; diff --git a/src/editors/LevelEditor/Edit/ESceneObjectTools.cpp b/src/editors/LevelEditor/Edit/ESceneObjectTools.cpp index 273535faf0c..15fe0358179 100644 --- a/src/editors/LevelEditor/Edit/ESceneObjectTools.cpp +++ b/src/editors/LevelEditor/Edit/ESceneObjectTools.cpp @@ -209,7 +209,7 @@ void ESceneObjectTool::HighlightTexture(LPCSTR tex_name, bool allow_ratio, u32 t SurfaceVec& s_vec = e_obj->Surfaces(); for (SurfaceIt it = s_vec.begin(); it != s_vec.end(); it++) { - if (0 == _stricmp((*it)->_Texture(), tex_name)) + if (0 == xr_stricmp((*it)->_Texture(), tex_name)) { Fvector verts[3]; for (EditMeshIt mesh_it = e_obj->FirstMesh(); mesh_it != e_obj->LastMesh(); mesh_it++) diff --git a/src/editors/LevelEditor/Edit/ESceneObjectTools_.cpp b/src/editors/LevelEditor/Edit/ESceneObjectTools_.cpp index 91f6dc8cbaf..80a726aaaa9 100644 --- a/src/editors/LevelEditor/Edit/ESceneObjectTools_.cpp +++ b/src/editors/LevelEditor/Edit/ESceneObjectTools_.cpp @@ -181,7 +181,7 @@ void ESceneObjectTools::HighlightTexture(LPCSTR tex_name, bool allow_ratio, u32 SurfaceVec& s_vec = e_obj->Surfaces(); for (SurfaceIt it = s_vec.begin(); it != s_vec.end(); it++) { - if (0 == _stricmp((*it)->_Texture(), tex_name)) + if (0 == xr_stricmp((*it)->_Texture(), tex_name)) { Fvector verts[3]; for (EditMeshIt mesh_it = e_obj->FirstMesh(); mesh_it != e_obj->LastMesh(); mesh_it++) diff --git a/src/editors/LevelEditor/Edit/ESceneObjectTools__.cpp b/src/editors/LevelEditor/Edit/ESceneObjectTools__.cpp index c6a3ee3fcfb..6af5256f7b9 100644 --- a/src/editors/LevelEditor/Edit/ESceneObjectTools__.cpp +++ b/src/editors/LevelEditor/Edit/ESceneObjectTools__.cpp @@ -180,7 +180,7 @@ void ESceneObjectTools::HighlightTexture(LPCSTR tex_name, bool allow_ratio, u32 SurfaceVec& s_vec = e_obj->Surfaces(); for (SurfaceIt it = s_vec.begin(); it != s_vec.end(); it++) { - if (0 == _stricmp((*it)->_Texture(), tex_name)) + if (0 == xr_stricmp((*it)->_Texture(), tex_name)) { Fvector verts[3]; for (EditMeshIt mesh_it = e_obj->FirstMesh(); mesh_it != e_obj->LastMesh(); mesh_it++) diff --git a/src/editors/LevelEditor/Edit/SceneSummaryInfo.cpp b/src/editors/LevelEditor/Edit/SceneSummaryInfo.cpp index f52b9ca1841..d46a0e0c4c7 100644 --- a/src/editors/LevelEditor/Edit/SceneSummaryInfo.cpp +++ b/src/editors/LevelEditor/Edit/SceneSummaryInfo.cpp @@ -32,10 +32,10 @@ void SSceneSummary::Prepare() } } -xr_string _itoa(int val) +xr_string xr_itoa(int val) { string64 tmp; - return _itoa(val, tmp, 10); + return xr_itoa(val, tmp, 10); } void SSceneSummary::SObjectInfo::Prepare() @@ -49,13 +49,13 @@ void SSceneSummary::SObjectInfo::Prepare() { SPairInfo tmp; tmp.first = pref + "\\References"; - tmp.second = _itoa(ref_count); + tmp.second = xr_itoa(ref_count); info.push_back(tmp); tmp.first = pref + "\\Geometry\\Faces"; - tmp.second = _itoa(O->GetFaceCount()); + tmp.second = xr_itoa(O->GetFaceCount()); info.push_back(tmp); tmp.first = pref + "\\Geometry\\Vertices"; - tmp.second = _itoa(O->GetVertexCount()); + tmp.second = xr_itoa(O->GetVertexCount()); info.push_back(tmp); SurfaceVec& surfaces = O->Surfaces(); for (SurfaceIt it = surfaces.begin(); it != surfaces.end(); it++) @@ -65,7 +65,7 @@ void SSceneSummary::SObjectInfo::Prepare() tmp.second = (*it)->_Texture(); info.push_back(tmp); tmp.first = pr + "\\Faces"; - tmp.second = _itoa(O->GetSurfFaceCount((*it)->_Name())); + tmp.second = xr_itoa(O->GetSurfFaceCount((*it)->_Name())); info.push_back(tmp); } Lib.RemoveEditObject(O); diff --git a/src/editors/LevelEditor/Edit/SceneUndo.cpp b/src/editors/LevelEditor/Edit/SceneUndo.cpp index 91acc285dba..c79ffcf6320 100644 --- a/src/editors/LevelEditor/Edit/SceneUndo.cpp +++ b/src/editors/LevelEditor/Edit/SceneUndo.cpp @@ -25,12 +25,12 @@ void EScene::UndoClear() { while (!m_RedoStack.empty()) { - _unlink(m_RedoStack.back().m_FileName); + xr_unlink(m_RedoStack.back().m_FileName); m_RedoStack.pop_back(); } while (!m_UndoStack.empty()) { - _unlink(m_UndoStack.back().m_FileName); + xr_unlink(m_UndoStack.back().m_FileName); m_UndoStack.pop_back(); } } @@ -53,13 +53,13 @@ void EScene::UndoSave() while (!m_RedoStack.empty()) { - _unlink(m_RedoStack.back().m_FileName); + xr_unlink(m_RedoStack.back().m_FileName); m_RedoStack.pop_back(); } if (m_UndoStack.size() > EPrefs->scene_undo_level) { - _unlink(m_UndoStack.front().m_FileName); + xr_unlink(m_UndoStack.front().m_FileName); m_UndoStack.pop_front(); } } @@ -74,7 +74,7 @@ bool EScene::Undo() if (m_RedoStack.size() > EPrefs->scene_undo_level) { - _unlink(m_RedoStack.front().m_FileName); + xr_unlink(m_RedoStack.front().m_FileName); m_RedoStack.pop_front(); } @@ -104,7 +104,7 @@ bool EScene::Redo() if (m_UndoStack.size() > EPrefs->scene_undo_level) { - _unlink(m_UndoStack.front().m_FileName); + xr_unlink(m_UndoStack.front().m_FileName); m_UndoStack.pop_front(); } diff --git a/src/editors/LevelEditor/Edit/sector.cpp b/src/editors/LevelEditor/Edit/sector.cpp index b32890f56c0..976048af8cd 100644 --- a/src/editors/LevelEditor/Edit/sector.cpp +++ b/src/editors/LevelEditor/Edit/sector.cpp @@ -44,7 +44,7 @@ CSectorItem::CSectorItem(CSceneObject* o, CEditableMesh* m) void CSectorItem::GetTransform(Fmatrix& parent) { object->GetFullTransformToWorld(parent); } bool CSectorItem::IsItem(const char* O, const char* M) { - return (0 == _stricmp(O, object->Name)) && (0 == _stricmp(M, mesh->Name().c_str())); + return (0 == xr_stricmp(O, object->Name)) && (0 == _stricmp(M, mesh->Name().c_str())); } //------------------------------------------------------------------------------ diff --git a/src/editors/LevelEditor/EditLibrary.cpp b/src/editors/LevelEditor/EditLibrary.cpp index ffcafb7b734..7269ddb0047 100644 --- a/src/editors/LevelEditor/EditLibrary.cpp +++ b/src/editors/LevelEditor/EditLibrary.cpp @@ -663,7 +663,7 @@ void TfrmEditLibrary::ChangeReference(const RStringVec& items) // save new position CEditableObject* E = m_pEditObject->GetReference(); - if (E && new_name && (_stricmp(E->GetName(),new_name))==0 ) return; + if (E && new_name && (xr_stricmp(E->GetName(),new_name))==0 ) return; if (E) { diff --git a/src/editors/LevelEditor/ShaderFunction.cpp b/src/editors/LevelEditor/ShaderFunction.cpp index 39920a07434..3f43ada886d 100644 --- a/src/editors/LevelEditor/ShaderFunction.cpp +++ b/src/editors/LevelEditor/ShaderFunction.cpp @@ -52,7 +52,7 @@ AnsiString& GetTokenNameFromVal_EQ(u32 val, AnsiString& res, const xr_token* tok u32 GetTokenValFromName(const LPCSTR val, const xr_token* token_list) { for (int i = 0; token_list[i].name; i++) - if (!_stricmp(val, token_list[i].name)) + if (!xr_stricmp(val, token_list[i].name)) return token_list[i].id; return 0; } diff --git a/src/editors/ParticleEditor/BottomBar.cpp b/src/editors/ParticleEditor/BottomBar.cpp index 3c5697d1cfd..178a45ab994 100644 --- a/src/editors/ParticleEditor/BottomBar.cpp +++ b/src/editors/ParticleEditor/BottomBar.cpp @@ -197,7 +197,7 @@ void __fastcall TfraBottomBar::pmOptionsPopup(TObject* Sender) { TMenuItem* mi = miWeather->Items[i]; BOOL bch; - bch = ((EPrefs->sWeather.size()) && (0 == _stricmp(mi->Caption.c_str(), EPrefs->sWeather.c_str()))) || + bch = ((EPrefs->sWeather.size()) && (0 == xr_stricmp(mi->Caption.c_str(), EPrefs->sWeather.c_str()))) || (mi->Caption == "none" && EPrefs->sWeather.size() == 0); mi->Checked = bch; } diff --git a/src/editors/ParticleEditor/ParticleEffectEditor.cpp b/src/editors/ParticleEditor/ParticleEffectEditor.cpp index cb6721d5feb..25e60e1f679 100644 --- a/src/editors/ParticleEditor/ParticleEffectEditor.cpp +++ b/src/editors/ParticleEditor/ParticleEffectEditor.cpp @@ -79,7 +79,7 @@ void __fastcall PS::CPEDef::FindActionByName(LPCSTR new_name, bool& res) { res = false; for (EPAVecIt s_it = m_EActionList.begin(); s_it != m_EActionList.end(); s_it++) - if (0 == _stricmp(new_name, *(*s_it)->actionName)) + if (0 == xr_stricmp(new_name, *(*s_it)->actionName)) { res = true; break; diff --git a/src/editors/ParticleEditor/ParticleEffectParser.cpp b/src/editors/ParticleEditor/ParticleEffectParser.cpp index e6bcafc38c9..3cea716a260 100644 --- a/src/editors/ParticleEditor/ParticleEffectParser.cpp +++ b/src/editors/ParticleEditor/ParticleEffectParser.cpp @@ -505,8 +505,8 @@ IC bool get_bool(LPCSTR a, var& val) { - bool b0 = (0 == _stricmp(a, "false")); - bool b1 = (0 == _stricmp(a, "true")); + bool b0 = (0 == xr_stricmp(a, "false")); + bool b1 = (0 == xr_stricmp(a, "true")); if (b0 == b1) return false; val = (BOOL)b1; diff --git a/src/editors/ParticleEditor/UI_ParticleTools.cpp b/src/editors/ParticleEditor/UI_ParticleTools.cpp index ec226860f6f..109e395d635 100644 --- a/src/editors/ParticleEditor/UI_ParticleTools.cpp +++ b/src/editors/ParticleEditor/UI_ParticleTools.cpp @@ -394,7 +394,7 @@ void CheckEffect(const xr_string& group_path, const shared_str& eff_full_name, x { res_name = group_path + "effects\\" + EFS.ExtractFileName(eff_full_name.c_str()); - if (0 != _stricmp(res_name.c_str(), eff_full_name.c_str())) + if (0 != xr_stricmp(res_name.c_str(), eff_full_name.c_str())) { PS::CPEDef* old_ped = ::Render->PSLibrary.FindPED(eff_full_name.c_str()); PS::CPEDef* new_ped = ::Render->PSLibrary.FindPED(res_name.c_str()); @@ -413,7 +413,7 @@ void CheckEffect(const xr_string& group_path, const shared_str& eff_full_name, x else Msg("create new effect [%s]", res_name.c_str()); } - VERIFY(0 == _stricmp(new_ped->m_Name.c_str(), res_name.c_str())); + VERIFY(0 == xr_stricmp(new_ped->m_Name.c_str(), res_name.c_str())); } } diff --git a/src/editors/ShaderEditor/BottomBar.cpp b/src/editors/ShaderEditor/BottomBar.cpp index 08a80b96319..87711a8b4d3 100644 --- a/src/editors/ShaderEditor/BottomBar.cpp +++ b/src/editors/ShaderEditor/BottomBar.cpp @@ -198,7 +198,7 @@ void __fastcall TfraBottomBar::pmOptionsPopup(TObject* Sender) { TMenuItem* mi = miWeather->Items[i]; BOOL bch; - bch = ((EPrefs->sWeather.size()) && (0 == _stricmp(mi->Caption.c_str(), EPrefs->sWeather.c_str()))) || + bch = ((EPrefs->sWeather.size()) && (0 == xr_stricmp(mi->Caption.c_str(), EPrefs->sWeather.c_str()))) || (mi->Caption == "none" && EPrefs->sWeather.size() == 0); mi->Checked = bch; } diff --git a/src/plugins/Shared/Helper.h b/src/plugins/Shared/Helper.h index cf7e5c04d0b..ab2fc3c4bf2 100644 --- a/src/plugins/Shared/Helper.h +++ b/src/plugins/Shared/Helper.h @@ -44,7 +44,7 @@ class Helper for (DWORD i = 0; i < input.size(); i++) result += (input[i] == ' ') ? '_' : input[i]; char* res_ptr = (char*)result.c_str(); - _strlwr(res_ptr); + xr_strlwr(res_ptr); return result; } static IC void ConvertMatrix(const Matrix3& _src, Fmatrix& dest) diff --git a/src/utils/Shader_xrLC.h b/src/utils/Shader_xrLC.h index 92bb4525853..e039130955f 100644 --- a/src/utils/Shader_xrLC.h +++ b/src/utils/Shader_xrLC.h @@ -92,7 +92,7 @@ class Shader_xrLC_LIB u32 GetID(LPCSTR name) const { for (auto it = library.begin(); it != library.end(); it++) - if (0 == _stricmp(name, it->Name)) + if (0 == xr_stricmp(name, it->Name)) return u32(it - library.begin()); return u32(-1); } @@ -100,7 +100,7 @@ class Shader_xrLC_LIB Shader_xrLC* Get(LPCSTR name) { for (auto& shader : library) - if (0 == _stricmp(name, shader.Name)) + if (0 == xr_stricmp(name, shader.Name)) return &shader; return nullptr; } @@ -118,7 +118,7 @@ class Shader_xrLC_LIB void Remove(LPCSTR name) { for (auto it = library.begin(); it != library.end(); it++) - if (0 == _stricmp(name, it->Name)) + if (0 == xr_stricmp(name, it->Name)) { library.erase(it); break; diff --git a/src/utils/xrAI/game_spawn_constructor.cpp b/src/utils/xrAI/game_spawn_constructor.cpp index dc20b435090..82acfd8de9b 100644 --- a/src/utils/xrAI/game_spawn_constructor.cpp +++ b/src/utils/xrAI/game_spawn_constructor.cpp @@ -66,7 +66,7 @@ void CGameSpawnConstructor::load_spawns(LPCSTR name, bool no_separator_check) xr_vector needed_levels; string4096 levels_string; xr_strcpy(levels_string, name); - _strlwr(levels_string); + xr_strlwr(levels_string); fill_needed_levels(levels_string, needed_levels); // fill level info diff --git a/src/utils/xrAI/xrAI.cpp b/src/utils/xrAI/xrAI.cpp index 212472246e0..4f410cb40b5 100644 --- a/src/utils/xrAI/xrAI.cpp +++ b/src/utils/xrAI/xrAI.cpp @@ -139,7 +139,7 @@ void Startup(LPSTR lpCmdLine) string4096 cmd; xr_strcpy(cmd, lpCmdLine); - _strlwr(cmd); + xr_strlwr(cmd); if (strstr(cmd, "-?") || strstr(cmd, "-h")) { Help(); diff --git a/src/utils/xrAI/xr_graph_merge.cpp b/src/utils/xrAI/xr_graph_merge.cpp index 118bc151fa9..261e9de5829 100644 --- a/src/utils/xrAI/xr_graph_merge.cpp +++ b/src/utils/xrAI/xr_graph_merge.cpp @@ -390,7 +390,7 @@ void read_levels(CInifile* Ini, xr_set& levels, bool rebuild_graph, { string256 N; xr_strcpy(N, _N); - _strlwr(N); + xr_strlwr(N); if (!Ini->section_exist(N)) { @@ -420,7 +420,7 @@ void read_levels(CInifile* Ini, xr_set& levels, bool rebuild_graph, auto _S = Ini->r_string(N, "name"); string256 S; xr_strcpy(S, _S); - _strlwr(S); + xr_strlwr(S); if (needed_levels) { @@ -544,7 +544,7 @@ CGraphMerger::CGraphMerger(LPCSTR game_graph_id, LPCSTR name, bool rebuild) xr_vector needed_levels; string4096 levels_string; xr_strcpy(levels_string, name); - _strlwr(levels_string); + xr_strlwr(levels_string); fill_needed_levels(levels_string, needed_levels); read_levels(Ini, levels, rebuild, &needed_levels); @@ -601,7 +601,7 @@ CGraphMerger::CGraphMerger(LPCSTR game_graph_id, LPCSTR name, bool rebuild) R_ASSERT(M != (*K).second->m_tVertexMap.end()); } - //if (!_stricmp("l06_rostok",*i.second->m_tLevel.name())) + //if (!xr_stricmp("l06_rostok",*i.second->m_tLevel.name())) // __asm int 3; Msg("Level %s with id %d has VALID connection point %s,\nwhich references to graph point %s on the level %s with id %d\n", diff --git a/src/utils/xrCompress/xrCompress.cpp b/src/utils/xrCompress/xrCompress.cpp index de33ca1451c..9ca219a3898 100644 --- a/src/utils/xrCompress/xrCompress.cpp +++ b/src/utils/xrCompress/xrCompress.cpp @@ -44,48 +44,48 @@ bool xrCompressor::testSKIP(LPCSTR path) if (strstr(path, "textures\\det\\")) return true; - if (_stricmp(p_ext, ".thm") && strstr(path, "textures\\terrain\\terrain_") && !is_tail(p_name, "_mask", 5)) + if (xr_stricmp(p_ext, ".thm") && strstr(path, "textures\\terrain\\terrain_") && !is_tail(p_name, "_mask", 5)) return true; if (strstr(path, "textures\\") && is_tail(p_name, "_nmap", 5) && !strstr(p_name, "water_flowing_nmap")) return true; - if (0 == _stricmp(p_name, "build")) + if (0 == xr_stricmp(p_name, "build")) { - if (0 == _stricmp(p_ext, ".aimap")) + if (0 == xr_stricmp(p_ext, ".aimap")) return true; - if (0 == _stricmp(p_ext, ".cform")) + if (0 == xr_stricmp(p_ext, ".cform")) return true; - if (0 == _stricmp(p_ext, ".details")) + if (0 == xr_stricmp(p_ext, ".details")) return true; - if (0 == _stricmp(p_ext, ".prj")) + if (0 == xr_stricmp(p_ext, ".prj")) return true; - if (0 == _stricmp(p_ext, ".lights")) + if (0 == xr_stricmp(p_ext, ".lights")) return false; } - if (0 == _stricmp(p_name, "do_light") && 0 == _stricmp(p_ext, ".ltx")) + if (0 == xr_stricmp(p_name, "do_light") && 0 == xr_stricmp(p_ext, ".ltx")) return true; - if (0 == _stricmp(p_ext, ".txt")) + if (0 == xr_stricmp(p_ext, ".txt")) return true; - if (0 == _stricmp(p_ext, ".tga")) + if (0 == xr_stricmp(p_ext, ".tga")) return true; - if (0 == _stricmp(p_ext, ".db")) + if (0 == xr_stricmp(p_ext, ".db")) return true; - if (0 == _stricmp(p_ext, ".smf")) + if (0 == xr_stricmp(p_ext, ".smf")) return true; if ('~' == p_ext[1]) return true; if ('_' == p_ext[1]) return true; - if (0 == _stricmp(p_ext, ".vcproj")) + if (0 == xr_stricmp(p_ext, ".vcproj")) return true; - if (0 == _stricmp(p_ext, ".sln")) + if (0 == xr_stricmp(p_ext, ".sln")) return true; - if (0 == _stricmp(p_ext, ".old")) + if (0 == xr_stricmp(p_ext, ".old")) return true; - if (0 == _stricmp(p_ext, ".rc")) + if (0 == xr_stricmp(p_ext, ".rc")) return true; for (const auto &it : exclude_exts) @@ -103,13 +103,13 @@ bool xrCompressor::testVFS(LPCSTR path) string256 p_ext; _splitpath(path, 0, 0, 0, p_ext); - if (!_stricmp(p_ext, ".xml")) + if (!xr_stricmp(p_ext, ".xml")) return (false); - if (!_stricmp(p_ext, ".ltx")) + if (!xr_stricmp(p_ext, ".ltx")) return (FALSE); - if (!_stricmp(p_ext, ".script")) + if (!xr_stricmp(p_ext, ".script")) return (FALSE); return (TRUE); @@ -332,11 +332,11 @@ void xrCompressor::OpenPack(LPCSTR tgt_folder, int num) string_path fname; string128 s_num; #ifdef MOD_COMPRESS - strconcat(sizeof(fname), fname, tgt_folder, ".xdb", _itoa(num, s_num, 10)); + strconcat(sizeof(fname), fname, tgt_folder, ".xdb", xr_itoa(num, s_num, 10)); #else - strconcat(sizeof(fname), fname, tgt_folder, ".pack_#", _itoa(num, s_num, 10)); + strconcat(sizeof(fname), fname, tgt_folder, ".pack_#", xr_itoa(num, s_num, 10)); #endif - _unlink(fname); + xr_unlink(fname); fs_pack_writer = FS.w_open(fname); fs_desc.clear(); diff --git a/src/utils/xrDO_Light/xrDO_Light.cpp b/src/utils/xrDO_Light/xrDO_Light.cpp index cb96b61054b..3864d4a7f0b 100644 --- a/src/utils/xrDO_Light/xrDO_Light.cpp +++ b/src/utils/xrDO_Light/xrDO_Light.cpp @@ -16,7 +16,7 @@ void Startup(LPSTR lpCmdLine) char cmd[512]; bool bNet = false; xr_strcpy(cmd, lpCmdLine); - _strlwr(cmd); + xr_strlwr(cmd); if (strstr(cmd, "-?") || strstr(cmd, "-h")) { Help(); diff --git a/src/utils/xrDXT/DXT.cpp b/src/utils/xrDXT/DXT.cpp index 336d0beb5b3..a924dbad08f 100644 --- a/src/utils/xrDXT/DXT.cpp +++ b/src/utils/xrDXT/DXT.cpp @@ -170,7 +170,7 @@ int DXTCompressImage(LPCSTR out_name, u8* raw_data, u32 w, u32 h, u32 pitch, STe } if (!result) { - _unlink(out_name); + xr_unlink(out_name); return 0; } return 1; diff --git a/src/utils/xrDXT/Image_DXTC.cpp b/src/utils/xrDXT/Image_DXTC.cpp index 9950b3f8384..b9b8ace91ee 100644 --- a/src/utils/xrDXT/Image_DXTC.cpp +++ b/src/utils/xrDXT/Image_DXTC.cpp @@ -76,7 +76,7 @@ bool Image_DXTC::LoadFromFile(LPCSTR filename) int next = 1; char fileupper[256]; strcpy_s(fileupper, filename); - _strupr(fileupper); + xr_strupr(fileupper); // TRACE( "\n" ); // TRACE( "\n" ); bool knownformat = false; diff --git a/src/utils/xrLC/Build_Load.cpp b/src/utils/xrLC/Build_Load.cpp index 85672b04dd8..a101ec9bc4b 100644 --- a/src/utils/xrLC/Build_Load.cpp +++ b/src/utils/xrLC/Build_Load.cpp @@ -257,17 +257,17 @@ void CBuild::Load(const b_params& Params, const IReader& _in_FS) for (u32 LH = 0; LH < L_layers.size(); LH++) { R_Layer& TEST = L_layers[LH]; - if (0 == _stricmp(TEST.control.name, LCONTROL_HEMI)) + if (0 == xr_stricmp(TEST.control.name, LCONTROL_HEMI)) { // Hemi found L_static().hemi = TEST.lights; } - if (0 == _stricmp(TEST.control.name, LCONTROL_SUN)) + if (0 == xr_stricmp(TEST.control.name, LCONTROL_SUN)) { // Sun found L_static().sun = TEST.lights; } - if (0 == _stricmp(TEST.control.name, LCONTROL_STATIC)) + if (0 == xr_stricmp(TEST.control.name, LCONTROL_STATIC)) { // Static found L_static().rgb = TEST.lights; @@ -304,14 +304,14 @@ void CBuild::Load(const b_params& Params, const IReader& _in_FS) LPSTR N = BT.name; if (strchr(N, '.')) *(strchr(N, '.')) = 0; - _strlwr(N); + xr_strlwr(N); if (0 == xr_strcmp(N, "level_lods")) { // HACK for merged lod textures BT.dwWidth = 1024; BT.dwHeight = 1024; BT.bHasAlpha = TRUE; - BT.THM.SetHasSurface(FALSE); + BT.THM.SetHasSurface(false); BT.pSurface = 0; } else @@ -344,7 +344,7 @@ void CBuild::Load(const b_params& Params, const IReader& _in_FS) Logger.clMsg("- loading: %s", N); u32 w = 0, h = 0; BT.pSurface = Surface_Load(N, w, h); - BT.THM.SetHasSurface(TRUE); + BT.THM.SetHasSurface(true); R_ASSERT2(BT.pSurface, "Can't load surface"); if ((w != BT.dwWidth) || (h != BT.dwHeight)) { diff --git a/src/utils/xrLC/xrLC.cpp b/src/utils/xrLC/xrLC.cpp index 9cf3d39d93c..9165f1dc5ed 100644 --- a/src/utils/xrLC/xrLC.cpp +++ b/src/utils/xrLC/xrLC.cpp @@ -33,7 +33,7 @@ void Startup(LPSTR lpCmdLine) BOOL bModifyOptions = FALSE; xr_strcpy(cmd, lpCmdLine); - _strlwr(cmd); + xr_strlwr(cmd); if (strstr(cmd, "-?") || strstr(cmd, "-h")) { Help(); diff --git a/src/utils/xrLC/xrSaveOGF.cpp b/src/utils/xrLC/xrSaveOGF.cpp index 6022b41adb9..e727ac20bee 100644 --- a/src/utils/xrLC/xrSaveOGF.cpp +++ b/src/utils/xrLC/xrSaveOGF.cpp @@ -25,7 +25,7 @@ static u32 g_batch_5000; u16 RegisterShader(LPCSTR T) { for (u32 it = 0; it < pBuild->g_Shaders.size(); it++) - if (0 == _stricmp(T, pBuild->g_Shaders[it])) + if (0 == xr_stricmp(T, pBuild->g_Shaders[it])) return it; pBuild->g_Shaders.push_back(xr_strdup(T)); return pBuild->g_Shaders.size() - 1; diff --git a/src/utils/xrLCUtil/LevelCompilerLoggerWindow.cpp b/src/utils/xrLCUtil/LevelCompilerLoggerWindow.cpp index d137795d4cb..d05e2c4979a 100644 --- a/src/utils/xrLCUtil/LevelCompilerLoggerWindow.cpp +++ b/src/utils/xrLCUtil/LevelCompilerLoggerWindow.cpp @@ -79,7 +79,7 @@ void LevelCompilerLoggerWindow::LogThreadProc() string256 u_name; unsigned long u_size = sizeof(u_name) - 1; GetUserName(u_name, &u_size); - _strlwr(u_name); + xr_strlwr(u_name); if (!xr_strcmp(u_name, "oles") || !xr_strcmp(u_name, "alexmx")) bHighPriority = TRUE; // Main cycle diff --git a/src/utils/xrLC_Light/file_compress.cpp b/src/utils/xrLC_Light/file_compress.cpp index cbf4ce2dd18..68fac5648d5 100644 --- a/src/utils/xrLC_Light/file_compress.cpp +++ b/src/utils/xrLC_Light/file_compress.cpp @@ -57,7 +57,7 @@ void compress(LPCSTR f_in_out) compress(f_in_out, tmp); if (GetFileAttributes(f_in_out) != u32(-1)) - _unlink(f_in_out); + xr_unlink(f_in_out); // physically rename file VerifyPath(f_in_out); rename(tmp, f_in_out); @@ -69,7 +69,7 @@ void decompress(LPCSTR f_in_out) strconcat(sizeof(tmp), tmp, f_in_out, "___dtmp"); decompress(f_in_out, tmp); if (GetFileAttributes(f_in_out) != u32(-1)) - _unlink(f_in_out); + xr_unlink(f_in_out); // physically rename file VerifyPath(f_in_out); rename(tmp, f_in_out); diff --git a/src/utils/xrLC_Light/gl_base_cl_data.cpp b/src/utils/xrLC_Light/gl_base_cl_data.cpp index 9fd5110186e..8a53a39e62b 100644 --- a/src/utils/xrLC_Light/gl_base_cl_data.cpp +++ b/src/utils/xrLC_Light/gl_base_cl_data.cpp @@ -35,7 +35,7 @@ bool net_global_data_impl::create_data(LPCSTR path) VERIFY(inlc_global_data()); inlc_global_data()->read_base(r_global); - // _unlink( fn ); + // xr_unlink( fn ); FPU::m64r(); Memory.mem_compact(); diff --git a/src/utils/xrLC_Light/global_calculation_data.cpp b/src/utils/xrLC_Light/global_calculation_data.cpp index c20868730c9..235e1bb4bb0 100644 --- a/src/utils/xrLC_Light/global_calculation_data.cpp +++ b/src/utils/xrLC_Light/global_calculation_data.cpp @@ -129,7 +129,7 @@ void global_claculation_data::xrLoad() LPSTR N = BT.name; if (strchr(N, '.')) *(strchr(N, '.')) = 0; - _strlwr(N); + xr_strlwr(N); if (0 == xr_strcmp(N, "level_lods")) { @@ -138,7 +138,7 @@ void global_claculation_data::xrLoad() BT.dwHeight = 1024; BT.bHasAlpha = TRUE; BT.pSurface = 0; - BT.THM.SetHasSurface(FALSE); + BT.THM.SetHasSurface(false); } else { @@ -170,7 +170,7 @@ void global_claculation_data::xrLoad() BT.dwHeight = BT.THM.height; BT.bHasAlpha = BT.THM.HasAlphaChannel(); BT.pSurface = 0; - BT.THM.SetHasSurface(FALSE); + BT.THM.SetHasSurface(false); if (!bLOD) { if (BT.bHasAlpha || BT.THM.flags.test(STextureParams::flImplicitLighted)) @@ -178,7 +178,7 @@ void global_claculation_data::xrLoad() Logger.clMsg("- loading: %s", N); u32 w = 0, h = 0; BT.pSurface = Surface_Load(N, w, h); - BT.THM.SetHasSurface(TRUE); + BT.THM.SetHasSurface(true); R_ASSERT2(BT.pSurface, "Can't load surface"); if ((w != BT.dwWidth) || (h != BT.dwHeight)) Msg("! THM doesn't correspond to the texture: %dx%d -> %dx%d", BT.dwWidth, BT.dwHeight, diff --git a/src/utils/xrLC_Light/lm_net_global_data.cpp b/src/utils/xrLC_Light/lm_net_global_data.cpp index e7bcb2ca211..2176aaec7cf 100644 --- a/src/utils/xrLC_Light/lm_net_global_data.cpp +++ b/src/utils/xrLC_Light/lm_net_global_data.cpp @@ -37,7 +37,7 @@ bool net_global_data_impl::create_data(LPCSTR path) INetReaderFile r_global(path); inlc_global_data()->read_lm_data(r_global); } - // _unlink( fn ); + // xr_unlink( fn ); // inlc_global_data()->create_read_faces(); // inlc_global_data()->create_write_faces(); FPU::m64r(); diff --git a/src/utils/xrLC_Light/ref_model_net_global_data.cpp b/src/utils/xrLC_Light/ref_model_net_global_data.cpp index 3eefb1f0fbe..a2dddccf38c 100644 --- a/src/utils/xrLC_Light/ref_model_net_global_data.cpp +++ b/src/utils/xrLC_Light/ref_model_net_global_data.cpp @@ -27,7 +27,7 @@ bool net_global_data_impl::create_data(LPCSTR path) inlc_global_data()->read_mu_model_refs(r_global); inlc_global_data()->read_modes_color(r_global); } - // _unlink( fn ); + // xr_unlink( fn ); FPU::m64r(); Memory.mem_compact(); return true; diff --git a/src/utils/xrLC_Light/xrLightVertex.cpp b/src/utils/xrLC_Light/xrLightVertex.cpp index 3a513422401..e80fbe30b1e 100644 --- a/src/utils/xrLC_Light/xrLightVertex.cpp +++ b/src/utils/xrLC_Light/xrLightVertex.cpp @@ -4,6 +4,7 @@ #include "xrface.h" #include "xrLC_GlobalData.h" #include "light_point.h" +#include "xrCore/Threading/Lock.hpp" #include "xrCDB/xrCDB.h" //----------------------------------------------------------------------- diff --git a/src/utils/xrLC_Light/xrLight_Implicit.cpp b/src/utils/xrLC_Light/xrLight_Implicit.cpp index 26c5049d45f..efbfae85270 100644 --- a/src/utils/xrLC_Light/xrLight_Implicit.cpp +++ b/src/utils/xrLC_Light/xrLight_Implicit.cpp @@ -10,6 +10,7 @@ #include "xrLight_ImplicitCalcGlobs.h" #include "net_task_callback.h" #include "xrCDB/xrCDB.h" +#include "xrCore/Threading/Lock.hpp" extern "C" bool XR_IMPORT __stdcall DXTCompress( LPCSTR out_name, u8* raw_data, u8* normal_map, u32 w, u32 h, u32 pitch, STextureParams* fmt, u32 depth); diff --git a/src/xrCDB/Frustum.h b/src/xrCDB/Frustum.h index bce5c167c00..0734a74a097 100644 --- a/src/xrCDB/Frustum.h +++ b/src/xrCDB/Frustum.h @@ -6,6 +6,7 @@ #include "xrCDB.h" #include "xrCore/FixedVector.h" +#include "xrCore/_plane.h" #pragma pack(push, 4) diff --git a/src/xrCDB/ISpatial.cpp b/src/xrCDB/ISpatial.cpp index 07ac23b5b99..0cc0a35a817 100644 --- a/src/xrCDB/ISpatial.cpp +++ b/src/xrCDB/ISpatial.cpp @@ -9,6 +9,7 @@ #include "xrEngine/Device.h" #include "xrEngine/GameFont.h" #include "xrEngine/PerformanceAlert.hpp" +#include "xrCore/Threading/Lock.hpp" ISpatial_DB* g_SpatialSpace = NULL; ISpatial_DB* g_SpatialSpacePhysic = NULL; @@ -150,9 +151,11 @@ void ISpatial_NODE::_remove(ISpatial* S) ////////////////////////////////////////////////////////////////////////// -ISpatial_DB::ISpatial_DB(const char* name) +ISpatial_DB::ISpatial_DB(const char* name) : #ifdef CONFIG_PROFILE_LOCKS - : cs(MUTEX_PROFILE_ID(ISpatial_DB)) + pcs(new Lock(MUTEX_PROFILE_ID(ISpatial_DB))) +#else + pcs(new Lock) #endif // CONFIG_PROFILE_LOCKS { m_root = NULL; @@ -171,6 +174,8 @@ ISpatial_DB::~ISpatial_DB() allocator.destroy(allocator_pool.back()); allocator_pool.pop_back(); } + + delete pcs; } void ISpatial_DB::initialize(Fbox& BB) @@ -265,7 +270,7 @@ void ISpatial_DB::_insert(ISpatial_NODE* N, Fvector& n_C, float n_R) void ISpatial_DB::insert(ISpatial* S) { - cs.Enter(); + pcs->Enter(); #ifdef DEBUG Stats.Insert.Begin(); @@ -306,7 +311,7 @@ void ISpatial_DB::insert(ISpatial* S) #ifdef DEBUG Stats.Insert.End(); #endif - cs.Leave(); + pcs->Leave(); } void ISpatial_DB::_remove(ISpatial_NODE* N, ISpatial_NODE* N_sub) @@ -343,7 +348,7 @@ void ISpatial_DB::_remove(ISpatial_NODE* N, ISpatial_NODE* N_sub) void ISpatial_DB::remove(ISpatial* S) { - cs.Enter(); + pcs->Enter(); #ifdef DEBUG Stats.Remove.Begin(); #endif @@ -357,16 +362,16 @@ void ISpatial_DB::remove(ISpatial* S) #ifdef DEBUG Stats.Remove.End(); #endif - cs.Leave(); + pcs->Leave(); } -void ISpatial_DB::update(u32 nodes /* =8 */) +void ISpatial_DB::update(u32 /*nodes = 8 */) { #ifdef DEBUG if (0 == m_root) return; - cs.Enter(); + pcs->Enter(); VERIFY(verify()); - cs.Leave(); + pcs->Leave(); #endif } diff --git a/src/xrCDB/ISpatial.h b/src/xrCDB/ISpatial.h index c17a1787df4..25e4c86fa47 100644 --- a/src/xrCDB/ISpatial.h +++ b/src/xrCDB/ISpatial.h @@ -1,10 +1,13 @@ #pragma once +#include "Common/Noncopyable.hpp" #include "xrCore/xrPool.h" //#include "xr_collide_defs.h" +#include "xrCore/xrCore_benchmark_macros.h" #include "xrCore/_types.h" #include "xrCore/_vector3d.h" #include "xrCore/_sphere.h" +#include "xrCore/FTimer.h" #include "xrCDB.h" #pragma pack(push, 4) @@ -76,6 +79,7 @@ class Sound; } class IRenderable; class IRender_Light; +class Lock; class SpatialData { @@ -166,7 +170,7 @@ class ISpatial_NODE #endif // #ifndef DLL_API ////////////////////////////////////////////////////////////////////////// -class XRCDB_API ISpatial_DB +class XRCDB_API ISpatial_DB : private Noncopyable { public: struct SpatialDBStatistics @@ -205,7 +209,7 @@ class XRCDB_API ISpatial_DB }; private: - Lock cs; + Lock* pcs; poolSS allocator; diff --git a/src/xrCDB/ISpatial_q_box.cpp b/src/xrCDB/ISpatial_q_box.cpp index a25062e2bff..d18aad99b67 100644 --- a/src/xrCDB/ISpatial_q_box.cpp +++ b/src/xrCDB/ISpatial_q_box.cpp @@ -1,6 +1,7 @@ #include "stdafx.h" #include "ISpatial.h" #include "xrCore/_fbox.h" +#include "xrCore/Threading/Lock.hpp" extern Fvector c_spatial_offset[8]; @@ -69,7 +70,7 @@ class walker void ISpatial_DB::q_box(xr_vector& R, u32 _o, u32 _mask, const Fvector& _center, const Fvector& _size) { - cs.Enter(); + pcs->Enter(); Stats.Query.Begin(); q_result = &R; q_result->clear(); @@ -84,7 +85,7 @@ void ISpatial_DB::q_box(xr_vector& R, u32 _o, u32 _mask, const Fvecto W.walk(m_root, m_center, m_bounds); } Stats.Query.End(); - cs.Leave(); + pcs->Leave(); } void ISpatial_DB::q_sphere(xr_vector& R, u32 _o, u32 _mask, const Fvector& _center, const float _radius) diff --git a/src/xrCDB/ISpatial_q_frustum.cpp b/src/xrCDB/ISpatial_q_frustum.cpp index 28b15eb4c09..b96842c952d 100644 --- a/src/xrCDB/ISpatial_q_frustum.cpp +++ b/src/xrCDB/ISpatial_q_frustum.cpp @@ -2,6 +2,7 @@ #include "ISpatial.h" #include "Frustum.h" #include "xrCore/_fbox.h" +#include "xrCore/Threading/Lock.hpp" extern Fvector c_spatial_offset[8]; @@ -59,12 +60,12 @@ class walker void ISpatial_DB::q_frustum(xr_vector& R, u32 _o, u32 _mask, const CFrustum& _frustum) { - cs.Enter(); + pcs->Enter(); Stats.Query.Begin(); q_result = &R; q_result->clear(); walker W(this, _mask, &_frustum); W.walk(m_root, m_center, m_bounds, _frustum.getMask()); Stats.Query.End(); - cs.Leave(); + pcs->Leave(); } diff --git a/src/xrCDB/ISpatial_q_ray.cpp b/src/xrCDB/ISpatial_q_ray.cpp index 412490536a0..f3c153c3b89 100644 --- a/src/xrCDB/ISpatial_q_ray.cpp +++ b/src/xrCDB/ISpatial_q_ray.cpp @@ -1,6 +1,7 @@ #include "stdafx.h" #include "ISpatial.h" #include "xrCore/_fbox.h" +#include "xrCore/Threading/Lock.hpp" #pragma warning(push) #pragma warning(disable : 4995) #include @@ -335,7 +336,7 @@ class _MM_ALIGN16 walker void ISpatial_DB::q_ray( xr_vector& R, u32 _o, u32 _mask_and, const Fvector& _start, const Fvector& _dir, float _range) { - cs.Enter(); + pcs->Enter(); Stats.Query.Begin(); q_result = &R; q_result->clear(); @@ -398,5 +399,5 @@ void ISpatial_DB::q_ray( } } Stats.Query.End(); - cs.Leave(); + pcs->Leave(); } diff --git a/src/xrCDB/xrCDB.cpp b/src/xrCDB/xrCDB.cpp index 2ebfda3f495..bc77b9b56b6 100644 --- a/src/xrCDB/xrCDB.cpp +++ b/src/xrCDB/xrCDB.cpp @@ -4,6 +4,7 @@ #include "stdafx.h" #include "xrCDB.h" +#include "xrCore/Threading/Lock.hpp" namespace Opcode { @@ -26,9 +27,11 @@ BOOL APIENTRY DllMain(HANDLE hModule, u32 ul_reason_for_call, LPVOID lpReserved) } // Model building -MODEL::MODEL() +MODEL::MODEL() : #ifdef CONFIG_PROFILE_LOCKS - : cs(MUTEX_PROFILE_ID(MODEL)) + pcs(new Lock(MUTEX_PROFILE_ID(MODEL))) +#else + pcs(new Lock) #endif // CONFIG_PROFILE_LOCKS { tree = 0; @@ -47,6 +50,15 @@ MODEL::~MODEL() tris_count = 0; xr_free(verts); verts_count = 0; + delete pcs; +} + +void MODEL::syncronize_impl() const +{ + Log("! WARNING: syncronized CDB::query"); + Lock* C = pcs; + C->Enter(); + C->Leave(); } struct BTHREAD_params @@ -65,10 +77,10 @@ void MODEL::build_thread(void* params) _initialize_cpu_thread(); FPU::m64r(); BTHREAD_params P = *((BTHREAD_params*)params); - P.M->cs.Enter(); + P.M->pcs->Enter(); P.M->build_internal(P.V, P.Vcnt, P.T, P.Tcnt, P.BC, P.BCP); P.M->status = S_READY; - P.M->cs.Leave(); + P.M->pcs->Leave(); // Msg ("* xrCDB: cform build completed, memory usage: %d K",P.M->memory()/1024); } diff --git a/src/xrCDB/xrCDB.h b/src/xrCDB/xrCDB.h index e84c7749d99..d6e06f31af4 100644 --- a/src/xrCDB/xrCDB.h +++ b/src/xrCDB/xrCDB.h @@ -12,6 +12,7 @@ class AABBNoLeafNode; }; template class _box3; using Fbox = _box3; +class Lock; #pragma pack(push, 8) @@ -42,7 +43,7 @@ class XRCDB_API TRI //*** 16 bytes total (was 32 :) typedef void __stdcall build_callback(Fvector* V, int Vcnt, TRI* T, int Tcnt, void* params); // Model definition -class XRCDB_API MODEL +class XRCDB_API MODEL : Noncopyable { friend class COLLIDER; enum @@ -54,9 +55,9 @@ class XRCDB_API MODEL }; private: - Lock cs; + Lock* pcs; Opcode::OPCODE_Model* tree; - u32 status; // 0=ready, 1=init, 2=building + volatile u32 status; // 0=ready, 1=init, 2=building // tris TRI* tris; @@ -77,18 +78,16 @@ class XRCDB_API MODEL IC void syncronize() const { if (S_READY != status) - { - Log("! WARNING: syncronized CDB::query"); - Lock* C = (Lock*)&cs; - C->Enter(); - C->Leave(); - } + syncronize_impl(); } static void build_thread(void*); void build_internal(Fvector* V, int Vcnt, TRI* T, int Tcnt, build_callback* bc = NULL, void* bcp = NULL); void build(Fvector* V, int Vcnt, TRI* T, int Tcnt, build_callback* bc = NULL, void* bcp = NULL); u32 memory(); + +private: + void syncronize_impl() const throw(); }; // Collider result diff --git a/src/xrCDB/xr_area.cpp b/src/xrCDB/xr_area.cpp index ee37ffa5715..38e358b1ce3 100644 --- a/src/xrCDB/xr_area.cpp +++ b/src/xrCDB/xr_area.cpp @@ -14,12 +14,12 @@ using namespace collide; CObjectSpace::CObjectSpace() : xrc("object space") #ifdef CONFIG_PROFILE_LOCKS - , - Lock(MUTEX_PROFILE_ID(CObjectSpace::Lock)) + , lock(new Lock(MUTEX_PROFILE_ID(CObjectSpace::Lock))) +#else + , lock(new Lock) #endif // CONFIG_PROFILE_LOCKS #ifdef DEBUG - , - m_pRender(0) + , m_pRender(0) #endif { #ifdef DEBUG @@ -41,6 +41,7 @@ CObjectSpace::~CObjectSpace() // sh_debug.destroy (); xr_delete(m_pRender); #endif + delete lock; } //---------------------------------------------------------------------- diff --git a/src/xrCDB/xr_area.h b/src/xrCDB/xr_area.h index 542684abe42..be5706db838 100644 --- a/src/xrCDB/xr_area.h +++ b/src/xrCDB/xr_area.h @@ -1,26 +1,27 @@ #pragma once #include "xr_collide_defs.h" - -// refs -class ISpatial; -class ICollisionForm; -class IGameObject; - +#include "Common/Noncopyable.hpp" #include "Include/xrRender/FactoryPtr.h" #include "Include/xrRender/ObjectSpaceRender.h" #include "xrXRC.h" #include "xrCDB.h" #include "xrCore/_fbox.h" +// fwd. decl. +class ISpatial; +class ICollisionForm; +class IGameObject; +//class Lock; + //----------------------------------------------------------------------------------------------------------- // Space Area //----------------------------------------------------------------------------------------------------------- struct hdrCFORM; -class XRCDB_API CObjectSpace +class XRCDB_API CObjectSpace : Noncopyable { private: // Debug - Lock lock; + Lock* lock; CDB::MODEL Static; Fbox m_BoundingVolume; xrXRC xrc; // MT: dangerous diff --git a/src/xrCDB/xr_area_raypick.cpp b/src/xrCDB/xr_area_raypick.cpp index 36a260bc078..af8c2e6847e 100644 --- a/src/xrCDB/xr_area_raypick.cpp +++ b/src/xrCDB/xr_area_raypick.cpp @@ -19,10 +19,10 @@ using namespace collide; BOOL CObjectSpace::RayTest(const Fvector& start, const Fvector& dir, float range, collide::rq_target tgt, collide::ray_cache* cache, IGameObject* ignore_object) { - lock.Enter(); + lock->Enter(); BOOL _ret = _RayTest(start, dir, range, tgt, cache, ignore_object); r_spatial.clear(); - lock.Leave(); + lock->Leave(); return _ret; } BOOL CObjectSpace::_RayTest(const Fvector& start, const Fvector& dir, float range, collide::rq_target tgt, @@ -112,10 +112,10 @@ BOOL CObjectSpace::_RayTest(const Fvector& start, const Fvector& dir, float rang BOOL CObjectSpace::RayPick( const Fvector& start, const Fvector& dir, float range, rq_target tgt, rq_result& R, IGameObject* ignore_object) { - lock.Enter(); + lock->Enter(); BOOL _res = _RayPick(start, dir, range, tgt, R, ignore_object); r_spatial.clear(); - lock.Leave(); + lock->Leave(); return _res; } BOOL CObjectSpace::_RayPick( @@ -182,10 +182,10 @@ BOOL CObjectSpace::_RayPick( BOOL CObjectSpace::RayQuery(collide::rq_results& dest, const collide::ray_defs& R, collide::rq_callback* CB, LPVOID user_data, collide::test_callback* tb, IGameObject* ignore_object) { - lock.Enter(); + lock->Enter(); BOOL _res = _RayQuery2(dest, R, CB, user_data, tb, ignore_object); r_spatial.clear(); - lock.Leave(); + lock->Leave(); return (_res); } BOOL CObjectSpace::_RayQuery2(collide::rq_results& r_dest, const collide::ray_defs& R, collide::rq_callback* CB, diff --git a/src/xrCommon/predicates.h b/src/xrCommon/predicates.h index 9e6f053dd32..6796e94e364 100644 --- a/src/xrCommon/predicates.h +++ b/src/xrCommon/predicates.h @@ -12,5 +12,5 @@ struct pred_str struct pred_stri { bool operator()(const char* x, const char* y) const - { return _stricmp(x, y) < 0; } + { return xr_stricmp(x, y) < 0; } }; diff --git a/src/xrCore/Animation/Motion.cpp b/src/xrCore/Animation/Motion.cpp index 3e6ce9b1858..06979c83b17 100644 --- a/src/xrCore/Animation/Motion.cpp +++ b/src/xrCore/Animation/Motion.cpp @@ -402,7 +402,7 @@ bool CSMotion::Load(IReader& F) string64 temp_buf; for (auto bm_it = bone_mots.begin(); bm_it != bone_mots.end(); bm_it++) { - bm_it->SetName(_itoa(int(bm_it - bone_mots.begin()), temp_buf, 10)); + bm_it->SetName(xr_itoa(int(bm_it - bone_mots.begin()), temp_buf, 10)); bm_it->m_Flags.assign((u8)F.r_u32()); for (int ch = 0; ch < ctMaxChannel; ch++) { diff --git a/src/xrCore/LocatorAPI.cpp b/src/xrCore/LocatorAPI.cpp index 1be9f6adcc3..61c78d4a19b 100644 --- a/src/xrCore/LocatorAPI.cpp +++ b/src/xrCore/LocatorAPI.cpp @@ -295,7 +295,7 @@ void CLocatorAPI::LoadArchive(archive& A, pcstr entrypoint) if (A.header) { shared_str read_path = A.header->r_string("header", "entry_point"); - if (0 == _stricmp(read_path.c_str(), "gamedata")) + if (0 == xr_stricmp(read_path.c_str(), "gamedata")) { read_path = "$fs_root$"; auto P = pathes.find(read_path.c_str()); @@ -1428,7 +1428,7 @@ bool CLocatorAPI::dir_delete(pcstr initial, pcstr nm, bool remove_files) // const char* entry_begin = entry.name+base_len; if (!remove_files) return false; - _unlink(entry.name); + xr_unlink(entry.name); m_files.erase(cur_item); } else @@ -1463,7 +1463,7 @@ void CLocatorAPI::file_delete(pcstr path, pcstr nm) if (I != m_files.end()) { // remove file - _unlink(I->name); + xr _unlink(I->name); auto str = pstr(I->name); xr_free(str); m_files.erase(I); @@ -1498,7 +1498,7 @@ void CLocatorAPI::file_rename(pcstr src, pcstr dest, bool overwrite) { if (!overwrite) return; - _unlink(D->name); + xr_unlink(D->name); auto str = pstr(D->name); xr_free(str); m_files.erase(D); @@ -1672,7 +1672,7 @@ bool CLocatorAPI::can_write_to_folder(pcstr path) if (hf == nullptr) return false; fclose(hf); - _unlink(temp); + xr_unlink(temp); return true; } return false; diff --git a/src/xrCore/SubAlloc.hpp b/src/xrCore/SubAlloc.hpp index eac043d0a59..9c3de4c5ad8 100644 --- a/src/xrCore/SubAlloc.hpp +++ b/src/xrCore/SubAlloc.hpp @@ -29,12 +29,12 @@ struct BLK_NODE next = p; } - void _unlink() { next = next->next; } + void unlink() { next = next->next; } void* remove() { BLK_NODE* p = next; - _unlink(); + unlink(); Stamp--; return p; } @@ -325,7 +325,7 @@ static void ExpandTextArea() for (p = BList + i; Count[i] != 0; p = p->next) while (!p->next->Stamp) { - p->_unlink(); + p->unlink(); BList[i].Stamp--; if (!--Count[i]) break; diff --git a/src/xrCore/_std_extensions.h b/src/xrCore/_std_extensions.h index 31ff266f61a..5c9950bf0bc 100644 --- a/src/xrCore/_std_extensions.h +++ b/src/xrCore/_std_extensions.h @@ -47,7 +47,7 @@ IC char* xr_strcpy(char* strDestination, size_t sizeInBytes, const char* strSour } IC char* xr_strcpy(char* strDestination, const char* strSource) { return strcpy(strDestination, strSource); } -IC char* _strlwr_s(char* strDestination, size_t sizeInBytes) { return _strlwr(strDestination); } +IC char* _strlwr_s(char* strDestination, size_t sizeInBytes) { return xr_strlwr(strDestination); } IC char* xr_strcat(char* strDestination, size_t sizeInBytes, const char* strSource) { return strncat(strDestination, strSource, sizeInBytes); @@ -86,7 +86,7 @@ IC LPCSTR get_token_name(const xr_token* tokens, int key) IC int get_token_id(const xr_token* tokens, LPCSTR key) { for (int k = 0; tokens[k].name; k++) - if (_stricmp(tokens[k].name, key) == 0) + if (xr_stricmp(tokens[k].name, key) == 0) return tokens[k].id; return -1; } @@ -177,8 +177,8 @@ IC s64 _max(s64 x, s64 y) { return x - ((x - y) & ((x - y) >> (sizeof(s64) * 8 - // return pointer to ".ext" IC char* strext(const char* S) { return (char*)strrchr(S, '.'); } IC size_t xr_strlen(const char* S) { return strlen(S); } -IC char* xr_strupr(char* S) { return _strupr(S); } -IC char* xr_strlwr(char* S) { return _strlwr(S); } +IC char* xr_strupr(char* S) { return xr_strupr(S); } +IC char* xr_strlwr(char* S) { return xr_strlwr(S); } #ifdef BREAK_AT_STRCMP XRCORE_API int xr_strcmp(const char* S1, const char* S2); #else diff --git a/src/xrCore/clsid.h b/src/xrCore/clsid.h index 677f9970a90..c9bafab76fa 100644 --- a/src/xrCore/clsid.h +++ b/src/xrCore/clsid.h @@ -1,8 +1,7 @@ +#pragma once #ifndef _CLSID_H #define _CLSID_H -#pragma once - //***** CLASS ID type typedef u64 CLASS_ID; #define MK_CLSID(a, b, c, d, e, f, g, h) \ diff --git a/src/xrCore/xrCore.cpp b/src/xrCore/xrCore.cpp index d8e834c7f96..1588973cb30 100644 --- a/src/xrCore/xrCore.cpp +++ b/src/xrCore/xrCore.cpp @@ -190,7 +190,7 @@ void xrCore::CalculateBuildId() sscanf(buffer, "%s %d %d", month, &days, &years); for (int i = 0; i < 12; i++) { - if (_stricmp(monthId[i], month)) + if (xr_stricmp(monthId[i], month)) continue; months = i; break; diff --git a/src/xrCore/xrCore.h b/src/xrCore/xrCore.h index 8b6ee6f4a7a..53f6e6d960a 100644 --- a/src/xrCore/xrCore.h +++ b/src/xrCore/xrCore.h @@ -4,25 +4,7 @@ #define MASTER_GOLD #endif // DEBUG -//#define BENCHMARK_BUILD - -#ifdef BENCHMARK_BUILD -#define BENCH_SEC_CALLCONV __stdcall -#define BENCH_SEC_SCRAMBLEVTBL1 virtual int GetFlags() { return 1; } -#define BENCH_SEC_SCRAMBLEVTBL2 virtual void* GetData() { return 0; } -#define BENCH_SEC_SCRAMBLEVTBL3 virtual void* GetCache() { return 0; } -#define BENCH_SEC_SIGN , void* pBenchScrampleVoid = 0 -#define BENCH_SEC_SCRAMBLEMEMBER1 float m_fSrambleMember1; -#define BENCH_SEC_SCRAMBLEMEMBER2 float m_fSrambleMember2; -#else // BENCHMARK_BUILD -#define BENCH_SEC_CALLCONV -#define BENCH_SEC_SCRAMBLEVTBL1 -#define BENCH_SEC_SCRAMBLEVTBL2 -#define BENCH_SEC_SCRAMBLEVTBL3 -#define BENCH_SEC_SIGN -#define BENCH_SEC_SCRAMBLEMEMBER1 -#define BENCH_SEC_SCRAMBLEMEMBER2 -#endif // BENCHMARK_BUILD +#include "xrCore_benchmark_macros.h" #if !defined(_CPPUNWIND) #error Please enable exceptions... diff --git a/src/xrCore/xrCore.vcxproj b/src/xrCore/xrCore.vcxproj index 595368aacaa..301526c2cf8 100644 --- a/src/xrCore/xrCore.vcxproj +++ b/src/xrCore/xrCore.vcxproj @@ -350,6 +350,7 @@ + diff --git a/src/xrCore/xrCore.vcxproj.filters b/src/xrCore/xrCore.vcxproj.filters index c0380dc39e9..43a6c66fa4a 100644 --- a/src/xrCore/xrCore.vcxproj.filters +++ b/src/xrCore/xrCore.vcxproj.filters @@ -728,6 +728,9 @@ Threading + + Kernel + diff --git a/src/xrCore/xrCore_benchmark_macros.h b/src/xrCore/xrCore_benchmark_macros.h new file mode 100644 index 00000000000..db387d2b47d --- /dev/null +++ b/src/xrCore/xrCore_benchmark_macros.h @@ -0,0 +1,21 @@ +#pragma once + +//#define BENCHMARK_BUILD + +#ifdef BENCHMARK_BUILD +#define BENCH_SEC_CALLCONV __stdcall +#define BENCH_SEC_SCRAMBLEVTBL1 virtual int GetFlags() { return 1; } +#define BENCH_SEC_SCRAMBLEVTBL2 virtual void* GetData() { return 0; } +#define BENCH_SEC_SCRAMBLEVTBL3 virtual void* GetCache() { return 0; } +#define BENCH_SEC_SIGN , void* pBenchScrampleVoid = 0 +#define BENCH_SEC_SCRAMBLEMEMBER1 float m_fSrambleMember1; +#define BENCH_SEC_SCRAMBLEMEMBER2 float m_fSrambleMember2; +#else // BENCHMARK_BUILD +#define BENCH_SEC_CALLCONV +#define BENCH_SEC_SCRAMBLEVTBL1 +#define BENCH_SEC_SCRAMBLEVTBL2 +#define BENCH_SEC_SCRAMBLEVTBL3 +#define BENCH_SEC_SIGN +#define BENCH_SEC_SCRAMBLEMEMBER1 +#define BENCH_SEC_SCRAMBLEMEMBER2 +#endif // BENCHMARK_BUILD diff --git a/src/xrCore/xr_ini.cpp b/src/xrCore/xr_ini.cpp index e938aec903a..be252db2d6f 100644 --- a/src/xrCore/xr_ini.cpp +++ b/src/xrCore/xr_ini.cpp @@ -648,7 +648,7 @@ int CInifile::r_token(pcstr S, pcstr L, const xr_token* token_list) const { pcstr C = r_string(S, L); for (int i = 0; token_list[i].name; i++) - if (!_stricmp(C, token_list[i].name)) + if (!xr_stricmp(C, token_list[i].name)) return token_list[i].id; return 0; } diff --git a/src/xrCore/xr_trims.cpp b/src/xrCore/xr_trims.cpp index e8a51a03dc5..392742a28e0 100644 --- a/src/xrCore/xr_trims.cpp +++ b/src/xrCore/xr_trims.cpp @@ -109,7 +109,7 @@ LPSTR _GetItems(LPCSTR src, int idx_start, int idx_end, LPSTR dst, char separato u32 _ParseItem(LPCSTR src, xr_token* token_list) { for (int i = 0; token_list[i].name; i++) - if (!_stricmp(src, token_list[i].name)) + if (!xr_stricmp(src, token_list[i].name)) return token_list[i].id; return u32(-1); } diff --git a/src/xrCore/xrstring.cpp b/src/xrCore/xrstring.cpp index 4bd36d11ac5..2856c50b94d 100644 --- a/src/xrCore/xrstring.cpp +++ b/src/xrCore/xrstring.cpp @@ -80,7 +80,7 @@ struct str_container_impl u32 crc = crc32(value->value, value->dwLength); string32 crc_str; R_ASSERT3(crc == value->dwCRC, "CorePanic: read-only memory corruption (shared_strings)", - _itoa(value->dwCRC, crc_str, 16)); + xr_itoa(value->dwCRC, crc_str, 16)); R_ASSERT3(value->dwLength == xr_strlen(value->value), "CorePanic: read-only memory corruption (shared_strings, internal structures)", value->value); value = value->next; @@ -402,7 +402,7 @@ void str_container::verify() u32 crc = crc32(sv->value, sv->dwLength); string32 crc_str; R_ASSERT3(crc == sv->dwCRC, - "CorePanic: read-only memory corruption (shared_strings)", _itoa(sv->dwCRC, crc_str, 16)); + "CorePanic: read-only memory corruption (shared_strings)", xr_itoa(sv->dwCRC, crc_str, 16)); R_ASSERT3(sv->dwLength == xr_strlen(sv->value), "CorePanic: read-only memory corruption (shared_strings, internal structures)", sv->value); } diff --git a/src/xrEngine/EngineAPI.h b/src/xrEngine/EngineAPI.h index f1098bdb703..16b76bcb091 100644 --- a/src/xrEngine/EngineAPI.h +++ b/src/xrEngine/EngineAPI.h @@ -8,7 +8,7 @@ #include "xrEngine/Engine.h" #include "xrCore/ModuleLookup.hpp" - +#include "xrCore/clsid.h" class IFactoryObject { diff --git a/src/xrEngine/EventAPI.cpp b/src/xrEngine/EventAPI.cpp index 3175ac40fd9..49f25273d82 100644 --- a/src/xrEngine/EventAPI.cpp +++ b/src/xrEngine/EventAPI.cpp @@ -21,7 +21,7 @@ class ENGINE_API CEvent LPCSTR GetFull() { return Name; } u32 RefCount() { return dwRefCount; } - BOOL Equal(CEvent& E) { return _stricmp(Name, E.Name) == 0; } + BOOL Equal(CEvent& E) { return xr_stricmp(Name, E.Name) == 0; } void Attach(IEventReceiver* H) { if (std::find(Handlers.begin(), Handlers.end(), H) == Handlers.end()) @@ -43,7 +43,7 @@ class ENGINE_API CEvent CEvent::CEvent(const char* S) { Name = xr_strdup(S); - _strupr(Name); + xr_strupr(Name); dwRefCount = 1; } CEvent::~CEvent() { xr_free(Name); } @@ -144,11 +144,11 @@ void CEventAPI::Defer(LPCSTR N, u64 P1, u64 P2) #ifdef DEBUG void msParse(LPCSTR c) { - if (0 == _stricmp(c, "exit")) + if (0 == xr_stricmp(c, "exit")) { Console->Execute("quit"); } - if (0 == _stricmp(c, "quit")) + if (0 == xr_stricmp(c, "quit")) { TerminateProcess(GetCurrentProcess(), 0); Console->Execute("quit"); @@ -188,7 +188,7 @@ BOOL CEventAPI::Peek(LPCSTR EName) for (u32 I = 0; I < Events_Deferred.size(); I++) { Deferred& DEF = Events_Deferred[I]; - if (_stricmp(DEF.E->GetFull(), EName) == 0) + if (xr_stricmp(DEF.E->GetFull(), EName) == 0) { CS.Leave(); return TRUE; diff --git a/src/xrEngine/FDemoRecord.cpp b/src/xrEngine/FDemoRecord.cpp index a9c58bb734b..164a0090863 100644 --- a/src/xrEngine/FDemoRecord.cpp +++ b/src/xrEngine/FDemoRecord.cpp @@ -69,7 +69,7 @@ CDemoRecord::CDemoRecord(const char* name, float life_time) : CEffectorCam(cefDe psHUD_Flags.set(HUD_CROSSHAIR, FALSE); */ m_b_redirect_input_to_level = false; - _unlink(name); + xr_unlink(name); file = FS.w_open(name); if (file) { @@ -267,10 +267,10 @@ void CDemoRecord::MakeCubeMapFace(Fvector& D, Fvector& N) case 5: N.set(cmNorm[m_Stage]); D.set(cmDir[m_Stage]); - GEnv.Render->Screenshot(IRender::SM_FOR_CUBEMAP, _itoa(m_Stage, buf, 10)); + GEnv.Render->Screenshot(IRender::SM_FOR_CUBEMAP, xr_itoa(m_Stage, buf, 10)); break; case 6: - GEnv.Render->Screenshot(IRender::SM_FOR_CUBEMAP, _itoa(m_Stage, buf, 10)); + GEnv.Render->Screenshot(IRender::SM_FOR_CUBEMAP, xr_itoa(m_Stage, buf, 10)); N.set(m_Camera.j); D.set(m_Camera.k); psHUD_Flags.assign(s_hud_flag); diff --git a/src/xrEngine/GameMtlLib.h b/src/xrEngine/GameMtlLib.h index 0e21e710958..e8a07528322 100644 --- a/src/xrEngine/GameMtlLib.h +++ b/src/xrEngine/GameMtlLib.h @@ -252,7 +252,7 @@ class MTL_EXPORT_API CGameMtlLibrary GameMtlIt GetMaterialIt(LPCSTR name) { - auto pred = [&](const SGameMtl* mtl) { return !_strcmpi(mtl->m_Name.c_str(), name); }; + auto pred = [&](const SGameMtl* mtl) { return !xr_strcmpi(mtl->m_Name.c_str(), name); }; return std::find_if(materials.begin(), materials.end(), pred); } GameMtlIt GetMaterialIt(shared_str& name) diff --git a/src/xrEngine/IGame_ObjectPool.cpp b/src/xrEngine/IGame_ObjectPool.cpp index aeca1ad5e92..c473f2c3a77 100644 --- a/src/xrEngine/IGame_ObjectPool.cpp +++ b/src/xrEngine/IGame_ObjectPool.cpp @@ -103,7 +103,7 @@ map_POOL.clear(); IGameObject* IGame_ObjectPool::create ( LPCSTR name ) { string256 l_name; -POOL_IT it = map_POOL.find (shared_str(_strlwr(xr_strcpy(l_name,name)))); +POOL_IT it = map_POOL.find (shared_str(xr_strlwr(xr_strcpy(l_name,name)))); if (it!=map_POOL.end()) { // Instance found diff --git a/src/xrEngine/Render.h b/src/xrEngine/Render.h index c4a2c4f459b..2eebead6adc 100644 --- a/src/xrEngine/Render.h +++ b/src/xrEngine/Render.h @@ -4,6 +4,8 @@ #include "xrCDB/Frustum.h" #include "vis_common.h" #include "Include/xrRender/FactoryPtr.h" +#include "xrCore/xr_resource.h" + class IUIShader; typedef FactoryPtr wm_shader; // refs @@ -16,7 +18,9 @@ class IKinematics; class IGameFont; class IPerformanceAlert; template class _box2; typedef _box2 Fbox2; - +struct Fcolor; +class IReader; +class CMemoryWriter; #ifndef _EDITOR extern const float fLightSmoothFactor; diff --git a/src/xrEngine/Stats.h b/src/xrEngine/Stats.h index 0a584b97166..da037a9d1d6 100644 --- a/src/xrEngine/Stats.h +++ b/src/xrEngine/Stats.h @@ -2,9 +2,10 @@ // ////////////////////////////////////////////////////////////////////// -#if !defined(AFX_STATS_H__4C8D1860_0EE2_11D4_B4E3_4854E82A090D__INCLUDED_) -#define AFX_STATS_H__4C8D1860_0EE2_11D4_B4E3_4854E82A090D__INCLUDED_ #pragma once +#include "xrCore/_flags.h" +#include "xrCore/xrstring.h" +#include "xrCommon/xr_vector.h" class ENGINE_API CGameFont; @@ -41,5 +42,3 @@ enum }; extern Flags32 g_stats_flags; - -#endif // !defined(AFX_STATS_H__4C8D1860_0EE2_11D4_B4E3_4854E82A090D__INCLUDED_) diff --git a/src/xrEngine/Text_Console.cpp b/src/xrEngine/Text_Console.cpp index c8d939006fe..9b747e8166f 100644 --- a/src/xrEngine/Text_Console.cpp +++ b/src/xrEngine/Text_Console.cpp @@ -251,7 +251,7 @@ void CTextConsole::DrawLog(HDC hDC, RECT* pRect) SetTextColor(hDC, RGB(205, 205, 225)); u32 log_line = LogFile->size() - 1; string16 q, q2; - _itoa(log_line, q, 10); + xr_itoa(log_line, q, 10); xr_strcpy(q2, sizeof(q2), "["); xr_strcat(q2, sizeof(q2), q); xr_strcat(q2, sizeof(q2), "]"); diff --git a/src/xrEngine/XR_IOConsole.cpp b/src/xrEngine/XR_IOConsole.cpp index 9d7aa89f520..09596434ab8 100644 --- a/src/xrEngine/XR_IOConsole.cpp +++ b/src/xrEngine/XR_IOConsole.cpp @@ -352,7 +352,7 @@ void CConsole::OnRender() } string16 q; - _itoa(log_line, q, 10); + xr_itoa(log_line, q, 10); u32 qn = xr_strlen(q); pFont->SetColor(total_font_color); pFont->OutI(0.95f - 0.03f * qn, fMaxY - 2.0f * LDIST, "[%d]", log_line); @@ -429,13 +429,13 @@ void CConsole::DrawBackgrounds(bool bGame) if (m_select_tip < (int)m_tips.size()) { - Frect r; + Frect r2; xr_string tmp; - vecTipsEx::iterator itb = m_tips.begin() + m_start_tip; - vecTipsEx::iterator ite = m_tips.end(); - for (u32 i = 0; itb != ite; ++itb, ++i) // tips + vecTipsEx::iterator itb2 = m_tips.begin() + m_start_tip; + vecTipsEx::iterator ite2 = m_tips.end(); + for (u32 i = 0; itb2 != ite2; ++itb2, ++i) // tips { - TipString const& ts = (*itb); + TipString const& ts = (*itb2); if ((ts.HL_start < 0) || (ts.HL_finish < 0) || (ts.HL_start > ts.HL_finish)) { continue; @@ -446,22 +446,26 @@ void CConsole::DrawBackgrounds(bool bGame) continue; } - r.set_zero(); + r2.set_zero(); tmp.assign(ts.text.c_str(), ts.HL_start); - r.x1 = pr.x1 + w1 + pFont->SizeOf_(tmp.c_str()); - r.y1 = pr.y1 + i * font_h; + r2.x1 = pr.x1 + w1 + pFont->SizeOf_(tmp.c_str()); + r2.y1 = pr.y1 + i * font_h; tmp.assign(ts.text.c_str(), ts.HL_finish); - r.x2 = pr.x1 + w1 + pFont->SizeOf_(tmp.c_str()); - r.y2 = r.y1 + font_h; + r2.x2 = pr.x1 + w1 + pFont->SizeOf_(tmp.c_str()); + r2.y2 = r2.y1 + font_h; - DrawRect(r, tips_word_color); + DrawRect(r2, tips_word_color); if (i >= VIEW_TIPS_COUNT - 1) { - break; // for itb + break; // for itb2 } +<<<<<<< HEAD } // for itb +======= + }// for itb2 +>>>>>>> bf03c55e9... More cleaning/decoupling. Some 'override' added. Fixed up stricmp -> _stricmp & co. } // if // --------------------------- scroll bar -------------------- @@ -553,7 +557,7 @@ void CConsole::ExecuteCommand(LPCSTR cmd_str, bool record_cmd) { if (cc->bLowerCaseArgs) { - _strlwr(last); + xr_strlwr(last); } if (last[0] == 0) { @@ -754,7 +758,7 @@ bool CConsole::add_internal_cmds(LPCSTR in_str, vecTipsEx& out_v) if (name_sz >= in_sz) { name2.assign(name, in_sz); - if (!_stricmp(name2.c_str(), in_str)) + if (!xr_stricmp(name2.c_str(), in_str)) { shared_str temp; temp._set(name); diff --git a/src/xrEngine/device.cpp b/src/xrEngine/device.cpp index 146483cacbc..6d845516297 100644 --- a/src/xrEngine/device.cpp +++ b/src/xrEngine/device.cpp @@ -440,7 +440,7 @@ void CRenderDevice::Pause(BOOL bOn, BOOL bTimer, BOOL bSound, LPCSTR reason) } BOOL CRenderDevice::Paused() { return g_pauseMngr()->Paused(); } -void CRenderDevice::OnWM_Activate(WPARAM wParam, LPARAM lParam) +void CRenderDevice::OnWM_Activate(WPARAM wParam, LPARAM /*lParam*/) { u16 fActive = LOWORD(wParam); BOOL fMinimized = (BOOL)HIWORD(wParam); diff --git a/src/xrEngine/edit_actions.cpp b/src/xrEngine/edit_actions.cpp index ec9164b0cec..29f6b92a247 100644 --- a/src/xrEngine/edit_actions.cpp +++ b/src/xrEngine/edit_actions.cpp @@ -71,7 +71,7 @@ void type_pair::on_key_press(line_edit_control* const control) // The following 3 lines looks useless LPSTR loc; - STRCONCAT ( loc, ".", _itoa( GetACP(), code_page, 10 ) ); + STRCONCAT ( loc, ".", xr_itoa( GetACP(), code_page, 10 ) ); setlocale ( LC_ALL, loc );*/ static _locale_t current_locale = _create_locale(LC_ALL, ""); diff --git a/src/xrEngine/x_ray.cpp b/src/xrEngine/x_ray.cpp index 20d1f09108f..159bfbbc924 100644 --- a/src/xrEngine/x_ray.cpp +++ b/src/xrEngine/x_ray.cpp @@ -394,7 +394,7 @@ void gen_logo_name(string_path& dest, LPCSTR level_name, int num) string16 buff; xr_strcat(dest, sizeof(dest), "_"); - xr_strcat(dest, sizeof(dest), _itoa(num + 1, buff, 10)); + xr_strcat(dest, sizeof(dest), xr_itoa(num + 1, buff, 10)); } void CApplication::Level_Set(u32 L) @@ -447,7 +447,7 @@ int CApplication::Level_ID(LPCSTR name, LPCSTR ver, bool bSet) { LPCSTR ln = A.header->r_string("header", "level_name"); LPCSTR lv = A.header->r_string("header", "level_ver"); - if (0 == _stricmp(ln, name) && 0 == _stricmp(lv, ver)) + if (0 == xr_stricmp(ln, name) && 0 == xr_stricmp(lv, ver)) { FS.LoadArchive(A); arch_res = true; @@ -462,7 +462,7 @@ int CApplication::Level_ID(LPCSTR name, LPCSTR ver, bool bSet) strconcat(sizeof(buffer), buffer, name, "\\"); for (u32 I = 0; I < Levels.size(); ++I) { - if (0 == _stricmp(buffer, Levels[I].folder)) + if (0 == xr_stricmp(buffer, Levels[I].folder)) { result = int(I); break; @@ -488,7 +488,7 @@ CInifile* CApplication::GetArchiveHeader(LPCSTR name, LPCSTR ver) LPCSTR ln = A.header->r_string("header", "level_name"); LPCSTR lv = A.header->r_string("header", "level_ver"); - if (0 == _stricmp(ln, name) && 0 == _stricmp(lv, ver)) + if (0 == xr_stricmp(ln, name) && 0 == xr_stricmp(lv, ver)) { return A.header; } diff --git a/src/xrEngine/xrLoadSurface.cpp b/src/xrEngine/xrLoadSurface.cpp index 2bd5bd8b4eb..3fbc8cbbd99 100644 --- a/src/xrEngine/xrLoadSurface.cpp +++ b/src/xrEngine/xrLoadSurface.cpp @@ -11,7 +11,7 @@ struct SExts if (ext && ext[0]) { for (u32 i = 0; i < exts.size(); i++) - if (0 == _stricmp(exts[i], ext)) + if (0 == xr_stricmp(exts[i], ext)) return; exts.push_back(xr_strdup(ext)); } diff --git a/src/xrEngine/xrSheduler.h b/src/xrEngine/xrSheduler.h index 5d76e6e6b9a..a744830bf96 100644 --- a/src/xrEngine/xrSheduler.h +++ b/src/xrEngine/xrSheduler.h @@ -3,6 +3,8 @@ #define XRSHEDULER_H_INCLUDED //#include "ISheduled.h" +#include "xrCore/xrstring.h" + class ISheduled; class ENGINE_API CSheduler diff --git a/src/xrEngine/xr_collide_form.cpp b/src/xrEngine/xr_collide_form.cpp index 8f7bb747c91..5b56da1d614 100644 --- a/src/xrEngine/xr_collide_form.cpp +++ b/src/xrEngine/xr_collide_form.cpp @@ -223,8 +223,8 @@ BOOL CCF_Skeleton::_RayQuery(const collide::ray_defs& Q, collide::rq_results& R) float tgt_dist = Q.range; float aft[2]; int quant; - Fsphere::ERP_Result res = w_bv_sphere.intersect(Q.start, Q.dir, tgt_dist, quant, aft); - if ((Fsphere::rpNone == res) || ((Fsphere::rpOriginOutside == res) && (aft[0] > tgt_dist))) + Fsphere::ERP_Result res1 = w_bv_sphere.intersect(Q.start, Q.dir, tgt_dist, quant, aft); + if ((Fsphere::rpNone == res1) || ((Fsphere::rpOriginOutside == res1) && (aft[0] > tgt_dist))) return FALSE; if (dwFrame != Device.dwFrame) diff --git a/src/xrEngine/xr_ioc_cmd.cpp b/src/xrEngine/xr_ioc_cmd.cpp index 5669361ff2c..48e77aa9e52 100644 --- a/src/xrEngine/xr_ioc_cmd.cpp +++ b/src/xrEngine/xr_ioc_cmd.cpp @@ -305,7 +305,7 @@ class CCC_Start : public IConsole_Command { string4096 out; xr_strcpy(out, sizeof(out), str); - _strlwr(str); + xr_strlwr(str); LPCSTR name_str = "name="; LPCSTR name1 = strstr(str, name_str); @@ -348,7 +348,7 @@ class CCC_Start : public IConsole_Command parse(op_client, args, "client"); // 2. client parse(op_demo, args, "demo"); // 3. demo - _strlwr(op_server); + xr_strlwr(op_server); protect_Name_strlwr(op_client); if (!op_client[0] && strstr(op_server, "single")) diff --git a/src/xrEngine/xr_ioc_cmd.h b/src/xrEngine/xr_ioc_cmd.h index 914ecac8652..b70b2057456 100644 --- a/src/xrEngine/xr_ioc_cmd.h +++ b/src/xrEngine/xr_ioc_cmd.h @@ -168,7 +168,7 @@ class ENGINE_API CCC_Token : public IConsole_Command xr_token* tok = tokens; while (tok->name) { - if (_stricmp(tok->name, args) == 0) + if (xr_stricmp(tok->name, args) == 0) { *value = tok->id; break; @@ -347,7 +347,7 @@ class ENGINE_API CCC_Integer : public IConsole_Command else *value = v; } - virtual void Status(TStatus& S) { _itoa(*value, S, 10); } + virtual void Status(TStatus& S) { xr_itoa(*value, S, 10); } virtual void Info(TInfo& I) { xr_sprintf(I, sizeof(I), "integer value in range [%d,%d]", min, max); } virtual void fill_tips(vecTips& tips, u32 mode) { diff --git a/src/xrGame/Actor.cpp b/src/xrGame/Actor.cpp index 782d754caf8..5f53dad1d49 100644 --- a/src/xrGame/Actor.cpp +++ b/src/xrGame/Actor.cpp @@ -1,4 +1,4 @@ -#include "pch_script.h" + #include "pch_script.h" #include "Actor_Flags.h" #include "hudmanager.h" #ifdef DEBUG @@ -265,9 +265,9 @@ void set_box(LPCSTR section, CPHMovementControl& mc, u32 box_num) Fvector vBOX_center, vBOX_size; // m_PhysicMovementControl: BOX string64 buff, buff1; - strconcat(sizeof(buff), buff, "ph_box", _itoa(box_num, buff1, 10), "_center"); + strconcat(sizeof(buff), buff, "ph_box", xr_itoa(box_num, buff1, 10), "_center"); vBOX_center = pSettings->r_fvector3(section, buff); - strconcat(sizeof(buff), buff, "ph_box", _itoa(box_num, buff1, 10), "_size"); + strconcat(sizeof(buff), buff, "ph_box", xr_itoa(box_num, buff1, 10), "_size"); vBOX_size = pSettings->r_fvector3(section, buff); vBOX_size.y += cammera_into_collision_shift / 2.f; bb.set(vBOX_center, vBOX_center); diff --git a/src/xrGame/ActorAnimation.cpp b/src/xrGame/ActorAnimation.cpp index f5daea24dc2..36316aecd66 100644 --- a/src/xrGame/ActorAnimation.cpp +++ b/src/xrGame/ActorAnimation.cpp @@ -174,7 +174,7 @@ void SActorState::CreateClimb(IKinematicsAnimated* K) landing[1] = K->ID_Cycle(strconcat(sizeof(buf), buf, base, "_jump_end_1")); for (int k = 0; k < 12; ++k) - m_damage[k] = K->ID_FX(strconcat(sizeof(buf), buf, base, "_damage_", _itoa(k, buf1, 10))); + m_damage[k] = K->ID_FX(strconcat(sizeof(buf), buf, base, "_damage_", xr_itoa(k, buf1, 10))); } void SActorState::Create(IKinematicsAnimated* K, LPCSTR base) @@ -209,7 +209,7 @@ void SActorState::Create(IKinematicsAnimated* K, LPCSTR base) landing[1] = K->ID_Cycle(strconcat(sizeof(buf), buf, base, "_jump_end_1")); for (int k = 0; k < 12; ++k) - m_damage[k] = K->ID_FX(strconcat(sizeof(buf), buf, base, "_damage_", _itoa(k, buf1, 10))); + m_damage[k] = K->ID_FX(strconcat(sizeof(buf), buf, base, "_damage_", xr_itoa(k, buf1, 10))); } void SActorSprintState::Create(IKinematicsAnimated* K) @@ -254,13 +254,13 @@ SVehicleAnimCollection::SVehicleAnimCollection() void SVehicleAnimCollection::Create(IKinematicsAnimated* V, u16 num) { string128 buf, buff1, buff2; - strconcat(sizeof(buff1), buff1, _itoa(num, buf, 10), "_"); + strconcat(sizeof(buff1), buff1, xr_itoa(num, buf, 10), "_"); steer_left = V->ID_Cycle(strconcat(sizeof(buf), buf, "steering_idle_", buff1, "ls")); steer_right = V->ID_Cycle(strconcat(sizeof(buf), buf, "steering_idle_", buff1, "rs")); for (int i = 0; MAX_IDLES > i; ++i) { - idles[i] = V->ID_Cycle_Safe(strconcat(sizeof(buf), buf, "steering_idle_", buff1, _itoa(i, buff2, 10))); + idles[i] = V->ID_Cycle_Safe(strconcat(sizeof(buf), buf, "steering_idle_", buff1, xr_itoa(i, buff2, 10))); if (idles[i]) idles_num++; else diff --git a/src/xrGame/CharacterPhysicsSupport.cpp b/src/xrGame/CharacterPhysicsSupport.cpp index 19a5af8d83c..10ce79bd4ed 100644 --- a/src/xrGame/CharacterPhysicsSupport.cpp +++ b/src/xrGame/CharacterPhysicsSupport.cpp @@ -248,7 +248,7 @@ void CCharacterPhysicsSupport::SpawnInitPhysics(CSE_Abstract* e) { #ifdef DEBUG if (ph_dbg_draw_mask1.test(ph_m1_DbgTrackObject) && - _stricmp(PH_DBG_ObjectTrackName(), *m_EntityAlife.cName()) == 0) + xr_stricmp(PH_DBG_ObjectTrackName(), *m_EntityAlife.cName()) == 0) { Msg("CCharacterPhysicsSupport::SpawnInitPhysics obj %s before collision correction %f,%f,%f", PH_DBG_ObjectTrackName(), m_EntityAlife.Position().x, m_EntityAlife.Position().y, @@ -267,7 +267,7 @@ void CCharacterPhysicsSupport::SpawnInitPhysics(CSE_Abstract* e) #ifdef DEBUG if (ph_dbg_draw_mask1.test(ph_m1_DbgTrackObject) && - _stricmp(PH_DBG_ObjectTrackName(), *m_EntityAlife.cName()) == 0) + xr_stricmp(PH_DBG_ObjectTrackName(), *m_EntityAlife.cName()) == 0) { Msg("CCharacterPhysicsSupport::SpawnInitPhysics obj %s after collision correction %f,%f,%f", PH_DBG_ObjectTrackName(), m_EntityAlife.Position().x, m_EntityAlife.Position().y, diff --git a/src/xrGame/GameObject.cpp b/src/xrGame/GameObject.cpp index abdd4ad2b74..d0552c30d65 100644 --- a/src/xrGame/GameObject.cpp +++ b/src/xrGame/GameObject.cpp @@ -470,7 +470,7 @@ BOOL CGameObject::net_Spawn(CSE_Abstract* DC) XFORM().setXYZ(E->o_Angle); Position().set(E->o_Position); #ifdef DEBUG - if (ph_dbg_draw_mask1.test(ph_m1_DbgTrackObject) && _stricmp(PH_DBG_ObjectTrackName(), *cName()) == 0) + if (ph_dbg_draw_mask1.test(ph_m1_DbgTrackObject) && xr_stricmp(PH_DBG_ObjectTrackName(), *cName()) == 0) { Msg("CGameObject::net_Spawn obj %s Position set from CSE_Abstract %f,%f,%f", PH_DBG_ObjectTrackName(), Position().x, Position().y, Position().z); @@ -524,7 +524,7 @@ BOOL CGameObject::net_Spawn(CSE_Abstract* DC) if (!GEnv.isDedicatedServer) scriptBinder.reinit(); #ifdef DEBUG - if (ph_dbg_draw_mask1.test(ph_m1_DbgTrackObject) && _stricmp(PH_DBG_ObjectTrackName(), *cName()) == 0) + if (ph_dbg_draw_mask1.test(ph_m1_DbgTrackObject) && xr_stricmp(PH_DBG_ObjectTrackName(), *cName()) == 0) { Msg("CGameObject::net_Spawn obj %s After Script Binder reinit %f,%f,%f", PH_DBG_ObjectTrackName(), Position().x, Position().y, Position().z); @@ -603,7 +603,7 @@ BOOL CGameObject::net_Spawn(CSE_Abstract* DC) m_bObjectRemoved = false; spawn_supplies(); #ifdef DEBUG - if (ph_dbg_draw_mask1.test(ph_m1_DbgTrackObject) && _stricmp(PH_DBG_ObjectTrackName(), *cName()) == 0) + if (ph_dbg_draw_mask1.test(ph_m1_DbgTrackObject) && xr_stricmp(PH_DBG_ObjectTrackName(), *cName()) == 0) { Msg("CGameObject::net_Spawn obj %s Before CScriptBinder::net_Spawn %f,%f,%f", PH_DBG_ObjectTrackName(), Position().x, Position().y, Position().z); @@ -614,7 +614,7 @@ BOOL CGameObject::net_Spawn(CSE_Abstract* DC) #endif #ifdef DEBUG - if (ph_dbg_draw_mask1.test(ph_m1_DbgTrackObject) && _stricmp(PH_DBG_ObjectTrackName(), *cName()) == 0) + if (ph_dbg_draw_mask1.test(ph_m1_DbgTrackObject) && xr_stricmp(PH_DBG_ObjectTrackName(), *cName()) == 0) { Msg("CGameObject::net_Spawn obj %s Before CScriptBinder::net_Spawn %f,%f,%f", PH_DBG_ObjectTrackName(), Position().x, Position().y, Position().z); @@ -679,7 +679,7 @@ void CGameObject::net_Load(IReader& ireader) #endif // ---------------------------------------------------------- #ifdef DEBUG - if (ph_dbg_draw_mask1.test(ph_m1_DbgTrackObject) && _stricmp(PH_DBG_ObjectTrackName(), *cName()) == 0) + if (ph_dbg_draw_mask1.test(ph_m1_DbgTrackObject) && xr_stricmp(PH_DBG_ObjectTrackName(), *cName()) == 0) { Msg("CGameObject::net_Load obj %s (loaded) %f,%f,%f", PH_DBG_ObjectTrackName(), Position().x, Position().y, Position().z); diff --git a/src/xrGame/GamePersistent.cpp b/src/xrGame/GamePersistent.cpp index 74b9d166341..e86443797a2 100644 --- a/src/xrGame/GamePersistent.cpp +++ b/src/xrGame/GamePersistent.cpp @@ -497,7 +497,7 @@ void CGamePersistent::start_game_intro() if (g_pGameLevel && g_pGameLevel->bReady && Device.dwPrecacheFrame <= 2) { m_intro_event.bind(this, &CGamePersistent::update_game_intro); - if (0 == _stricmp(m_game_params.m_new_or_load, "new")) + if (0 == xr_stricmp(m_game_params.m_new_or_load, "new")) { VERIFY(NULL == m_intro); m_intro = new CUISequencer(); diff --git a/src/xrGame/HudSound.h b/src/xrGame/HudSound.h index 90a4fa1632a..8172869d9fb 100644 --- a/src/xrGame/HudSound.h +++ b/src/xrGame/HudSound.h @@ -45,7 +45,7 @@ struct HUD_SOUND_ITEM bool m_b_exclusive; xr_vector sounds; - bool operator==(LPCSTR alias) const { return 0 == _stricmp(m_alias.c_str(), alias); } + bool operator==(LPCSTR alias) const { return 0 == xr_stricmp(m_alias.c_str(), alias); } }; class HUD_SOUND_COLLECTION diff --git a/src/xrGame/Level_network_digest_computer.cpp b/src/xrGame/Level_network_digest_computer.cpp index 200f95a7cc7..28acc428d23 100644 --- a/src/xrGame/Level_network_digest_computer.cpp +++ b/src/xrGame/Level_network_digest_computer.cpp @@ -14,7 +14,7 @@ char const* ComputeClientDigest(string128& dest) dest[0] = 0; return dest; } - _strupr(cd_key); + xr_strupr(cd_key); MD5Digest(reinterpret_cast(cd_key), cd_keylen, md5hash); md5hash[33] = 0; xr_strcpy(dest, sizeof(dest), md5hash); diff --git a/src/xrGame/Level_start.cpp b/src/xrGame/Level_start.cpp index 292a191a260..2cbad212ffe 100644 --- a/src/xrGame/Level_start.cpp +++ b/src/xrGame/Level_start.cpp @@ -204,7 +204,7 @@ bool CLevel::net_start3() const char* start = strstr(m_caClientOptions.c_str(), "/cdkey=") + xr_strlen("/cdkey="); sscanf(start, "%[^/]", CDKey); string128 cmd; - xr_sprintf(cmd, "cdkey %s", _strupr(CDKey)); + xr_sprintf(cmd, "cdkey %s", xr_strupr(CDKey)); Console->Execute(cmd); } return true; diff --git a/src/xrGame/NET_Queue.h b/src/xrGame/NET_Queue.h index 9484273b6b5..fce9a4eab28 100644 --- a/src/xrGame/NET_Queue.h +++ b/src/xrGame/NET_Queue.h @@ -98,7 +98,7 @@ class NET_Queue_Event case 2: EventName = "GE_OWNERSHIP_REJECT [2]"; break; case 5: EventName = "GE_DIE [5]"; break; case 7: EventName = "GE_DESTROY [7]"; break; - default: EventName = _itoa(E.type, tmp, 10); break; + default: EventName = xr_itoa(E.type, tmp, 10); break; } Msg("Event %s to %d - at %d", *EventName, E.destination, E.timestamp); diff --git a/src/xrGame/PHMovementControl.cpp b/src/xrGame/PHMovementControl.cpp index 8abd3510fb8..cb5ebf727f4 100644 --- a/src/xrGame/PHMovementControl.cpp +++ b/src/xrGame/PHMovementControl.cpp @@ -43,7 +43,7 @@ CPHMovementControl::CPHMovementControl(IGameObject* parent) #ifdef DEBUG if (debug_output().ph_dbg_draw_mask1().test(ph_m1_DbgTrackObject) && (!!pObject->cName()) && - _stricmp(debug_output().PH_DBG_ObjectTrackName(), *pObject->cName()) == 0) + xr_stricmp(debug_output().PH_DBG_ObjectTrackName(), *pObject->cName()) == 0) { Msg("CPHMovementControl::CPHMovementControl %s (constructor) %f,%f,%pObjectf", debug_output().PH_DBG_ObjectTrackName(), pObject->Position().x, pObject->Position().y, @@ -319,7 +319,7 @@ void CPHMovementControl::Calculate( { #ifdef DEBUG if (debug_output().ph_dbg_draw_mask1().test(ph_m1_DbgTrackObject) && (!!pObject->cName()) && - _stricmp(debug_output().PH_DBG_ObjectTrackName(), *pObject->cName()) == 0) + xr_stricmp(debug_output().PH_DBG_ObjectTrackName(), *pObject->cName()) == 0) { Msg("CPHMovementControl::Calculate in %s (Object Position) %f,%f,%f", debug_output().PH_DBG_ObjectTrackName(), pObject->Position().x, pObject->Position().y, pObject->Position().z); @@ -577,7 +577,7 @@ void CPHMovementControl::PathNearestPoint(const xr_vectorcName()) && - _stricmp(PH_DBG_ObjectTrackName(), *pObject->cName()) == 0) + xr_stricmp(PH_DBG_ObjectTrackName(), *pObject->cName()) == 0) { Msg("CPHMovementControl::Calculate out %s (Object Position) %f,%f,%f", PH_DBG_ObjectTrackName(), pObject->Position().x, pObject->Position().y, pObject->Position().z); @@ -967,7 +967,7 @@ void CPHMovementControl::SetPosition(const Fvector& P) { #ifdef DEBUG if (ph_dbg_draw_mask1.test(ph_m1_DbgTrackObject) && (!!pObject->cName()) && - _stricmp(PH_DBG_ObjectTrackName(), *pObject->cName()) == 0) + xr_stricmp(PH_DBG_ObjectTrackName(), *pObject->cName()) == 0) { Msg("CPHMovementControl::SetPosition %s (Object Position) %f,%f,%f", PH_DBG_ObjectTrackName(), pObject->Position().x, pObject->Position().y, pObject->Position().z); @@ -986,7 +986,7 @@ bool CPHMovementControl::TryPosition(Fvector& pos) #ifdef DEBUG if (ph_dbg_draw_mask1.test(ph_m1_DbgTrackObject) && (!!pObject->cName()) && - _stricmp(PH_DBG_ObjectTrackName(), *pObject->cName()) == 0) + xr_stricmp(PH_DBG_ObjectTrackName(), *pObject->cName()) == 0) { Msg("CPHMovementControl::TryPosition %s (Object Position) %f,%f,%f", PH_DBG_ObjectTrackName(), pObject->Position().x, pObject->Position().y, pObject->Position().z); @@ -1012,7 +1012,7 @@ void CPHMovementControl::GetPosition(Fvector& P) #ifdef DEBUG if (ph_dbg_draw_mask1.test(ph_m1_DbgTrackObject) && (!!pObject->cName()) && - _stricmp(PH_DBG_ObjectTrackName(), *pObject->cName()) == 0) + xr_stricmp(PH_DBG_ObjectTrackName(), *pObject->cName()) == 0) { Msg("CPHMovementControl::GetPosition %s (Object Position) %f,%f,%f", PH_DBG_ObjectTrackName(), pObject->Position().x, pObject->Position().y, pObject->Position().z); @@ -1042,7 +1042,7 @@ void CPHMovementControl::AllocateCharacterObject(CharacterType type) m_character->SetPosition(vPosition); #ifdef DEBUG if (ph_dbg_draw_mask1.test(ph_m1_DbgTrackObject) && (!!pObject->cName()) && - _stricmp(PH_DBG_ObjectTrackName(), *pObject->cName()) == 0) + xr_stricmp(PH_DBG_ObjectTrackName(), *pObject->cName()) == 0) { Msg("CPHMovementControl::AllocateCharacterObject %s (Object Position) %f,%f,%f", PH_DBG_ObjectTrackName(), pObject->Position().x, pObject->Position().y, pObject->Position().z); @@ -1204,7 +1204,7 @@ void CPHMovementControl::CreateCharacter() m_character->SetAirControlFactor(fAirControlParam); #ifdef DEBUG if (ph_dbg_draw_mask1.test(ph_m1_DbgTrackObject) && (!!pObject->cName()) && - _stricmp(PH_DBG_ObjectTrackName(), *pObject->cName()) == 0) + xr_stricmp(PH_DBG_ObjectTrackName(), *pObject->cName()) == 0) { Msg("CPHMovementControl::CreateCharacter %s (Object Position) %f,%f,%f", PH_DBG_ObjectTrackName(), pObject->Position().x, pObject->Position().y, pObject->Position().z); diff --git a/src/xrGame/Torch.cpp b/src/xrGame/Torch.cpp index da539afa410..0ad9b61a309 100644 --- a/src/xrGame/Torch.cpp +++ b/src/xrGame/Torch.cpp @@ -113,7 +113,7 @@ void CTorch::SwitchNightVision(bool vision_on, bool use_sounds) for (u32 i = 0; i < cnt; ++i) { _GetItem(disabled_names, i, tmp); - if (0 == _stricmp(tmp, curr_map)) + if (0 == xr_stricmp(tmp, curr_map)) { b_allow = false; break; diff --git a/src/xrGame/UIGameCTA.cpp b/src/xrGame/UIGameCTA.cpp index 5f05384c000..66f78ab3098 100644 --- a/src/xrGame/UIGameCTA.cpp +++ b/src/xrGame/UIGameCTA.cpp @@ -644,7 +644,7 @@ s8 CUIGameCTA::GetSelectedSkinIndex() void CUIGameCTA::SetReinforcementTimes(u32 curTime, u32 maxTime) { string128 _buff; - m_pReinforcementInidcator->SetText(_itoa(curTime / 1000, _buff, 10)); + m_pReinforcementInidcator->SetText(xr_itoa(curTime / 1000, _buff, 10)); } void CUIGameCTA::DisplayMoneyChange(LPCSTR deltaMoney) { m_pMoneyIndicator->SetMoneyChange(deltaMoney); } @@ -886,7 +886,7 @@ void CUIGameCTA::LoadDefItemsForRank() char tmp[5]; for (int i = 1; i <= local_player->rank; i++) { - strconcat(sizeof(RankStr), RankStr, "rank_", _itoa(i, tmp, 10)); + strconcat(sizeof(RankStr), RankStr, "rank_", xr_itoa(i, tmp, 10)); if (!pSettings->section_exist(RankStr)) continue; for (u32 it = 0; it < PlayerDefItems.size(); it++) diff --git a/src/xrGame/action_planner_inline.h b/src/xrGame/action_planner_inline.h index f74a7aab4fe..523b9d539d1 100644 --- a/src/xrGame/action_planner_inline.h +++ b/src/xrGame/action_planner_inline.h @@ -158,7 +158,7 @@ LPCSTR CPlanner::action2string(const _action_id_type& action_id) { return (actio TEMPLATE_SPECIALIZATION LPCSTR CPlanner::property2string(const _condition_type& property_id) { - return (evaluator(property_id).m_evaluator_name); // _itoa(property_id,m_temp_string,10)); + return (evaluator(property_id).m_evaluator_name); // xr_itoa(property_id,m_temp_string,10)); } TEMPLATE_SPECIALIZATION diff --git a/src/xrGame/ai/ai_monsters_misc.cpp b/src/xrGame/ai/ai_monsters_misc.cpp index cd30693881c..9fd145545fc 100644 --- a/src/xrGame/ai/ai_monsters_misc.cpp +++ b/src/xrGame/ai/ai_monsters_misc.cpp @@ -208,7 +208,7 @@ void CAniVector::Load(IKinematicsAnimated* tpKinematics, LPCSTR caBaseName) string256 S1, S2; MotionID tpMotionDef; for (int i = 0;; ++i) - if (!!(tpMotionDef = tpKinematics->ID_Cycle_Safe(strconcat(sizeof(S1), S1, caBaseName, _itoa(i, S2, 10))))) + if (!!(tpMotionDef = tpKinematics->ID_Cycle_Safe(strconcat(sizeof(S1), S1, caBaseName, xr_itoa(i, S2, 10))))) { A.push_back(tpMotionDef); #ifdef DEBUG @@ -216,7 +216,7 @@ void CAniVector::Load(IKinematicsAnimated* tpKinematics, LPCSTR caBaseName) Msg("* Loaded animation %s", S1); #endif } - else if (!!(tpMotionDef = tpKinematics->ID_FX_Safe(strconcat(sizeof(S1), S1, caBaseName, _itoa(i, S2, 10))))) + else if (!!(tpMotionDef = tpKinematics->ID_FX_Safe(strconcat(sizeof(S1), S1, caBaseName, xr_itoa(i, S2, 10))))) { A.push_back(tpMotionDef); #ifdef DEBUG diff --git a/src/xrGame/ai/monsters/control_animation.cpp b/src/xrGame/ai/monsters/control_animation.cpp index eee30d9e3d4..1ed36b2ca00 100644 --- a/src/xrGame/ai/monsters/control_animation.cpp +++ b/src/xrGame/ai/monsters/control_animation.cpp @@ -294,3 +294,15 @@ void CControlAnimation::unfreeze() m_data.torso.blend->speed = m_saved_torso_speed; } } + +// get motion time, when just MotionID available +float CControlAnimation::motion_time(MotionID motion_id, IRenderVisual* visual) +{ + IKinematicsAnimated* skeleton_animated = smart_cast(visual); + VERIFY(skeleton_animated); + CMotionDef* motion_def = skeleton_animated->LL_GetMotionDef(motion_id); + VERIFY(motion_def); + CMotion* motion = skeleton_animated->LL_GetRootMotion(motion_id); + VERIFY(motion); + return (motion->GetLength() / motion_def->Speed()); +} diff --git a/src/xrGame/ai/monsters/control_animation.h b/src/xrGame/ai/monsters/control_animation.h index fabdc720565..7a15e424a7c 100644 --- a/src/xrGame/ai/monsters/control_animation.h +++ b/src/xrGame/ai/monsters/control_animation.h @@ -89,7 +89,7 @@ class CControlAnimation : public CControl_ComPure void unfreeze(); // Services - IC float motion_time(MotionID motion_id, IRenderVisual* visual); + float motion_time(MotionID motion_id, IRenderVisual* visual); private: void play(); @@ -106,15 +106,3 @@ class CControlAnimation : public CControl_ComPure eAnimationCustom }; }; - -// get motion time, when just MotionID available -IC float CControlAnimation::motion_time(MotionID motion_id, IRenderVisual* visual) -{ - IKinematicsAnimated* skeleton_animated = smart_cast(visual); - VERIFY(skeleton_animated); - CMotionDef* motion_def = skeleton_animated->LL_GetMotionDef(motion_id); - VERIFY(motion_def); - CMotion* motion = skeleton_animated->LL_GetRootMotion(motion_id); - VERIFY(motion); - return (motion->GetLength() / motion_def->Speed()); -} diff --git a/src/xrGame/ai/monsters/control_animation_base.cpp b/src/xrGame/ai/monsters/control_animation_base.cpp index b3d1d0c87d7..585d2748c35 100644 --- a/src/xrGame/ai/monsters/control_animation_base.cpp +++ b/src/xrGame/ai/monsters/control_animation_base.cpp @@ -132,7 +132,7 @@ bool CControlAnimationBase::get_animation_info(EMotionAnim anim, u32 index, Moti char index_string_buffer[128]; char* animation_name_buffer; - STRCONCAT(animation_name_buffer, anim_it->target_name, _itoa(index, index_string_buffer, 10)); + STRCONCAT(animation_name_buffer, anim_it->target_name, xr_itoa(index, index_string_buffer, 10)); IKinematicsAnimated* animated = smart_cast(m_object->Visual()); if (!animated) @@ -221,7 +221,7 @@ void CControlAnimationBase::select_animation(bool anim_end) // установить анимацию string128 s1, s2; MotionID cur_anim = smart_cast( - m_object->Visual())->ID_Cycle_Safe(strconcat(sizeof(s2), s2, *anim_it->target_name, _itoa(index, s1, 10))); + m_object->Visual())->ID_Cycle_Safe(strconcat(sizeof(s2), s2, *anim_it->target_name, xr_itoa(index, s1, 10))); if (!cur_anim.valid()) FATAL(s2); @@ -232,7 +232,7 @@ void CControlAnimationBase::select_animation(bool anim_end) // Заполнить текущую анимацию string64 st, tmp; - strconcat(sizeof(st), st, *anim_it->target_name, _itoa(index, tmp, 10)); + strconcat(sizeof(st), st, *anim_it->target_name, xr_itoa(index, tmp, 10)); // xr_sprintf (st, "%s%d", *anim_it->second.target_name, index); m_cur_anim.name = st; m_cur_anim.index = u8(index); @@ -517,7 +517,7 @@ void CControlAnimationBase::UpdateAnimCount() for (int i = 0;; ++i) { - strconcat(sizeof(s_temp), s_temp, *((*it)->target_name), _itoa(i, s, 10)); + strconcat(sizeof(s_temp), s_temp, *((*it)->target_name), xr_itoa(i, s, 10)); LPCSTR name = s_temp; MotionID id = skel->ID_Cycle_Safe(name); @@ -546,7 +546,7 @@ CMotionDef* CControlAnimationBase::get_motion_def(SAnimItem* it, u32 index) string128 s1, s2; IKinematicsAnimated* skeleton_animated = smart_cast(m_object->Visual()); const MotionID& motion_id = - skeleton_animated->ID_Cycle_Safe(strconcat(sizeof(s2), s2, *it->target_name, _itoa(index, s1, 10))); + skeleton_animated->ID_Cycle_Safe(strconcat(sizeof(s2), s2, *it->target_name, xr_itoa(index, s1, 10))); return (skeleton_animated->LL_GetMotionDef(motion_id)); } @@ -585,7 +585,7 @@ MotionID CControlAnimationBase::get_motion_id(EMotionAnim a, u32 index) string128 s1, s2; return (smart_cast(m_object->Visual()) - ->ID_Cycle_Safe(strconcat(sizeof(s2), s2, *anim_it->target_name, _itoa(index, s1, 10)))); + ->ID_Cycle_Safe(strconcat(sizeof(s2), s2, *anim_it->target_name, xr_itoa(index, s1, 10)))); } void CControlAnimationBase::stop_now() diff --git a/src/xrGame/alife_simulator_base.cpp b/src/xrGame/alife_simulator_base.cpp index 08d0fcd63c6..192af65b10a 100644 --- a/src/xrGame/alife_simulator_base.cpp +++ b/src/xrGame/alife_simulator_base.cpp @@ -115,7 +115,7 @@ CSE_Abstract* CALifeSimulatorBase::spawn_item(LPCSTR section, const Fvector& pos if (abstract->ID < 10) xr_strcat(s_name_replace, "0"); string16 S1; - xr_strcat(s_name_replace, _itoa(abstract->ID, S1, 10)); + xr_strcat(s_name_replace, xr_itoa(abstract->ID, S1, 10)); abstract->set_name_replace(s_name_replace); CSE_ALifeDynamicObject* dynamic_object = smart_cast(abstract); @@ -172,7 +172,7 @@ CSE_Abstract* CALifeSimulatorBase::create(CSE_ALifeGroupAbstract* tpALifeGroupAb if (k->ID < 10) xr_strcat(s_name_replace, "0"); string16 S1; - xr_strcat(s_name_replace, _itoa(k->ID, S1, 10)); + xr_strcat(s_name_replace, xr_itoa(k->ID, S1, 10)); k->set_name_replace(s_name_replace); register_object(k, true); diff --git a/src/xrGame/console_commands_mp.cpp b/src/xrGame/console_commands_mp.cpp index 01a0e2c7635..31547f9ea60 100644 --- a/src/xrGame/console_commands_mp.cpp +++ b/src/xrGame/console_commands_mp.cpp @@ -273,7 +273,7 @@ class CCC_GSCDKey : public CCC_String virtual void Execute(LPCSTR arguments) { string64 cdkey; - if (0 == _stricmp(arguments, "clear")) + if (0 == xr_stricmp(arguments, "clear")) { cdkey[0] = 0; } diff --git a/src/xrGame/encyclopedia_article.cpp b/src/xrGame/encyclopedia_article.cpp index 3e7c6cfcb84..872c2bc36e9 100644 --- a/src/xrGame/encyclopedia_article.cpp +++ b/src/xrGame/encyclopedia_article.cpp @@ -116,19 +116,19 @@ void CEncyclopediaArticle::load_shared(LPCSTR) // Тип статьи xr_string atricle_type = pXML->ReadAttrib(pNode, "article_type", "encyclopedia"); - if (0 == _stricmp(atricle_type.c_str(), "encyclopedia")) + if (0 == xr_stricmp(atricle_type.c_str(), "encyclopedia")) { data()->articleType = ARTICLE_DATA::eEncyclopediaArticle; } - else if (0 == _stricmp(atricle_type.c_str(), "journal")) + else if (0 == xr_stricmp(atricle_type.c_str(), "journal")) { data()->articleType = ARTICLE_DATA::eJournalArticle; } - else if (0 == _stricmp(atricle_type.c_str(), "task")) + else if (0 == xr_stricmp(atricle_type.c_str(), "task")) { data()->articleType = ARTICLE_DATA::eTaskArticle; } - else if (0 == _stricmp(atricle_type.c_str(), "info")) + else if (0 == xr_stricmp(atricle_type.c_str(), "info")) { data()->articleType = ARTICLE_DATA::eInfoArticle; } diff --git a/src/xrGame/game_cl_artefacthunt.cpp b/src/xrGame/game_cl_artefacthunt.cpp index 2a3fda30bcd..6c85f73a4e5 100644 --- a/src/xrGame/game_cl_artefacthunt.cpp +++ b/src/xrGame/game_cl_artefacthunt.cpp @@ -458,7 +458,7 @@ void game_cl_ArtefactHunt::shedule_Update(u32 dt) dTime = iCeil(float(dReinforcementTime - CurTime) / 1000); string128 _buff; - m_game_ui->m_pReinforcementInidcator->SetText(_itoa(dTime, _buff, 10)); + m_game_ui->m_pReinforcementInidcator->SetText(xr_itoa(dTime, _buff, 10)); } else m_game_ui->m_pReinforcementInidcator->SetText("0"); diff --git a/src/xrGame/game_cl_capture_the_artefact.cpp b/src/xrGame/game_cl_capture_the_artefact.cpp index 2a0b94f1659..01b8e8c8a77 100644 --- a/src/xrGame/game_cl_capture_the_artefact.cpp +++ b/src/xrGame/game_cl_capture_the_artefact.cpp @@ -243,7 +243,7 @@ void game_cl_CaptureTheArtefact::UpdateMoneyIndicator() } if (total_money != last_money) { - _itoa(total_money, MoneyStr, 10); + xr_itoa(total_money, MoneyStr, 10); m_game_ui->ChangeTotalMoneyIndicator(MoneyStr); last_money = total_money; } diff --git a/src/xrGame/game_cl_capture_the_artefact_captions_manager.cpp b/src/xrGame/game_cl_capture_the_artefact_captions_manager.cpp index ebd133c4fb4..d9288a1668d 100644 --- a/src/xrGame/game_cl_capture_the_artefact_captions_manager.cpp +++ b/src/xrGame/game_cl_capture_the_artefact_captions_manager.cpp @@ -198,7 +198,7 @@ u32 CTAGameClCaptionsManager::SetWarmupTime(u32 current_warmup_time, u32 current } } dwLastTimeRemains = dwCurTimeRemains; - _itoa(dwCurTimeRemains, time_str, 10); + xr_itoa(dwCurTimeRemains, time_str, 10); strconcat(sizeof(warmup_message), warmup_message, *st.translate("mp_ready"), "...", time_str); } }; diff --git a/src/xrGame/game_cl_deathmatch.cpp b/src/xrGame/game_cl_deathmatch.cpp index 25e7572e1a2..9635c90b4db 100644 --- a/src/xrGame/game_cl_deathmatch.cpp +++ b/src/xrGame/game_cl_deathmatch.cpp @@ -535,7 +535,7 @@ void game_cl_Deathmatch::shedule_Update(u32 dt) PlaySndMessage(ID_COUNTDOWN_1 + dwCurTimeRemains - 1); } dwLastTimeRemains = dwCurTimeRemains; - _itoa(dwCurTimeRemains, S, 10); + xr_itoa(dwCurTimeRemains, S, 10); strconcat(sizeof(tmpStr), tmpStr, *st.translate("mp_ready"), "...", S); } }; diff --git a/src/xrGame/game_cl_deathmatch_buywnd.cpp b/src/xrGame/game_cl_deathmatch_buywnd.cpp index acd08d1b605..edf90689bb5 100644 --- a/src/xrGame/game_cl_deathmatch_buywnd.cpp +++ b/src/xrGame/game_cl_deathmatch_buywnd.cpp @@ -419,7 +419,7 @@ void game_cl_Deathmatch::LoadDefItemsForRank(IBuyWnd* pBuyMenu) char tmp[5]; for (int i = 1; i <= local_player->rank; i++) { - strconcat(sizeof(RankStr), RankStr, "rank_", _itoa(i, tmp, 10)); + strconcat(sizeof(RankStr), RankStr, "rank_", xr_itoa(i, tmp, 10)); if (!pSettings->section_exist(RankStr)) continue; for (u32 it = 0; it < PlayerDefItems.size(); it++) diff --git a/src/xrGame/game_cl_mp.cpp b/src/xrGame/game_cl_mp.cpp index 0a87a43b4c0..4c79594d83a 100644 --- a/src/xrGame/game_cl_mp.cpp +++ b/src/xrGame/game_cl_mp.cpp @@ -1207,7 +1207,7 @@ void game_cl_mp::OnEventMoneyChanged(NET_Packet& P) OnMoneyChanged(); { string256 MoneyStr; - _itoa(local_player->money_for_round, MoneyStr, 10); + xr_itoa(local_player->money_for_round, MoneyStr, 10); m_game_ui_custom->ChangeTotalMoneyIndicator(MoneyStr); } s32 Money_Added = P.r_s32(); @@ -1446,7 +1446,7 @@ void game_cl_mp::OnRadminMessage(u16 type, NET_Packet* P) if (!m_pAdminMenuWindow) m_pAdminMenuWindow = new CUIMpAdminMenu(); - if (0 == _stricmp(buff, "Access permitted.")) + if (0 == xr_stricmp(buff, "Access permitted.")) m_pAdminMenuWindow->ShowDialog(true); else m_pAdminMenuWindow->ShowMessageBox(CUIMessageBox::MESSAGEBOX_OK, buff); diff --git a/src/xrGame/game_sv_base.cpp b/src/xrGame/game_sv_base.cpp index 967fb7fc892..ba56358c223 100644 --- a/src/xrGame/game_sv_base.cpp +++ b/src/xrGame/game_sv_base.cpp @@ -767,7 +767,7 @@ void game_sv_GameState::OnEvent(NET_Packet& tNetPacket, u16 type, u32 time, Clie default: { string16 tmp; - R_ASSERT3(0, "Game Event not implemented!!!", _itoa(type, tmp, 10)); + R_ASSERT3(0, "Game Event not implemented!!!", xr_itoa(type, tmp, 10)); }; }; } diff --git a/src/xrGame/game_sv_mp.cpp b/src/xrGame/game_sv_mp.cpp index 8658bdc2529..02257fac70a 100644 --- a/src/xrGame/game_sv_mp.cpp +++ b/src/xrGame/game_sv_mp.cpp @@ -1033,7 +1033,7 @@ void game_sv_mp::OnVoteStart(LPCSTR VoteCommand, ClientID sender) m_bVotingReal = false; while (votecommands[i].command) { - if (!_stricmp(votecommands[i].name, CommandName)) + if (!xr_stricmp(votecommands[i].name, CommandName)) { m_bVotingReal = true; if (!IsVotingEnabled(votecommands[i].flag)) @@ -1054,7 +1054,7 @@ void game_sv_mp::OnVoteStart(LPCSTR VoteCommand, ClientID sender) m_uVoteStartTime = CurTime; if (m_bVotingReal) { - if (!_stricmp(votecommands[i].name, "changeweather")) + if (!xr_stricmp(votecommands[i].name, "changeweather")) { string256 WeatherTime = "", WeatherName = ""; sscanf(CommandParams, "%255s %255s", WeatherName, WeatherTime); @@ -1062,7 +1062,7 @@ void game_sv_mp::OnVoteStart(LPCSTR VoteCommand, ClientID sender) m_pVoteCommand.printf("%s %s", votecommands[i].command, WeatherTime); xr_sprintf(resVoteCommand, "%s %s", votecommands[i].name, WeatherName); } - else if (!_stricmp(votecommands[i].name, "changemap")) + else if (!xr_stricmp(votecommands[i].name, "changemap")) { string256 LevelName; string256 LevelVersion; @@ -1078,7 +1078,7 @@ void game_sv_mp::OnVoteStart(LPCSTR VoteCommand, ClientID sender) m_pVoteCommand = sv_vote_command; xr_sprintf(resVoteCommand, "%s %s [%s]", votecommands[i].name, LevelName, LevelVersion); } - else if (!_stricmp(votecommands[i].name, "kick")) + else if (!xr_stricmp(votecommands[i].name, "kick")) { SearcherClientByName tmp_predicate(CommandParams); IClient* tmp_client = m_server->FindClient(tmp_predicate); @@ -1092,7 +1092,7 @@ void game_sv_mp::OnVoteStart(LPCSTR VoteCommand, ClientID sender) } xr_strcpy(resVoteCommand, VoteCommand); } - else if (!_stricmp(votecommands[i].name, "ban")) + else if (!xr_stricmp(votecommands[i].name, "ban")) { string256 tmp_victim_name; s32 ban_time = ExcludeBanTimeFromVoteStr(CommandParams, tmp_victim_name, sizeof(tmp_victim_name)); @@ -1340,7 +1340,7 @@ void game_sv_mp::SetPlayersDefItems(game_PlayerState* ps) char tmp[5]; for (int i = 1; i <= ps->rank; i++) { - strconcat(sizeof(RankStr), RankStr, "rank_", _itoa(i, tmp, 10)); + strconcat(sizeof(RankStr), RankStr, "rank_", xr_itoa(i, tmp, 10)); if (!pSettings->section_exist(RankStr)) continue; for (u32 it = 0; it < ps->pItemList.size(); it++) diff --git a/src/xrGame/ik/IKLimb.cpp b/src/xrGame/ik/IKLimb.cpp index b2d3b85e55d..1b76e9a23ad 100644 --- a/src/xrGame/ik/IKLimb.cpp +++ b/src/xrGame/ik/IKLimb.cpp @@ -309,7 +309,7 @@ void CIKLimb::Create(u16 id, IKinematicsAnimated* K, bool collide_) { string32 section; string32 buff; - strconcat(sizeof(section), section, "ik_limb", _itoa(id, buff, 10)); + strconcat(sizeof(section), section, "ik_limb", xr_itoa(id, buff, 10)); parse_bones_string(CK, CK->LL_UserData()->r_string(section, "bones"), m_bones); m_foot.Create(CK, section, m_bones); } diff --git a/src/xrGame/reward_manager.cpp b/src/xrGame/reward_manager.cpp index 12dffc2d8e7..4063069e6c8 100644 --- a/src/xrGame/reward_manager.cpp +++ b/src/xrGame/reward_manager.cpp @@ -42,13 +42,13 @@ void reward_manager::load_rewards() LPCSTR section_name = NULL; char tmp_dst_buff[16]; - STRCONCAT(section_name, section_name_prefix, _itoa(reward_index, tmp_dst_buff, 10)); + STRCONCAT(section_name, section_name_prefix, xr_itoa(reward_index, tmp_dst_buff, 10)); while (rewards_config.section_exist(section_name)) { load_reward_item(rewards_config, reward_index, section_name); ++reward_index; - STRCONCAT(section_name, section_name_prefix, _itoa(reward_index, tmp_dst_buff, 10)); + STRCONCAT(section_name, section_name_prefix, xr_itoa(reward_index, tmp_dst_buff, 10)); } FS.r_close(tmp_reader); diff --git a/src/xrGame/seniority_hierarchy_space.h b/src/xrGame/seniority_hierarchy_space.h index 3155f13faca..db59cbc7c44 100644 --- a/src/xrGame/seniority_hierarchy_space.h +++ b/src/xrGame/seniority_hierarchy_space.h @@ -15,7 +15,7 @@ namespace SeniorityHierarchy IC shared_str to_string(u32 number) { string16 S; - _itoa(number, S, 10); + xr_itoa(number, S, 10); return (shared_str(S)); } diff --git a/src/xrGame/ui/ServerList.cpp b/src/xrGame/ui/ServerList.cpp index db000b5f4df..47937be527f 100644 --- a/src/xrGame/ui/ServerList.cpp +++ b/src/xrGame/ui/ServerList.cpp @@ -797,7 +797,7 @@ void CServerList::SrvInfo2LstSrvInfo(const ServerInfo* pServerInfo) xr_string address = pServerInfo->m_HostName; char port[8]; address += "/port="; - address += _itoa(pServerInfo->m_Port, port, 10); + address += xr_itoa(pServerInfo->m_Port, port, 10); m_itemInfo.info.address = address.c_str(); m_itemInfo.info.map = pServerInfo->m_SessionName; m_itemInfo.info.game = GameTypeToString((EGameIDs)pServerInfo->m_GameType, true); diff --git a/src/xrGame/ui/TeamInfo.cpp b/src/xrGame/ui/TeamInfo.cpp index 420545ab0af..ee857398e61 100644 --- a/src/xrGame/ui/TeamInfo.cpp +++ b/src/xrGame/ui/TeamInfo.cpp @@ -70,7 +70,7 @@ shared_str CTeamInfo::GetTeam2_name() LPCSTR CTeamInfo::GetTeam_name(int team) { string32 tmp; - R_ASSERT2(team == 1 || team == 2 || team == 3, _itoa(team, tmp, 10)); + R_ASSERT2(team == 1 || team == 2 || team == 3, xr_itoa(team, tmp, 10)); if (team == 1) return *GetTeam1_name(); else @@ -80,7 +80,7 @@ LPCSTR CTeamInfo::GetTeam_name(int team) LPCSTR CTeamInfo::GetTeam_color_tag(int team) { string32 tmp; - R_ASSERT2(team == 1 || team == 2 || team == 3, _itoa(team, tmp, 10)); + R_ASSERT2(team == 1 || team == 2 || team == 3, xr_itoa(team, tmp, 10)); // if (flags.test(flTeam1_col_t)) return *team1_color_tag; // if (flags.test(flTeam2_col_t)) return *team2_color_tag; if (team == 3) diff --git a/src/xrGame/ui/UIGameTutorial.cpp b/src/xrGame/ui/UIGameTutorial.cpp index 85234cadf36..6928e51b886 100644 --- a/src/xrGame/ui/UIGameTutorial.cpp +++ b/src/xrGame/ui/UIGameTutorial.cpp @@ -129,8 +129,8 @@ void CUISequencer::Start(LPCSTR tutor_name) uiXml.SetLocalRoot(uiXml.NavigateToNode("global_wnd", 0)); { LPCSTR str = uiXml.Read("pause_state", 0, "ignore"); - m_flags.set(etsNeedPauseOn, 0 == _stricmp(str, "on")); - m_flags.set(etsNeedPauseOff, 0 == _stricmp(str, "off")); + m_flags.set(etsNeedPauseOn, 0 == xr_stricmp(str, "on")); + m_flags.set(etsNeedPauseOff, 0 == xr_stricmp(str, "off")); } LPCSTR snd_name = uiXml.Read("sound", 0, ""); @@ -147,7 +147,7 @@ void CUISequencer::Start(LPCSTR tutor_name) for (int i = 0; i < items_count; ++i) { LPCSTR _tp = uiXml.ReadAttrib("item", i, "type", ""); - bool bVideo = 0 == _stricmp(_tp, "video"); + bool bVideo = 0 == xr_stricmp(_tp, "video"); CUISequenceItem* pItem = 0; if (bVideo) pItem = new CUISequenceVideoItem(this); diff --git a/src/xrGame/ui/UIGameTutorialSimpleItem.cpp b/src/xrGame/ui/UIGameTutorialSimpleItem.cpp index f98d84277bc..fe05341d9ca 100644 --- a/src/xrGame/ui/UIGameTutorialSimpleItem.cpp +++ b/src/xrGame/ui/UIGameTutorialSimpleItem.cpp @@ -66,13 +66,13 @@ void CUISequenceSimpleItem::Load(CUIXml* xml, int idx) xr_strcpy(m_pda_section, xml->Read("pda_section", 0, "")); LPCSTR str = xml->Read("pause_state", 0, "ignore"); - m_flags.set(etiNeedPauseOn, 0 == _stricmp(str, "on")); - m_flags.set(etiNeedPauseOff, 0 == _stricmp(str, "off")); - m_flags.set(etiNeedPauseSound, 0 == _stricmp(str, "on")); + m_flags.set(etiNeedPauseOn, 0 == xr_stricmp(str, "on")); + m_flags.set(etiNeedPauseOff, 0 == xr_stricmp(str, "off")); + m_flags.set(etiNeedPauseSound, 0 == xr_stricmp(str, "on")); str = xml->Read("guard_key", 0, NULL); m_continue_dik_guard = -1; - if (str && !_stricmp(str, "any")) + if (str && !xr_stricmp(str, "any")) { m_continue_dik_guard = 9999; str = nullptr; @@ -86,7 +86,7 @@ void CUISequenceSimpleItem::Load(CUIXml* xml, int idx) m_flags.set(etiCanBeStopped, (m_continue_dik_guard == -1)); LPCSTR str_grab_input = xml->Read("grab_input", 0, "on"); - m_flags.set(etiGrabInput, (0 == _stricmp(str_grab_input, "on") || 0 == _stricmp(str_grab_input, "1"))); + m_flags.set(etiGrabInput, (0 == xr_stricmp(str_grab_input, "on") || 0 == xr_stricmp(str_grab_input, "1"))); int actions_count = xml->GetNodesNum(0, 0, "action"); m_actions.resize(actions_count); @@ -250,22 +250,22 @@ void CUISequenceSimpleItem::Start() bool bShowPda = false; CUIGameSP* ui_game_sp = smart_cast(CurrentGameUI()); - if (!_stricmp(m_pda_section, "pda_tasks")) + if (!xr_stricmp(m_pda_section, "pda_tasks")) { ui_game_sp->GetPdaMenu().SetActiveSubdialog("eptTasks"); bShowPda = true; } - else if (!_stricmp(m_pda_section, "pda_ranking")) + else if (!xr_stricmp(m_pda_section, "pda_ranking")) { ui_game_sp->GetPdaMenu().SetActiveSubdialog("eptRanking"); bShowPda = true; } - else if (!_stricmp(m_pda_section, "pda_logs")) + else if (!xr_stricmp(m_pda_section, "pda_logs")) { ui_game_sp->GetPdaMenu().SetActiveSubdialog("eptLogs"); bShowPda = true; } - else if (!_stricmp(m_pda_section, "pda_show_second_task_wnd")) + else if (!xr_stricmp(m_pda_section, "pda_show_second_task_wnd")) { ui_game_sp->GetPdaMenu().Show_SecondTaskWnd(true); bShowPda = true; diff --git a/src/xrGame/ui/UIGameTutorialVideoItem.cpp b/src/xrGame/ui/UIGameTutorialVideoItem.cpp index e19b399637e..cfa1058a033 100644 --- a/src/xrGame/ui/UIGameTutorialVideoItem.cpp +++ b/src/xrGame/ui/UIGameTutorialVideoItem.cpp @@ -45,15 +45,15 @@ void CUISequenceVideoItem::Load(CUIXml* xml, int idx) xml->SetLocalRoot(xml->NavigateToNode("item", idx)); LPCSTR str = xml->Read("pause_state", 0, "ignore"); - m_flags.set(etiNeedPauseOn, 0 == _stricmp(str, "on")); - m_flags.set(etiNeedPauseOff, 0 == _stricmp(str, "off")); - m_flags.set(etiNeedPauseSound, 0 == _stricmp(str, "on")); + m_flags.set(etiNeedPauseOn, 0 == xr_stricmp(str, "on")); + m_flags.set(etiNeedPauseOff, 0 == xr_stricmp(str, "off")); + m_flags.set(etiNeedPauseSound, 0 == xr_stricmp(str, "on")); str = xml->Read("can_be_stopped", 0, "on"); - m_flags.set(etiCanBeStopped, 0 == _stricmp(str, "on")); + m_flags.set(etiCanBeStopped, 0 == xr_stricmp(str, "on")); str = xml->Read("back_show", 0, "on"); - m_flags.set(etiBackVisible, 0 == _stricmp(str, "on")); + m_flags.set(etiBackVisible, 0 == xr_stricmp(str, "on")); m_flags.set(etiGrabInput, TRUE); diff --git a/src/xrGame/ui/UIKickPlayer.cpp b/src/xrGame/ui/UIKickPlayer.cpp index f02c4aaff79..08eab6ba49e 100644 --- a/src/xrGame/ui/UIKickPlayer.cpp +++ b/src/xrGame/ui/UIKickPlayer.cpp @@ -155,13 +155,13 @@ void CUIKickPlayer::Update() for (; I != E; ++I) { game_PlayerState* pI = I->second; - if (m_selected_item_text.size() && !_stricmp(pI->getName(), m_selected_item_text.c_str())) + if (m_selected_item_text.size() && !xr_stricmp(pI->getName(), m_selected_item_text.c_str())) bHasSelected = true; fit = std::find(m_current_set.begin(), m_current_set.end(), pI); if (fit == m_current_set.end()) bNeedRefresh = true; - else if (_stricmp((*fit)->getName(), pI->getName())) + else if (xr_stricmp((*fit)->getName(), pI->getName())) bNeedRefresh = true; } if (m_current_set.size() != items.size()) diff --git a/src/xrGame/ui/UIMainIngameWnd.cpp b/src/xrGame/ui/UIMainIngameWnd.cpp index ad6f197cbae..192f05f0eb9 100644 --- a/src/xrGame/ui/UIMainIngameWnd.cpp +++ b/src/xrGame/ui/UIMainIngameWnd.cpp @@ -397,7 +397,7 @@ void CUIMainIngameWnd::RenderQuickInfos() if (NULL != actor_action) { - if (_stricmp(actor_action, UIStaticQuickHelp->GetText())) + if (xr_stricmp(actor_action, UIStaticQuickHelp->GetText())) UIStaticQuickHelp->SetTextST(actor_action); } diff --git a/src/xrGame/ui/UIMessageBox.cpp b/src/xrGame/ui/UIMessageBox.cpp index 5ba6754387e..b4dcb7374c0 100644 --- a/src/xrGame/ui/UIMessageBox.cpp +++ b/src/xrGame/ui/UIMessageBox.cpp @@ -81,43 +81,43 @@ void CUIMessageBox::InitMessageBox(LPCSTR box_template) R_ASSERT(_type); m_eMessageBoxStyle = MESSAGEBOX_OK; - if (0 == _stricmp(_type, "ok")) + if (0 == xr_stricmp(_type, "ok")) { m_eMessageBoxStyle = MESSAGEBOX_OK; } - else if (0 == _stricmp(_type, "yes_no")) + else if (0 == xr_stricmp(_type, "yes_no")) { m_eMessageBoxStyle = MESSAGEBOX_YES_NO; } - else if (0 == _stricmp(_type, "yes_no_cancel")) + else if (0 == xr_stricmp(_type, "yes_no_cancel")) { m_eMessageBoxStyle = MESSAGEBOX_YES_NO_CANCEL; } - else if (0 == _stricmp(_type, "yes_no_copy")) + else if (0 == xr_stricmp(_type, "yes_no_copy")) { m_eMessageBoxStyle = MESSAGEBOX_YES_NO_COPY; } - else if (0 == _stricmp(_type, "direct_ip")) + else if (0 == xr_stricmp(_type, "direct_ip")) { m_eMessageBoxStyle = MESSAGEBOX_DIRECT_IP; } - else if (0 == _stricmp(_type, "ra_login")) + else if (0 == xr_stricmp(_type, "ra_login")) { m_eMessageBoxStyle = MESSAGEBOX_RA_LOGIN; } - else if (0 == _stricmp(_type, "password")) + else if (0 == xr_stricmp(_type, "password")) { m_eMessageBoxStyle = MESSAGEBOX_PASSWORD; } - else if (0 == _stricmp(_type, "quit_windows")) + else if (0 == xr_stricmp(_type, "quit_windows")) { m_eMessageBoxStyle = MESSAGEBOX_QUIT_WINDOWS; } - else if (0 == _stricmp(_type, "quit_game")) + else if (0 == xr_stricmp(_type, "quit_game")) { m_eMessageBoxStyle = MESSAGEBOX_QUIT_GAME; } - else if (0 == _stricmp(_type, "info")) + else if (0 == xr_stricmp(_type, "info")) { m_eMessageBoxStyle = MESSAGEBOX_INFO; }; diff --git a/src/xrGame/ui/UIProgressShape.cpp b/src/xrGame/ui/UIProgressShape.cpp index af3ff9a5399..3eb74808d63 100644 --- a/src/xrGame/ui/UIProgressShape.cpp +++ b/src/xrGame/ui/UIProgressShape.cpp @@ -27,7 +27,7 @@ void CUIProgressShape::SetPos(int pos, int max) if (m_bText) { string256 _buff; - TextItemControl()->SetText(_itoa(pos, _buff, 10)); + TextItemControl()->SetText(xr_itoa(pos, _buff, 10)); } } diff --git a/src/xrGame/ui/UISkinSelector.cpp b/src/xrGame/ui/UISkinSelector.cpp index 73a91f33961..983f0a7d3bd 100644 --- a/src/xrGame/ui/UISkinSelector.cpp +++ b/src/xrGame/ui/UISkinSelector.cpp @@ -99,7 +99,7 @@ void CUISkinSelectorWnd::UpdateSkins() string16 buf; if (m_firstSkin + i < 10) { - _itoa((m_firstSkin + 1 + i) % 10, buf, 10); + xr_itoa((m_firstSkin + 1 + i) % 10, buf, 10); xr_strcat(buf, sizeof(buf), " "); m_pImage[i]->TextItemControl()->SetText(buf); } diff --git a/src/xrGame/ui/UISpinNum.cpp b/src/xrGame/ui/UISpinNum.cpp index 5f4f030bc0e..5d6d428fc0b 100644 --- a/src/xrGame/ui/UISpinNum.cpp +++ b/src/xrGame/ui/UISpinNum.cpp @@ -77,7 +77,7 @@ void CUISpinNum::OnBtnDownClick() void CUISpinNum::SetValue(int v) { string16 buff; - m_pLines->SetText(_itoa(v, buff, 10)); + m_pLines->SetText(xr_itoa(v, buff, 10)); } bool CUISpinNum::CanPressUp() { return m_iVal + m_iStep <= m_iMax; } diff --git a/src/xrGame/ui/UIXmlInit.cpp b/src/xrGame/ui/UIXmlInit.cpp index c3aa836bee3..6078530058d 100644 --- a/src/xrGame/ui/UIXmlInit.cpp +++ b/src/xrGame/ui/UIXmlInit.cpp @@ -120,13 +120,13 @@ bool CUIXmlInit::InitOptionsItem(CUIXml& xml_doc, LPCSTR path, int index, CUIOpt { CUIOptionsItem::ESystemDepends d = CUIOptionsItem::sdNothing; - if (0 == _stricmp(depends, "vid")) + if (0 == xr_stricmp(depends, "vid")) d = CUIOptionsItem::sdVidRestart; - else if (0 == _stricmp(depends, "snd")) + else if (0 == xr_stricmp(depends, "snd")) d = CUIOptionsItem::sdSndRestart; - else if (0 == _stricmp(depends, "restart")) + else if (0 == xr_stricmp(depends, "restart")) d = CUIOptionsItem::sdSystemRestart; - else if (0 == _stricmp(depends, "runtime")) + else if (0 == xr_stricmp(depends, "runtime")) d = CUIOptionsItem::sdApplyOnChange; else Msg("! unknown param [%s] in optionsItem [%s]", depends, entry.c_str()); @@ -543,19 +543,19 @@ bool CUIXmlInit::InitProgressBar(CUIXml& xml_doc, LPCSTR path, int index, CUIPro { mode = CUIProgressBar::om_horz; } - else if (_stricmp(mode_str, "horz") == 0) + else if (xr_stricmp(mode_str, "horz") == 0) { mode = CUIProgressBar::om_horz; } - else if (_stricmp(mode_str, "vert") == 0) + else if (xr_stricmp(mode_str, "vert") == 0) { mode = CUIProgressBar::om_vert; } - else if (_stricmp(mode_str, "back") == 0) + else if (xr_stricmp(mode_str, "back") == 0) { mode = CUIProgressBar::om_back; } - else if (_stricmp(mode_str, "down") == 0) + else if (xr_stricmp(mode_str, "down") == 0) { mode = CUIProgressBar::om_down; } @@ -662,7 +662,7 @@ void CUIXmlInit::InitAutoStaticGroup(CUIXml& xml_doc, LPCSTR path, int index, CU while (node) { LPCSTR node_name = node.value(); - if (0 == _stricmp(node_name, "auto_static")) + if (0 == xr_stricmp(node_name, "auto_static")) { CUIStatic* pUIStatic = new CUIStatic(); InitStatic(xml_doc, "auto_static", cnt_static, pUIStatic); @@ -673,7 +673,7 @@ void CUIXmlInit::InitAutoStaticGroup(CUIXml& xml_doc, LPCSTR path, int index, CU ++cnt_static; } - else if (0 == _stricmp(node_name, "auto_frameline")) + else if (0 == xr_stricmp(node_name, "auto_frameline")) { CUIFrameLineWnd* pUIFrameline = new CUIFrameLineWnd(); InitFrameLine(xml_doc, "auto_frameline", cnt_frameline, pUIFrameline); @@ -684,7 +684,7 @@ void CUIXmlInit::InitAutoStaticGroup(CUIXml& xml_doc, LPCSTR path, int index, CU ++cnt_frameline; } - else if (0 == _stricmp(node_name, "auto_text")) + else if (0 == xr_stricmp(node_name, "auto_text")) { ++cnt_text; } diff --git a/src/xrGame/xrGameSpyServer.cpp b/src/xrGame/xrGameSpyServer.cpp index 2507b4ba4a8..3e41f164dfb 100644 --- a/src/xrGame/xrGameSpyServer.cpp +++ b/src/xrGame/xrGameSpyServer.cpp @@ -258,9 +258,9 @@ void xrGameSpyServer::GetServerInfo(CServerInfo* si) si->AddItem("Server name", HostName.c_str(), RGB(128, 128, 255)); si->AddItem("Map", MapName.c_str(), RGB(255, 0, 128)); - xr_strcpy(tmp, _itoa(GetPlayersCount(), tmp2, 10)); + xr_strcpy(tmp, xr_itoa(GetPlayersCount(), tmp2, 10)); xr_strcat(tmp, " / "); - xr_strcat(tmp, _itoa(m_iMaxPlayers, tmp2, 10)); + xr_strcat(tmp, xr_itoa(m_iMaxPlayers, tmp2, 10)); si->AddItem("Players", tmp, RGB(255, 128, 255)); string256 res; @@ -281,6 +281,6 @@ void xrGameSpyServer::GetServerInfo(CServerInfo* si) } si->AddItem("Access to server", res, RGB(200, 155, 155)); - si->AddItem("GameSpy port", _itoa(iGameSpyBasePort, tmp, 10), RGB(200, 5, 155)); + si->AddItem("GameSpy port", xr_itoa(iGameSpyBasePort, tmp, 10), RGB(200, 5, 155)); inherited::GetServerInfo(si); } diff --git a/src/xrGame/xrServer.cpp b/src/xrGame/xrServer.cpp index f2352c61dc9..ae055a07432 100644 --- a/src/xrGame/xrServer.cpp +++ b/src/xrGame/xrServer.cpp @@ -646,7 +646,7 @@ u32 xrServer::OnMessage(NET_Packet& P, ClientID sender) // Non-Zero means broadc shared_str user; shared_str pass; P.r_stringZ(user); - if (0 == _stricmp(user.c_str(), "logoff")) + if (0 == xr_stricmp(user.c_str(), "logoff")) { CL->m_admin_rights.m_has_admin_rights = FALSE; if (CL->ps) @@ -1074,7 +1074,7 @@ void xrServer::GetServerInfo(CServerInfo* si) string32 tmp; string256 tmp256; - si->AddItem("Server port", _itoa(GetPort(), tmp, 10), RGB(128, 128, 255)); + si->AddItem("Server port", xr_itoa(GetPort(), tmp, 10), RGB(128, 128, 255)); LPCSTR time = InventoryUtilities::GetTimeAsString(Device.dwTimeGlobal, InventoryUtilities::etpTimeToSecondsAndDay).c_str(); si->AddItem("Uptime", time, RGB(255, 228, 0)); @@ -1084,13 +1084,13 @@ void xrServer::GetServerInfo(CServerInfo* si) if (game->Type() == eGameIDDeathmatch || game->Type() == eGameIDTeamDeathmatch) { xr_strcat(tmp256, " ["); - xr_strcat(tmp256, _itoa(g_sv_dm_dwFragLimit, tmp, 10)); + xr_strcat(tmp256, xr_itoa(g_sv_dm_dwFragLimit, tmp, 10)); xr_strcat(tmp256, "] "); } else if (game->Type() == eGameIDArtefactHunt || game->Type() == eGameIDCaptureTheArtefact) { xr_strcat(tmp256, " ["); - xr_strcat(tmp256, _itoa(g_sv_ah_dwArtefactsNum, tmp, 10)); + xr_strcat(tmp256, xr_itoa(g_sv_ah_dwArtefactsNum, tmp, 10)); xr_strcat(tmp256, "] "); g_sv_ah_iReinforcementTime; } @@ -1098,13 +1098,13 @@ void xrServer::GetServerInfo(CServerInfo* si) // if ( g_sv_dm_dwTimeLimit > 0 ) { xr_strcat(tmp256, " time limit ["); - xr_strcat(tmp256, _itoa(g_sv_dm_dwTimeLimit, tmp, 10)); + xr_strcat(tmp256, xr_itoa(g_sv_dm_dwTimeLimit, tmp, 10)); xr_strcat(tmp256, "] "); } if (game->Type() == eGameIDArtefactHunt || game->Type() == eGameIDCaptureTheArtefact) { xr_strcat(tmp256, " RT ["); - xr_strcat(tmp256, _itoa(g_sv_ah_iReinforcementTime, tmp, 10)); + xr_strcat(tmp256, xr_itoa(g_sv_ah_iReinforcementTime, tmp, 10)); xr_strcat(tmp256, "]"); } si->AddItem("Game type", tmp256, RGB(128, 255, 255)); @@ -1117,7 +1117,7 @@ void xrServer::GetServerInfo(CServerInfo* si) if (g_sv_mp_iDumpStatsPeriod > 0) { xr_strcat(tmp256, " statistic ["); - xr_strcat(tmp256, _itoa(g_sv_mp_iDumpStatsPeriod, tmp, 10)); + xr_strcat(tmp256, xr_itoa(g_sv_mp_iDumpStatsPeriod, tmp, 10)); xr_strcat(tmp256, "]"); if (g_bCollectStatisticData) { diff --git a/src/xrGame/xr_level_controller.cpp b/src/xrGame/xr_level_controller.cpp index cc1d8843275..a014464222e 100644 --- a/src/xrGame/xr_level_controller.cpp +++ b/src/xrGame/xr_level_controller.cpp @@ -151,7 +151,7 @@ _action* action_name_to_ptr(LPCSTR _name) int idx = 0; while (actions[idx].action_name) { - if (!_stricmp(_name, actions[idx].action_name)) + if (!xr_stricmp(_name, actions[idx].action_name)) return &actions[idx]; ++idx; } @@ -195,7 +195,7 @@ _keyboard* keyname_to_ptr(LPCSTR _name) while (keyboards[idx].key_name) { _keyboard& kb = keyboards[idx]; - if (!_stricmp(_name, kb.key_name)) + if (!xr_stricmp(_name, kb.key_name)) return &keyboards[idx]; ++idx; } diff --git a/src/xrGameSpy/GameSpy_GCD_Client.cpp b/src/xrGameSpy/GameSpy_GCD_Client.cpp index 5538549cfea..e844d9b31ae 100644 --- a/src/xrGameSpy/GameSpy_GCD_Client.cpp +++ b/src/xrGameSpy/GameSpy_GCD_Client.cpp @@ -4,5 +4,5 @@ void CGameSpy_GCD_Client::CreateRespond(char* cdkey, char* RespondStr, char* ChallengeStr, u8 Reauth) { gcd_compute_response( - _strupr(cdkey), ChallengeStr, RespondStr, Reauth == 1 ? CDResponseMethod_REAUTH : CDResponseMethod_NEWAUTH); + xr_strupr(cdkey), ChallengeStr, RespondStr, Reauth == 1 ? CDResponseMethod_REAUTH : CDResponseMethod_NEWAUTH); } diff --git a/src/xrNetServer/NET_Client.cpp b/src/xrNetServer/NET_Client.cpp index bdefecb57cf..def15f2ec24 100644 --- a/src/xrNetServer/NET_Client.cpp +++ b/src/xrNetServer/NET_Client.cpp @@ -506,7 +506,7 @@ bool IPureClient::Connect(pcstr options) R_CHK(NET->SetClientInfo(&Pinfo, nullptr, nullptr, DPNSETCLIENTINFO_SYNC)); } - if (_stricmp(server_name, "localhost") == 0) + if (xr_stricmp(server_name, "localhost") == 0) { WCHAR SessionPasswordUNICODE[4096]; if (xr_strlen(password_str)) diff --git a/src/xrNetServer/NET_Server.cpp b/src/xrNetServer/NET_Server.cpp index 92537c77afc..77a8f37ac83 100644 --- a/src/xrNetServer/NET_Server.cpp +++ b/src/xrNetServer/NET_Server.cpp @@ -496,7 +496,7 @@ HRESULT IPureServer::net_Handler(u32 dwMessageType, PVOID pMessage) PDPNMSG_ENUM_HOSTS_QUERY msg = PDPNMSG_ENUM_HOSTS_QUERY(pMessage); if (0 == msg->dwReceivedDataSize) return S_FALSE; - if (!_stricmp((pcstr)msg->pvReceivedData, "ToConnect")) + if (!xr_stricmp((pcstr)msg->pvReceivedData, "ToConnect")) return S_OK; if (*((const GUID*)msg->pvReceivedData) != NET_GUID) return S_FALSE; diff --git a/src/xrPhysics/MathUtils.cpp b/src/xrPhysics/MathUtils.cpp index bfdb27b28ff..e30289bc8c8 100644 --- a/src/xrPhysics/MathUtils.cpp +++ b/src/xrPhysics/MathUtils.cpp @@ -307,8 +307,8 @@ IC bool RAYvsCYLINDER(const Fcylinder& c_cylinder, const Fvector& S, const Fvect float sq_sphere_dist = sq_sin * tc_h * tc_h; // if(sq_sphere_dist>sq_horde)return false ; float tr_c = tr - tc_h * cs; - float diff = _sqrt(sq_horde - sq_sphere_dist); - tr2 = tr_c + diff; + float diff2 = _sqrt(sq_horde - sq_sphere_dist); + tr2 = tr_c + diff2; if (tr2 < 0.f) return false; // if (tr2 < R) @@ -342,8 +342,8 @@ IC bool RAYvsCYLINDER(const Fcylinder& c_cylinder, const Fvector& S, const Fvect return false; else { - float diff = c_diff / cs; - tr2 = tr + diff; + float diff2 = c_diff / cs; + tr2 = tr + diff2; if (tr2 < 0.f) return false; // if (tr2 < R) @@ -373,10 +373,10 @@ IC bool RAYvsCYLINDER(const Fcylinder& c_cylinder, const Fvector& S, const Fvect return false; else { - float tc_h = tc - h; - float tr_c = tr - tc_h * cs; - float diff = _sqrt(sq_horde - sq_sin * tc_h * tc_h); - tr2 = tr_c + diff; + float tc_h2 = tc - h; + float tr_c2 = tr - tc_h2 * cs; + float diff2 = _sqrt(sq_horde - sq_sin * tc_h2 * tc_h2); + tr2 = tr_c2 + diff2; if (tr2 < R) { R = tr2; @@ -571,32 +571,32 @@ void capped_cylinder_ray_collision_test() t.Start(); for (int i = 0; i < 1000000; i++) { - Fcylinder c; - c.m_center.random_point(Fvector().set(2, 2, 2)); - c.m_direction.random_dir(); - c.m_height = Random.randF(0.2f, 2.f); - c.m_radius = Random.randF(0.1f, 2.f); + Fcylinder c2; + c2.m_center.random_point(Fvector().set(2, 2, 2)); + c2.m_direction.random_dir(); + c2.m_height = Random.randF(0.2f, 2.f); + c2.m_radius = Random.randF(0.1f, 2.f); // ray - Fvector dir, pos; + Fvector dir2, pos2; float R = Random.randF(0.1f, 2.f); - dir.random_dir(); - pos.random_point(Fvector().set(2, 2, 2)); - RAYvsCYLINDER(c, pos, dir, R, TRUE); + dir2.random_dir(); + pos2.random_point(Fvector().set(2, 2, 2)); + RAYvsCYLINDER(c, pos2, dir2, R, TRUE); } Msg("my RAYvsCYLINDE time %f ms", t.GetElapsed_sec() * 1000.f); t.Start(); for (int i = 0; i < 1000000; i++) { - Fcylinder c; - c.m_center.random_point(Fvector().set(2, 2, 2)); - c.m_direction.random_dir(); - c.m_height = Random.randF(0.2f, 2.f); - c.m_radius = Random.randF(0.1f, 2.f); + Fcylinder c2; + c2.m_center.random_point(Fvector().set(2, 2, 2)); + c2.m_direction.random_dir(); + c2.m_height = Random.randF(0.2f, 2.f); + c2.m_radius = Random.randF(0.1f, 2.f); // ray - Fvector dir, pos; // float R=Random.randF(0.1f,2.f); - dir.random_dir(); - pos.random_point(Fvector().set(2, 2, 2)); - c.intersect(pos, dir, ir, code); + Fvector dir2, pos2; // float R=Random.randF(0.1f,2.f); + dir2.random_dir(); + pos2.random_point(Fvector().set(2, 2, 2)); + c.intersect(pos2, dir2, ir, code); } Msg("current intersect time %f ms", t.GetElapsed_sec() * 1000.f); } diff --git a/src/xrPhysics/PHUpdateObject.h b/src/xrPhysics/PHUpdateObject.h index f8660d3f4a8..896de797e0a 100644 --- a/src/xrPhysics/PHUpdateObject.h +++ b/src/xrPhysics/PHUpdateObject.h @@ -1,5 +1,6 @@ #pragma once #include "PHItemList.h" +#include "xrPhysics.h" class CPhysicsShell; class XRPHYSICS_API CPHUpdateObject diff --git a/src/xrScriptEngine/script_debugger.cpp b/src/xrScriptEngine/script_debugger.cpp index e0cc49464d4..f1bba9523bb 100644 --- a/src/xrScriptEngine/script_debugger.cpp +++ b/src/xrScriptEngine/script_debugger.cpp @@ -378,7 +378,7 @@ bool CScriptDebugger::HasBreakPoint(const char* fileName, s32 lineNum) for (u32 i = 0; i < m_breakPoints.size(); i++) { SBreakPoint bp(m_breakPoints[i]); - if (bp.nLine == lineNum && xr_strlen(bp.fileName) == xr_strlen(sFileName) && !_stricmp(*bp.fileName, sFileName)) + if (bp.nLine == lineNum && xr_strlen(bp.fileName) == xr_strlen(sFileName) && !xr_stricmp(*bp.fileName, sFileName)) return true; } return false; diff --git a/src/xrScriptEngine/script_lua_helper.cpp b/src/xrScriptEngine/script_lua_helper.cpp index 70125c42847..9588d40783e 100644 --- a/src/xrScriptEngine/script_lua_helper.cpp +++ b/src/xrScriptEngine/script_lua_helper.cpp @@ -235,7 +235,7 @@ void CDbgLuaHelper::DrawStackTrace() xr_strcat(szDesc, " "); } char szTmp[6]; - xr_strcat(szDesc, _itoa(ar.currentline, szTmp, 10)); + xr_strcat(szDesc, xr_itoa(ar.currentline, szTmp, 10)); xr_strcat(szDesc, " "); if (ar.short_src) xr_strcat(szDesc, ar.short_src); diff --git a/src/xrServerEntities/alife_space.cpp b/src/xrServerEntities/alife_space.cpp index 6ad646e4328..35ecadf9ed5 100644 --- a/src/xrServerEntities/alife_space.cpp +++ b/src/xrServerEntities/alife_space.cpp @@ -22,27 +22,27 @@ const xr_token hit_types_token[] = EHitType g_tfString2HitType(LPCSTR caHitType) { - if (!_stricmp(caHitType, "burn")) + if (!xr_stricmp(caHitType, "burn")) return eHitTypeBurn; - if (!_stricmp(caHitType, "light_burn")) + if (!xr_stricmp(caHitType, "light_burn")) return eHitTypeLightBurn; - if (!_stricmp(caHitType, "shock")) + if (!xr_stricmp(caHitType, "shock")) return eHitTypeShock; - if (!_stricmp(caHitType, "strike")) + if (!xr_stricmp(caHitType, "strike")) return eHitTypeStrike; - if (!_stricmp(caHitType, "wound")) + if (!xr_stricmp(caHitType, "wound")) return eHitTypeWound; - if (!_stricmp(caHitType, "radiation")) + if (!xr_stricmp(caHitType, "radiation")) return eHitTypeRadiation; - if (!_stricmp(caHitType, "telepatic")) + if (!xr_stricmp(caHitType, "telepatic")) return eHitTypeTelepatic; - if (!_stricmp(caHitType, "fire_wound")) + if (!xr_stricmp(caHitType, "fire_wound")) return eHitTypeFireWound; - if (!_stricmp(caHitType, "chemical_burn")) + if (!xr_stricmp(caHitType, "chemical_burn")) return eHitTypeChemicalBurn; - if (!_stricmp(caHitType, "explosion")) + if (!xr_stricmp(caHitType, "explosion")) return eHitTypeExplosion; - if (!_stricmp(caHitType, "wound_2")) + if (!xr_stricmp(caHitType, "wound_2")) return eHitTypeWound_2; FATAL("Unsupported hit type!"); diff --git a/src/xrServerEntities/xrServer_Objects_ALife.cpp b/src/xrServerEntities/xrServer_Objects_ALife.cpp index e83e95e9843..ddaa2d45c2d 100644 --- a/src/xrServerEntities/xrServer_Objects_ALife.cpp +++ b/src/xrServerEntities/xrServer_Objects_ALife.cpp @@ -127,7 +127,7 @@ void SFillPropData::load() { VERIFY(locations[i].empty()); string256 caSection, T; - strconcat(sizeof(caSection), caSection, SECTION_HEADER, _itoa(i, T, 10)); + strconcat(sizeof(caSection), caSection, SECTION_HEADER, xr_itoa(i, T, 10)); R_ASSERT(Ini->section_exist(caSection)); for (k = 0; Ini->r_line(caSection, k, &N, &V); ++k) locations[i].push_back(xr_rtoken(V, atoi(N))); diff --git a/src/xrServerEntities/xrServer_Objects_ALife.h b/src/xrServerEntities/xrServer_Objects_ALife.h index 7e89065a0bf..b6ef6d2b14c 100644 --- a/src/xrServerEntities/xrServer_Objects_ALife.h +++ b/src/xrServerEntities/xrServer_Objects_ALife.h @@ -8,12 +8,12 @@ #ifndef xrServer_Objects_ALifeH #define xrServer_Objects_ALifeH -#include "pch_script.h" +//#include "pch_script.h" - No, no NO! #include "xrServer_Objects.h" #include "alife_space.h" #include "xrAICore/Navigation/game_graph_space.h" #ifdef XRGAME_EXPORTS -#include "alife_smart_terrain_task.h" +#include "xrGame/alife_smart_terrain_task.h" #endif //#ifdef XRGAME_EXPORTS #pragma warning(push) diff --git a/src/xrServerEntities/xrServer_Objects_ALife_Items.h b/src/xrServerEntities/xrServer_Objects_ALife_Items.h index a96b6be0ad3..8956140912d 100644 --- a/src/xrServerEntities/xrServer_Objects_ALife_Items.h +++ b/src/xrServerEntities/xrServer_Objects_ALife_Items.h @@ -1,6 +1,6 @@ #pragma once //////////////////////////////////////////////////////////////////////////// -// Module : xrServer_Objects_ALife.h +// Module : xrServer_Objects_ALife_Items.h // Created : 19.09.2002 // Modified : 04.06.2003 // Author : Oles Shyshkovtsov, Alexander Maksimchuk, Victor Reutskiy and Dmitriy Iassenev diff --git a/src/xrServerEntities/xrServer_Objects_ALife_Monsters.cpp b/src/xrServerEntities/xrServer_Objects_ALife_Monsters.cpp index 8d7bdff86be..5bdb335b313 100644 --- a/src/xrServerEntities/xrServer_Objects_ALife_Monsters.cpp +++ b/src/xrServerEntities/xrServer_Objects_ALife_Monsters.cpp @@ -446,14 +446,14 @@ void CSE_ALifeTraderAbstract::set_specific_character(shared_str new_spec_char) xr_string n = "name_"; n += subset; n += "_"; - n += _itoa(::Random.randI(name_cnt), S, 10); + n += xr_itoa(::Random.randI(name_cnt), S, 10); m_character_name = *(CStringTable().translate(n.c_str())); m_character_name += " "; n = "lname_"; n += subset; n += "_"; - n += _itoa(::Random.randI(last_name_cnt), S, 10); + n += xr_itoa(::Random.randI(last_name_cnt), S, 10); m_character_name += *(CStringTable().translate(n.c_str())); } u32 min_m = selected_char.MoneyDef().min_money; diff --git a/src/xrSound/OpenALDeviceList.cpp b/src/xrSound/OpenALDeviceList.cpp index fd14687923c..8b0b6da1057 100644 --- a/src/xrSound/OpenALDeviceList.cpp +++ b/src/xrSound/OpenALDeviceList.cpp @@ -85,7 +85,7 @@ void ALDeviceList::Enumerate() // Also we assume that if "Generic Hardware" exists, than "Generic Software" is also exists // Maybe wrong - if (0 == _stricmp(m_defaultDeviceName, AL_GENERIC_HARDWARE)) + if (0 == xr_stricmp(m_defaultDeviceName, AL_GENERIC_HARDWARE)) { xr_strcpy(m_defaultDeviceName, AL_GENERIC_SOFTWARE); Msg("SOUND: OpenAL: default SndDevice name set to %s", m_defaultDeviceName); @@ -164,7 +164,7 @@ void ALDeviceList::Enumerate() { GetDeviceVersion(j, &majorVersion, &minorVersion); Msg("%d. %s, Spec Version %d.%d %s eax[%d] efx[%s] xram[%s]", j + 1, GetDeviceName(j), majorVersion, - minorVersion, _stricmp(GetDeviceName(j), m_defaultDeviceName) == 0 ? "(default)" : "", + minorVersion, xr_stricmp(GetDeviceName(j), m_defaultDeviceName) == 0 ? "(default)" : "", GetDeviceDesc(j).props.eax, GetDeviceDesc(j).props.efx ? "yes" : "no", GetDeviceDesc(j).props.xram ? "yes" : "no"); } @@ -186,7 +186,7 @@ void ALDeviceList::SelectBestDevice() u32 new_device_id = snd_device_id; for (u32 i = 0; i < GetNumDevices(); ++i) { - if (_stricmp(m_defaultDeviceName, GetDeviceName(i)) != 0) + if (xr_stricmp(m_defaultDeviceName, GetDeviceName(i)) != 0) continue; GetDeviceVersion(i, &majorVersion, &minorVersion); diff --git a/src/xrSound/SoundRender_Core_SourceManager.cpp b/src/xrSound/SoundRender_Core_SourceManager.cpp index 289c05d398c..21436f87ac9 100644 --- a/src/xrSound/SoundRender_Core_SourceManager.cpp +++ b/src/xrSound/SoundRender_Core_SourceManager.cpp @@ -8,7 +8,7 @@ CSoundRender_Source* CSoundRender_Core::i_create_source(pcstr name) // Search string256 id; xr_strcpy(id, name); - _strlwr(id); + xr_strlwr(id); if (strext(id)) *strext(id) = 0; for (u32 it = 0; it < s_sources.size(); it++) diff --git a/src/xrSound/SoundRender_Environment.cpp b/src/xrSound/SoundRender_Environment.cpp index 70ee36a01a0..bb8336b9826 100644 --- a/src/xrSound/SoundRender_Environment.cpp +++ b/src/xrSound/SoundRender_Environment.cpp @@ -184,14 +184,14 @@ void SoundEnvironment_LIB::Unload() int SoundEnvironment_LIB::GetID(pcstr name) { for (auto it = library.begin(); it != library.end(); ++it) - if (0 == _stricmp(name, *(*it)->name)) + if (0 == xr_stricmp(name, *(*it)->name)) return int(it - library.begin()); return -1; } CSoundRender_Environment* SoundEnvironment_LIB::Get(pcstr name) { for (const auto& it : library) - if (0 == _stricmp(name, *it->name)) + if (0 == xr_stricmp(name, *it->name)) return it; return nullptr; } @@ -204,7 +204,7 @@ CSoundRender_Environment* SoundEnvironment_LIB::Append(CSoundRender_Environment* void SoundEnvironment_LIB::Remove(pcstr name) { for (auto it = library.begin(); it != library.end(); ++it) - if (0 == _stricmp(name, *(*it)->name)) + if (0 == xr_stricmp(name, *(*it)->name)) { xr_delete(*it); library.erase(it); diff --git a/src/xrSound/SoundRender_Source_loader.cpp b/src/xrSound/SoundRender_Source_loader.cpp index d56267f447d..98e24436d99 100644 --- a/src/xrSound/SoundRender_Source_loader.cpp +++ b/src/xrSound/SoundRender_Source_loader.cpp @@ -126,7 +126,7 @@ void CSoundRender_Source::load(pcstr name) { string_path fn, N; xr_strcpy(N, name); - _strlwr(N); + xr_strlwr(N); if (strext(N)) *strext(N) = 0;