Skip to content

Commit 24ec872

Browse files
Xottab-DUTYXottab-DUTY
committed
Cleanup TODO's
1 parent e311ece commit 24ec872

File tree

24 files changed

+14
-147
lines changed

24 files changed

+14
-147
lines changed

‎src/Layers/xrAPI/stdafx.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1 @@
1-
// stdafx.cpp : source file that includes just the standard includes
2-
// xrAPI.pch will be the pre-compiled header
3-
// stdafx.obj will contain the pre-compiled type information
4-
51
#include "stdafx.h"
6-
7-
// TODO: reference any additional headers you need in STDAFX.H
8-
// and not in this file

‎src/editors/ActorEditor/main.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class ECORE_API TfrmMain : public TForm
6969
__fastcall TfrmMain(TComponent* Owner);
7070
void __fastcall UpdateCaption();
7171

72-
__inline void SetHInst(HINSTANCE inst) { m_HInstance = inst; }
72+
inline void SetHInst(HINSTANCE inst) { m_HInstance = inst; }
7373
bool IsFocused() { return D3DWindow->Focused(); }
7474
};
7575

‎src/editors/ActorEditor/stdafx.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
//----------------------------------------------------
2-
// file: stdafx.h
3-
//----------------------------------------------------
4-
#ifndef stdafxH
5-
#define stdafxH
6-
71
#pragma once
82

93
#pragma warn - pck
@@ -182,9 +176,6 @@ DEFINE_VECTOR(shared_str, RStrVec, RStrVecIt);
182176
#define _omotions_ "$omotions$"
183177
#define _smotion_ "$smotion$"
184178
#define _detail_objects_ "$detail_objects$"
185-
#endif
186179

187180
#define TEX_POINT_ATT "internal\\internal_light_attpoint"
188181
#define TEX_SPOT_ATT "internal\\internal_light_attclip"
189-
190-
#pragma hdrstop

‎src/editors/ECore/stdafx.h

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
//----------------------------------------------------
2-
// file: stdafx.h
3-
//----------------------------------------------------
4-
#ifndef stdafxECOREH
5-
#define stdafxECOREH
61
#pragma once
72

83
#pragma warn - pck
@@ -29,7 +24,7 @@
2924
#include <process.h>
3025
#include <utime.h>
3126

32-
// iseful macros
27+
// useful macros
3328
// MSC names for functions
3429
#ifdef _eof
3530
#undef _eof
@@ -170,9 +165,6 @@ DEFINE_VECTOR(shared_str, RStrVec, RStrVecIt);
170165
#define _omotions_ "$omotions$"
171166
#define _smotion_ "$smotion$"
172167
#define _detail_objects_ "$detail_objects$"
173-
#endif
174168

175169
#define TEX_POINT_ATT "internal\\internal_light_attpoint"
176170
#define TEX_SPOT_ATT "internal\\internal_light_attclip"
177-
178-
#pragma hdrstop

‎src/editors/LevelEditor/main.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class ECORE_API TfrmMain :
6969
public: // User declarations
7070
__fastcall TfrmMain(TComponent* Owner);
7171
void __fastcall UpdateCaption();
72-
__inline void SetHInst(HINSTANCE inst) { m_HInstance = inst; }
72+
inline void SetHInst(HINSTANCE inst) { m_HInstance = inst; }
7373
bool IsFocused() { return D3DWindow->Focused(); }
7474
};
7575
//---------------------------------------------------------------------------

‎src/editors/LevelEditor/stdafx.h

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
//----------------------------------------------------
2-
// file: stdafx.h
3-
//----------------------------------------------------
4-
#ifndef stdafxH
5-
#define stdafxH
6-
71
#pragma once
82

93
#pragma warn - pck
@@ -26,11 +20,11 @@
2620
#include <fastmath.h>
2721
#include <io.h>
2822
#include <fcntl.h>
29-
#include <sys\stat.h>
23+
#include <sys/*\*/stat.h>
3024
#include <process.h>
3125
#include <utime.h>
3226

33-
// iseful macros
27+
// useful macros
3428
// MSC names for functions
3529
#ifdef _eof
3630
#undef _eof
@@ -59,7 +53,7 @@ __inline float modff(float a, float* b)
5953
}
6054

6155
__inline float expf(float val) { return ::exp(val); }
62-
#include "xrCore/Platform.h"
56+
#include "Common/Platform.hpp"
6357

6458
#ifdef _ECOREB
6559
#define ECORE_API XR_EXPORT
@@ -180,9 +174,6 @@ DEFINE_VECTOR(shared_str, RStrVec, RStrVecIt);
180174
#define _omotions_ "$omotions$"
181175
#define _smotion_ "$smotion$"
182176
#define _detail_objects_ "$detail_objects$"
183-
#endif
184177

185178
#define TEX_POINT_ATT "internal\\internal_light_attpoint"
186179
#define TEX_SPOT_ATT "internal\\internal_light_attclip"
187-
188-
#pragma hdrstop

‎src/editors/ParticleEditor/main.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class ECORE_API TfrmMain : public TForm
6868
__fastcall TfrmMain(TComponent* Owner);
6969
void __fastcall UpdateCaption();
7070

71-
__inline void SetHInst(HINSTANCE inst) { m_HInstance = inst; }
71+
inline void SetHInst(HINSTANCE inst) { m_HInstance = inst; }
7272
bool IsFocused() { return D3DWindow->Focused(); }
7373
};
7474

‎src/editors/ShaderEditor/main.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class ECORE_API TfrmMain :
6969
public: // User declarations
7070
__fastcall TfrmMain(TComponent* Owner);
7171
void __fastcall UpdateCaption();
72-
__inline void SetHInst(HINSTANCE inst) { m_HInstance = inst; }
72+
inline void SetHInst(HINSTANCE inst) { m_HInstance = inst; }
7373
bool IsFocused() { return D3DWindow->Focused(); }
7474
};
7575
//---------------------------------------------------------------------------

‎src/editors/ShaderEditor/stdafx.h

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
//----------------------------------------------------
2-
// file: stdafx.h
3-
//----------------------------------------------------
4-
#ifndef stdafxH
5-
#define stdafxH
6-
71
#pragma once
82

93
#pragma warn - pck
@@ -26,11 +20,11 @@
2620
#include <fastmath.h>
2721
#include <io.h>
2822
#include <fcntl.h>
29-
#include <sys\stat.h>
23+
#include <sys/stat.h>
3024
#include <process.h>
3125
#include <utime.h>
3226

33-
// iseful macros
27+
// useful macros
3428
// MSC names for functions
3529
#ifdef _eof
3630
#undef _eof
@@ -57,7 +51,7 @@ __inline float modff(float a, float* b)
5751
return float(y);
5852
}
5953
__inline float expf(float val) { return ::exp(val); }
60-
#include "xrCore/Platform.h"
54+
#include "Common/Platform.hpp"
6155
#ifdef _ECOREB
6256
#define ECORE_API XR_IMPORT
6357
#define ENGINE_API XR_EXPORT
@@ -88,7 +82,7 @@ DEFINE_VECTOR(ListItem*, ListItemsVec, ListItemsIt);
8882

8983
#include "xrCDB/xrCDB.h"
9084
#include "xrSound/Sound.h"
91-
#include "PSystem.h"
85+
#include "xrParticles/psystem.h"
9286

9387
// DirectX headers
9488
#include <d3d9.h>
@@ -166,9 +160,6 @@ DEFINE_VECTOR(shared_str, RStrVec, RStrVecIt);
166160
#define _omotions_ "$omotions$"
167161
#define _smotion_ "$smotion$"
168162
#define _detail_objects_ "$detail_objects$"
169-
#endif
170163

171164
#define TEX_POINT_ATT "internal\\internal_light_attpoint"
172165
#define TEX_SPOT_ATT "internal\\internal_light_attclip"
173-
174-
#pragma hdrstop

‎src/editors/xrEProps/stdafx.h

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
//----------------------------------------------------
2-
// file: stdafx.h
3-
//----------------------------------------------------
4-
#ifndef stdafxH
5-
#define stdafxH
6-
71
#pragma once
82

93
#include <xrCore/xrCore.h>
@@ -20,7 +14,7 @@ class MODEL;
2014

2115
#include "FolderLib.h"
2216

23-
#include "xrCore/Platform.h"
17+
#include "Common/Platform.hpp"
2418

2519
#define ENGINE_API
2620
#define DLL_API XR_IMPORT
@@ -32,5 +26,3 @@ class MODEL;
3226
#pragma comment(lib, "xrSoundB.lib")
3327
#pragma comment(lib, "xrCoreB.lib")
3428
#pragma comment(lib, "EToolsB.lib")
35-
36-
#endif // stdafxH

‎src/utils/xrAI/StdAfx.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1 @@
1-
// stdafx.cpp : source file that includes just the standard includes
2-
// xrAI.pch will be the pre-compiled header
3-
// stdafx.obj will contain the pre-compiled type information
4-
51
#include "stdafx.h"
6-
7-
// TODO: reference any additional headers you need in STDAFX.H
8-
// and not in this file

‎src/utils/xrDO_Light/StdAfx.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1 @@
1-
// stdafx.cpp : source file that includes just the standard includes
2-
// xrAI.pch will be the pre-compiled header
3-
// stdafx.obj will contain the pre-compiled type information
4-
51
#include "stdafx.h"
6-
7-
// TODO: reference any additional headers you need in STDAFX.H
8-
// and not in this file

‎src/utils/xrLC/StdAfx.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1 @@
1-
// stdafx.cpp : source file that includes just the standard includes
2-
// xrLBuilder.pch will be the pre-compiled header
3-
// stdafx.obj will contain the pre-compiled type information
4-
51
#include "stdafx.h"
6-
7-
// TODO: reference any additional headers you need in STDAFX.H
8-
// and not in this file

‎src/utils/xrSE_Factory/stdafx.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#define ENGINE_API
1616
#define ECORE_API
1717
#define DLL_API XR_EXPORT
18-
#define TIXML_USE_STL
1918

2019
#include "clsid_game.h"
2120

‎src/xrCDB/ISpatial_q_ray.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ void ISpatial_DB::q_ray(
371371
}
372372
}
373373
else
374-
{ // XXX: delete this branch since we always have SSE feature
374+
{
375375
if (_o & O_ONLYFIRST)
376376
{
377377
if (_o & O_ONLYNEAREST)

‎src/xrCDB/StdAfx.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
1-
// stdafx.cpp : source file that includes just the standard includes
2-
// xrCDB.pch will be the pre-compiled header
3-
// stdafx.obj will contain the pre-compiled type information
4-
51
#include "stdafx.h"
6-
#pragma hdrstop
72

8-
#ifdef __BORLANDC__
9-
#pragma comment(lib, "xrCoreB.lib")
10-
#else
113
#pragma comment(lib, "xrCore.lib")
124
#pragma comment(lib, "xrApi.lib")
13-
#endif
145

156
#pragma comment(lib, "winmm.lib")
16-
17-
// TODO: reference any additional headers you need in STDAFX.H
18-
// and not in this file

‎src/xrCDB/StdAfx.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,5 @@ IC void cdelete(T*& ptr)
5858
#define ENGINE_API
5959
#include "OPCODE/Opcode.h"
6060

61-
// TODO: reference additional headers your program requires here
62-
6361
//{{AFX_INSERT_LOCATION}}
6462
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.

‎src/xrCommon/inlining_macros.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
#define __thread __declspec(thread)
1616
#endif
1717

18-
// XXX: remove
19-
#define _inline inline
20-
#define __inline inline
21-
2218
// XXX: remove IC/ICF/ICN
2319
#define IC inline
2420
#define ICF FORCE_INLINE

‎src/xrCore/stdafx.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1 @@
1-
// stdafx.cpp : source file that includes just the standard includes
2-
// xrCore.pch will be the pre-compiled header
3-
// stdafx.obj will contain the pre-compiled type information
4-
51
#include "stdafx.h"
6-
7-
// TODO: reference any additional headers you need in STDAFX.H
8-
// and not in this file

‎src/xrEngine/main.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
#endif
2020

2121
// global variables
22-
// XXX: use g_dedicated_server from xrAPI
23-
ENGINE_API bool g_dedicated_server = false;
2422
ENGINE_API CApplication* pApp = nullptr;
2523
ENGINE_API CInifile* pGameIni = nullptr;
2624
ENGINE_API bool g_bBenchmark = false;

‎src/xrEngine/stdafx.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
// stdafx.cpp : source file that includes just the standard includes
2-
// stdafx.obj will contain the pre-compiled type information
3-
41
#include "stdafx.h"

‎src/xrGameSpy/stdafx.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1 @@
1-
// stdafx.cpp : source file that includes just the standard includes
2-
// xrGameSpy.pch will be the pre-compiled header
3-
// stdafx.obj will contain the pre-compiled type information
4-
51
#include "stdafx.h"
6-
7-
// TODO: reference any additional headers you need in STDAFX.H
8-
// and not in this file

‎src/xrPhysics/stdafx.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1 @@
1-
// stdafx.cpp : source file that includes just the standard includes
2-
// xrPhysics.pch will be the pre-compiled header
3-
// stdafx.obj will contain the pre-compiled type information
4-
51
#include "stdafx.h"
6-
7-
// TODO: reference any additional headers you need in STDAFX.H
8-
// and not in this file

‎src/xrSound/stdafx.cpp

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1 @@
1-
// stdafx.cpp : source file that includes just the standard includes
2-
// xrSound.pch will be the pre-compiled header
3-
// stdafx.obj will contain the pre-compiled type information
4-
51
#include "stdafx.h"
6-
7-
// TODO: reference any additional headers you need in STDAFX.H
8-
// and not in this file
9-
10-
#ifdef __BORLANDC__
11-
#pragma comment(lib, "eaxB.lib")
12-
#pragma comment(lib, "vorbisfileB.lib")
13-
#pragma comment(lib, "xrCoreB.lib")
14-
#pragma comment(lib, "EToolsB.lib")
15-
#pragma comment(lib, "OpenAL32B.lib")
16-
#pragma comment(lib, "dsoundb.lib")
17-
//#pragma comment(lib, "xrAPI.lib")
18-
#endif

0 commit comments

Comments
 (0)