Skip to content

Commit 00d1502

Browse files
Im-dexIm-dex
committed
- fixed utilities and editor projects build (exclude projects depending on nvDXT)
1 parent 762e050 commit 00d1502

Some content is hidden

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

52 files changed

+140
-141
lines changed

‎code/SDK/include/luabind/object.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ namespace luabind
129129
rhs.m_called = true;
130130
}
131131

132-
~proxy_caller();
132+
~proxy_caller() noexcept(false); // TODO: noexcept depends on configuration
133133
operator object();
134134

135135
template<typename... Policies>
@@ -1238,7 +1238,7 @@ namespace luabind
12381238

12391239

12401240
template<typename... Ts>
1241-
proxy_caller<Ts...>::~proxy_caller()
1241+
proxy_caller<Ts...>::~proxy_caller() noexcept(false) // TODO: noexcept depends on configuration
12421242
{
12431243
if (m_called) return;
12441244

‎code/engine.vc2008/engine.sln

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -524,8 +524,8 @@ Global
524524
{EA5932F3-02FE-4AD3-89E8-7072DC465D25}.DebugMT_oaMan|x64.ActiveCfg = Debug|Win32
525525
{EA5932F3-02FE-4AD3-89E8-7072DC465D25}.Mixed_Dedicated|Win32.ActiveCfg = Mixed|Win32
526526
{EA5932F3-02FE-4AD3-89E8-7072DC465D25}.Mixed_Dedicated|x64.ActiveCfg = Mixed|Win32
527-
{EA5932F3-02FE-4AD3-89E8-7072DC465D25}.Mixed|Win32.ActiveCfg = Mixed|Win32
528-
{EA5932F3-02FE-4AD3-89E8-7072DC465D25}.Mixed|Win32.Build.0 = Mixed|Win32
527+
{EA5932F3-02FE-4AD3-89E8-7072DC465D25}.Mixed|Win32.ActiveCfg = Release|Win32
528+
{EA5932F3-02FE-4AD3-89E8-7072DC465D25}.Mixed|Win32.Build.0 = Release|Win32
529529
{EA5932F3-02FE-4AD3-89E8-7072DC465D25}.Mixed|x64.ActiveCfg = Mixed|Win32
530530
{EA5932F3-02FE-4AD3-89E8-7072DC465D25}.Release Multithreaded|Win32.ActiveCfg = Release|Win32
531531
{EA5932F3-02FE-4AD3-89E8-7072DC465D25}.Release Multithreaded|Win32.Build.0 = Release|Win32

‎code/engine.vc2008/utils/CompressionTest/CompressionTest.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
5151
<ClCompile>
5252
<Optimization>Disabled</Optimization>
53-
<AdditionalIncludeDirectories>../../../sdk/include/stlport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
53+
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
5454
<PreprocessorDefinitions>WIN32;DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5555
<MinimalRebuild>true</MinimalRebuild>
5656
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -74,7 +74,7 @@
7474
</ItemDefinitionGroup>
7575
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
7676
<ClCompile>
77-
<AdditionalIncludeDirectories>../../../sdk/include/stlport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
77+
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
7878
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7979
<ExceptionHandling>
8080
</ExceptionHandling>

‎code/engine.vc2008/utils/ETools/CreateDX.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,10 +188,11 @@ extern "C"{
188188
return D3DXGetFVFVertexSize(FVF);
189189
}
190190

191-
ETOOLS_API const char* WINAPI DX_GetErrorDescription(HRESULT hr)
191+
// TODO:
192+
/*ETOOLS_API const char* WINAPI DX_GetErrorDescription(HRESULT hr)
192193
{
193194
return DXGetErrorDescription(hr);
194-
}
195+
}*/
195196
ETOOLS_API D3DXMATRIX* WINAPI
196197
D3DX_MatrixInverse(
197198
D3DXMATRIX *pOut,

‎code/engine.vc2008/utils/ETools/ETools.vcxproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<OmitFramePointers>true</OmitFramePointers>
8383
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
8484
<WholeProgramOptimization>true</WholeProgramOptimization>
85-
<AdditionalIncludeDirectories>../../../sdk/include/stlport;../../../sdk/include/;../xrQslim/src/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
85+
<AdditionalIncludeDirectories>../../../sdk/include/;../xrQslim/src/;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8686
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;ETOOLS_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8787
<StringPooling>true</StringPooling>
8888
<ExceptionHandling>
@@ -111,9 +111,9 @@
111111
</ResourceCompile>
112112
<Link>
113113
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
114-
<AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;libvorbisenc_static.lib;libvorbisfile_static.lib;%(AdditionalDependencies)</AdditionalDependencies>
114+
<AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;vorbisenc.lib;libvorbisfile_static.lib;%(AdditionalDependencies)</AdditionalDependencies>
115115
<SuppressStartupBanner>false</SuppressStartupBanner>
116-
<AdditionalLibraryDirectories>..\..\..\sdk\libraries;..\..\..\..\libraries;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
116+
<AdditionalLibraryDirectories>..\..\..\sdk\libraries\$(Configuration);..\..\..\..\libraries\$(Configuration);..\..\..\..\libraries;$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
117117
<IgnoreSpecificDefaultLibraries>user32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
118118
<GenerateDebugInformation>true</GenerateDebugInformation>
119119
<ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
@@ -141,7 +141,7 @@
141141
<ClCompile>
142142
<Optimization>Disabled</Optimization>
143143
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
144-
<AdditionalIncludeDirectories>../../../sdk/include/stlport;../../../sdk/include/;../xrQslim/src/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
144+
<AdditionalIncludeDirectories>../../../sdk/include/;../xrQslim/src/;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
145145
<PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;ETOOLS_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
146146
<ExceptionHandling>Sync</ExceptionHandling>
147147
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -169,9 +169,9 @@
169169
</ResourceCompile>
170170
<Link>
171171
<AdditionalOptions>/MACHINE:I386 /NODEFAULTLIB:LIBCMTD %(AdditionalOptions)</AdditionalOptions>
172-
<AdditionalDependencies>libogg_static_d.lib;libvorbis_static_d.lib;libvorbisenc_static.lib;libvorbisfile_static_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
172+
<AdditionalDependencies>libogg_static_d.lib;libvorbis_static_d.lib;vorbisenc.lib;libvorbisfile_static_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
173173
<SuppressStartupBanner>true</SuppressStartupBanner>
174-
<AdditionalLibraryDirectories>..\..\..\sdk\libraries;..\..\..\..\libraries;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
174+
<AdditionalLibraryDirectories>..\..\..\sdk\libraries\$(Configuration);..\..\..\..\libraries\$(Configuration);..\..\..\..\libraries;$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
175175
<IgnoreSpecificDefaultLibraries>user32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
176176
<GenerateDebugInformation>true</GenerateDebugInformation>
177177
<GenerateMapFile>false</GenerateMapFile>
@@ -199,7 +199,7 @@
199199
<IntrinsicFunctions>true</IntrinsicFunctions>
200200
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
201201
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
202-
<AdditionalIncludeDirectories>../../../sdk/include/stlport;../../../sdk/include/;../xrQslim/src/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
202+
<AdditionalIncludeDirectories>../../../sdk/include/;../xrQslim/src/;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
203203
<PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;ETOOLS_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
204204
<StringPooling>true</StringPooling>
205205
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -225,9 +225,9 @@
225225
</ResourceCompile>
226226
<Link>
227227
<AdditionalOptions>/MACHINE:I386 /NODEFAULTLIB:user32 %(AdditionalOptions)</AdditionalOptions>
228-
<AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;libvorbisenc_static.lib;libvorbisfile_static.lib;%(AdditionalDependencies)</AdditionalDependencies>
228+
<AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;vorbisenc.lib;libvorbisfile_static.lib;%(AdditionalDependencies)</AdditionalDependencies>
229229
<SuppressStartupBanner>true</SuppressStartupBanner>
230-
<AdditionalLibraryDirectories>..\..\..\sdk\libraries;..\..\..\..\libraries;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
230+
<AdditionalLibraryDirectories>..\..\..\sdk\libraries\$(Configuration);..\..\..\..\libraries\$(Configuration);..\..\..\..\libraries;$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
231231
<IgnoreSpecificDefaultLibraries>user32.dll;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
232232
<GenerateDebugInformation>true</GenerateDebugInformation>
233233
<GenerateMapFile>false</GenerateMapFile>

‎code/engine.vc2008/utils/ETools/Intersect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ bool intersect( const Fobb& box ,const Fvector& origin, const Fvector &direction
9090
Fvector kDirection;
9191
kDirection.set(direction.dotproduct(box.m_rotate.i),direction.dotproduct(box.m_rotate.j),direction.dotproduct(box.m_rotate.k));
9292

93-
float fT0 = 0.0f, fT1 = type_max(float);
93+
float fT0 = 0.0f, fT1 = type_max<float>;
9494
box_axis ax0 = a_none;
9595
box_axis ax1 = a_none;
9696
box_axis ax = a_none;

‎code/engine.vc2008/utils/ETools/object_sliding.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void OptimiseVertexCoherencyTriList (WORD* pwList, int iHowManyTris, u32 optimiz
2424
DWORD* remap = xr_alloc<DWORD> (iHowManyTris);
2525
WORD max_idx = 0;
2626
for (int k=0; k<iHowManyTris*3; k++)
27-
max_idx = _max(max_idx,pwList[k]);
27+
max_idx = std::max(max_idx,pwList[k]);
2828
HRESULT rhr = D3DXOptimizeFaces (pwList,iHowManyTris,max_idx+1,FALSE,remap);
2929
R_CHK (rhr);
3030
WORD* tmp = xr_alloc<WORD> (iHowManyTris*3);
@@ -349,7 +349,7 @@ BOOL CalculateSW(Object* object, VIPM_Result* result, u32 optimize_vertex_order)
349349
VIPM_SWR *swr = result->swr_records.item ( i );
350350
for ( int j = 0; j < swr->num_tris * 3; j++ ){
351351
R_ASSERT ( (j+swr->offset) < result->indices.size() );
352-
swr->num_verts = _max(swr->num_verts,*(result->indices.item(j+swr->offset))); // fignya index ne doljen bit bolshe!!!
352+
swr->num_verts = std::max(swr->num_verts,*(result->indices.item(j+swr->offset))); // fignya index ne doljen bit bolshe!!!
353353
//. R_ASSERT ( *(result->indices.item(j+swr->offset)) < swr->num_verts );
354354
if (*(result->indices.item(j+swr->offset)) >= swr->num_verts){
355355
bRes = FALSE;

‎code/engine.vc2008/utils/ctool/PPMTrain.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include <windows.h>
1111
#pragma hdrstop
1212
#include "PPMT_SA.hpp"
13-
#include "../../xrcore/_types.h"
1413

1514
const int MAX_O=8;
1615
const int UP_FREQ=5, INT_BITS=7, PERIOD_BITS=7, TOT_BITS=INT_BITS+PERIOD_BITS,

‎code/engine.vc2008/utils/ctool/ctool.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <algorithm>
1010
#include <string>
1111
#define WIN32_LEAN_AND_MEAN
12+
#define NOMINMAX
1213
#include <windows.h>
1314

1415
using namespace std;

‎code/engine.vc2008/utils/ctool/ctool.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
5050
<ClCompile>
5151
<Optimization>Disabled</Optimization>
52-
<AdditionalIncludeDirectories>../../../sdk/include/stlport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
52+
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
5353
<PreprocessorDefinitions>WIN32;DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5454
<MinimalRebuild>true</MinimalRebuild>
5555
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -71,7 +71,7 @@
7171
</ItemDefinitionGroup>
7272
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
7373
<ClCompile>
74-
<AdditionalIncludeDirectories>../../../sdk/include/stlport;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
74+
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
7575
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7676
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
7777
<PrecompiledHeader>

‎code/engine.vc2008/utils/mp_configs_verifyer/mp_configs_verifyer.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
4747
<ClCompile>
4848
<Optimization>Disabled</Optimization>
49-
<AdditionalIncludeDirectories>../../../sdk/include/stlport;../../../sdk/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
49+
<AdditionalIncludeDirectories>../../../sdk/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
5050
<PreprocessorDefinitions>WIN32;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5151
<MinimalRebuild>true</MinimalRebuild>
5252
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -68,7 +68,7 @@
6868
</ItemDefinitionGroup>
6969
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
7070
<ClCompile>
71-
<AdditionalIncludeDirectories>../../../sdk/include/stlport;../../../sdk/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
71+
<AdditionalIncludeDirectories>../../../sdk/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
7272
<ExceptionHandling>
7373
</ExceptionHandling>
7474
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

‎code/engine.vc2008/utils/mp_screenshots_info/mp_screenshots_info.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
4747
<ClCompile>
4848
<Optimization>Disabled</Optimization>
49-
<AdditionalIncludeDirectories>../../../sdk/include/stlport;../../../sdk/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
49+
<AdditionalIncludeDirectories>../../../sdk/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
5050
<PreprocessorDefinitions>WIN32;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5151
<MinimalRebuild>true</MinimalRebuild>
5252
<ExceptionHandling>Sync</ExceptionHandling>
@@ -71,7 +71,7 @@
7171
</ItemDefinitionGroup>
7272
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
7373
<ClCompile>
74-
<AdditionalIncludeDirectories>../../../sdk/include/stlport;../../../sdk/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
74+
<AdditionalIncludeDirectories>../../../sdk/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
7575
<ExceptionHandling>
7676
</ExceptionHandling>
7777
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

‎code/engine.vc2008/utils/xrAI/Shader_xrLC.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,13 @@ class Shader_xrLC_LIB
8787
}
8888
u32 GetID (LPCSTR name)
8989
{
90-
for (Shader_xrLCIt it=library.begin(); it!=library.end(); it++)
90+
for (auto it=library.begin(); it!=library.end(); it++)
9191
if (0==stricmp(name,it->Name)) return u32(it-library.begin());
9292
return u32(-1);
9393
}
9494
Shader_xrLC* Get (LPCSTR name)
9595
{
96-
for (Shader_xrLCIt it=library.begin(); it!=library.end(); it++)
96+
for (auto it=library.begin(); it!=library.end(); it++)
9797
if (0==stricmp(name,it->Name)) return &(*it);
9898
return NULL;
9999
}
@@ -108,7 +108,7 @@ class Shader_xrLC_LIB
108108
}
109109
void Remove (LPCSTR name)
110110
{
111-
for (Shader_xrLCIt it=library.begin(); it!=library.end(); it++)
111+
for (auto it=library.begin(); it!=library.end(); it++)
112112
if (0==stricmp(name,it->Name)){
113113
library.erase(it);
114114
break;

‎code/engine.vc2008/utils/xrAI/bone.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ struct ECORE_API SJointIKData
118118
// Kostya Slipchenko say:
119119
// íàïðàâëåíèå âðàùåíèÿ â ÎÄÅ îòëè÷àåòñÿ îò íàïðàâëåíèÿ âðàùåíèå â X-Ray
120120
// ïîýòîìó ìåíÿåì çíàê ó ëèìèòîâ
121-
F.w_float (_min(-limits[k].limit.x,-limits[k].limit.y)); // min (swap special for ODE)
122-
F.w_float (_max(-limits[k].limit.x,-limits[k].limit.y)); // max (swap special for ODE)
121+
F.w_float (std::min(-limits[k].limit.x,-limits[k].limit.y)); // min (swap special for ODE)
122+
F.w_float (std::max(-limits[k].limit.x,-limits[k].limit.y)); // max (swap special for ODE)
123123
F.w_float (limits[k].spring_factor);
124124
F.w_float (limits[k].damping_factor);
125125
}

‎code/engine.vc2008/utils/xrAI/builder_allocator_constructor.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ template <
1515
struct CBuilderAllocatorConstructor {
1616
template <template <typename _T> class _vertex>
1717
class CDataStorage :
18-
public _path_builder::CDataStorage<_vertex>,
19-
public _vertex_allocator::CDataStorage<typename _path_builder::CDataStorage<_vertex>::CGraphVertex>
18+
public _path_builder::template CDataStorage<_vertex>,
19+
public _vertex_allocator::template CDataStorage<typename _path_builder::template CDataStorage<_vertex>::CGraphVertex>
2020
{
2121
public:
22-
typedef typename _path_builder::CDataStorage<_vertex> CDataStorageBase;
23-
typedef typename _vertex_allocator::CDataStorage<
24-
typename _path_builder::CDataStorage<
25-
_vertex
26-
>::CGraphVertex
27-
> CDataStorageAllocator;
22+
using CDataStorageBase = typename _path_builder::template CDataStorage<_vertex>;
23+
using CDataStorageAllocator = typename _vertex_allocator::template CDataStorage<
24+
typename _path_builder::template CDataStorage<
25+
_vertex
26+
>::CGraphVertex
27+
>;
2828
typedef typename CDataStorageBase::CGraphVertex CGraphVertex;
2929
typedef typename CGraphVertex::_index_type _index_type;
3030

‎code/engine.vc2008/utils/xrAI/compiler_build.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ u32 FindNode(Fvector& vAt)
286286
float eps = 0.05f;
287287
vecDW& V = HashMap(vAt);
288288

289-
for (vecDW_it I=V.begin(); I!=V.end(); I++)
289+
for (auto I=V.begin(); I!=V.end(); I++)
290290
{
291291
vertex& N = g_nodes[*I];
292292
if (vAt.similar(N.Pos,eps)) return *I;

‎code/engine.vc2008/utils/xrAI/compiler_cover.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ class Query
222222

223223
IC void Clear ()
224224
{
225-
for (Nearest_it it=q_Clear.begin(); it!=q_Clear.end(); it++)
225+
for (auto it=q_Clear.begin(); it!=q_Clear.end(); it++)
226226
q_Marks[*it] = false;
227227
}
228228
};
@@ -257,7 +257,7 @@ class CoverThread : public CThread
257257
Q.Perform (N);
258258

259259
// main cycle: trace rays and compute counts
260-
for (Nearest_it it=Q.q_List.begin(); it!=Q.q_List.end(); it++)
260+
for (auto it=Q.q_List.begin(); it!=Q.q_List.end(); it++)
261261
{
262262
// calc dir & range
263263
u32 ID = *it;

‎code/engine.vc2008/utils/xrAI/compiler_display.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ void InternalRender()
4747
{
4848
Texel& T = texels[t];
4949
if (T.N) {
50-
minH = _min(minH,T.N->Pos.y);
51-
maxH = _max(maxH,T.N->Pos.y);
50+
minH = std::min(minH,T.N->Pos.y);
51+
maxH = std::max(maxH,T.N->Pos.y);
5252
}
5353
}
5454
}

‎code/engine.vc2008/utils/xrAI/data_storage_binary_heap.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ struct CDataStorageBinaryHeap {
1414
typename _data_storage,
1515
template <typename _T> class _vertex = CEmptyClassTemplate
1616
>
17-
class CDataStorage : public _data_storage::CDataStorage<_vertex> {
17+
class CDataStorage : public _data_storage::template CDataStorage<_vertex> {
1818
public:
19-
typedef typename _data_storage::CDataStorage<_vertex> inherited;
19+
typedef typename _data_storage::template CDataStorage<_vertex> inherited;
2020
typedef typename inherited::CGraphVertex CGraphVertex;
2121
typedef typename CGraphVertex::_dist_type _dist_type;
2222
typedef typename CGraphVertex::_index_type _index_type;

‎code/engine.vc2008/utils/xrAI/data_storage_constructor.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ template <
3737
class _manager_builder_allocator_constructor = CManagerBuilderAllocatorConstructor
3838
>
3939
struct CDataStorageConstructor :
40-
public _algorithm::CDataStorage<
40+
public _algorithm::template CDataStorage<
4141
_manager_builder_allocator_constructor<
4242
_manager,
4343
_builder,
@@ -47,7 +47,7 @@ struct CDataStorageConstructor :
4747
_vertex
4848
>
4949
{
50-
typedef typename _algorithm::CDataStorage<
50+
typedef typename _algorithm::template CDataStorage<
5151
_manager_builder_allocator_constructor<
5252
_manager,
5353
_builder,

‎code/engine.vc2008/utils/xrAI/data_storage_single_linked_list.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ struct CDataStorageSingleLinkedList {
2828
typename _data_storage,
2929
template <typename _T> class _vertex = CEmptyClassTemplate
3030
>
31-
class CDataStorage : public _data_storage::CDataStorage<SingleLinkedList<_vertex>::_vertex> {
31+
class CDataStorage : public _data_storage::template CDataStorage<SingleLinkedList<_vertex>::_vertex> {
3232
public:
33-
typedef typename _data_storage::CDataStorage<
33+
typedef typename _data_storage::template CDataStorage<
3434
SingleLinkedList<_vertex>::_vertex
3535
> inherited;
3636
typedef typename inherited::CGraphVertex CGraphVertex;

‎code/engine.vc2008/utils/xrAI/edge_path.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ struct CEdgePath {
3030
};
3131

3232
template <template <typename _T> class _vertex>
33-
class CDataStorage : public CVertexPath<bEuclidianHeuristics>::CDataStorage<DataStorageEdgePath<_vertex>::_vertex> {
33+
class CDataStorage : public CVertexPath<bEuclidianHeuristics>::template CDataStorage<DataStorageEdgePath<_vertex>::_vertex> {
3434
public:
3535
typedef typename CVertexPath<
3636
bEuclidianHeuristics
37-
>::CDataStorage<
37+
>::template CDataStorage<
3838
DataStorageEdgePath<_vertex>::_vertex
3939
> inherited;
4040
typedef typename inherited::CGraphVertex CGraphVertex;

‎code/engine.vc2008/utils/xrAI/game_graph_builder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ void CGameGraphBuilder::create_tripples (const float &start, const float &amoun
548548

549549
m_tripples.push_back (
550550
std::make_pair(
551-
_min(
551+
std::min(
552552
(*i).weight(),
553553
edge ? edge->weight() : (*i).weight()
554554
),

0 commit comments

Comments
 (0)