summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/event.cpp6
-rw-r--r--src/common/event.h6
-rw-r--r--src/common/global.h4
-rw-r--r--src/common/iman.cpp4
-rw-r--r--src/common/iman.h6
-rw-r--r--src/common/language.h3
-rw-r--r--src/common/metafile.cpp4
-rw-r--r--src/common/metafile.h4
-rw-r--r--src/common/misc.cpp14
-rw-r--r--src/common/misc.h10
-rw-r--r--src/common/modfile.cpp18
-rw-r--r--src/common/modfile.h6
-rw-r--r--src/common/profile.cpp6
-rw-r--r--src/common/profile.h4
-rw-r--r--src/common/restext.cpp14
-rw-r--r--src/common/restext.h8
-rw-r--r--src/common/struct.h5
17 files changed, 53 insertions, 69 deletions
diff --git a/src/common/event.cpp b/src/common/event.cpp
index 2eeddb4..1c92a2a 100644
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -22,9 +22,9 @@
#include <windows.h>
#include <stdio.h>
-#include "struct.h"
-#include "iman.h"
-#include "event.h"
+#include "common/struct.h"
+#include "common/iman.h"
+#include "common/event.h"
diff --git a/src/common/event.h b/src/common/event.h
index 8da2600..b9690e4 100644
--- a/src/common/event.h
+++ b/src/common/event.h
@@ -16,11 +16,10 @@
// event.h
-#ifndef _EVENT_H_
-#define _EVENT_H_
+#pragma once
-#include "struct.h"
+#include "common/struct.h"
#if !defined (WM_XBUTTONDOWN)
@@ -633,4 +632,3 @@ protected:
};
-#endif //_EVENT_H_
diff --git a/src/common/global.h b/src/common/global.h
index 32aefdc..628660b 100644
--- a/src/common/global.h
+++ b/src/common/global.h
@@ -16,8 +16,6 @@
// global.h
-#ifndef _GLOBAL_H_
-#define _GLOBAL_H_
#define BUILD_FACTORY (1<<0) // factory
@@ -60,5 +58,3 @@ extern long g_researchEnable; // research available
extern float g_unit; // conversion factor
-
-#endif //_GLOBAL_H_
diff --git a/src/common/iman.cpp b/src/common/iman.cpp
index eacb3f4..b98c393 100644
--- a/src/common/iman.cpp
+++ b/src/common/iman.cpp
@@ -22,8 +22,8 @@
#include <windows.h>
#include <stdio.h>
-#include "struct.h"
-#include "iman.h"
+#include "common/struct.h"
+#include "common/iman.h"
diff --git a/src/common/iman.h b/src/common/iman.h
index 65ec8dd..b484e30 100644
--- a/src/common/iman.h
+++ b/src/common/iman.h
@@ -16,11 +16,10 @@
// iman.h
-#ifndef _IMAN_H_
-#define _IMAN_H_
+#pragma once
-#include "misc.h"
+#include "common/misc.h"
@@ -55,4 +54,3 @@ protected:
};
-#endif //_IMAN_H_
diff --git a/src/common/language.h b/src/common/language.h
index 4ae97f9..9d5bdb9 100644
--- a/src/common/language.h
+++ b/src/common/language.h
@@ -16,6 +16,9 @@
// language.h
+#pragma once
+
+
#define _FULL TRUE // CoLoBoT
#define _SCHOOL FALSE // CeeBot-A or Teen
#define _TEEN FALSE // FALSE for CeeBot-A, TRUE for CeeBot-Teen
diff --git a/src/common/metafile.cpp b/src/common/metafile.cpp
index d7e260e..63c8e0b 100644
--- a/src/common/metafile.cpp
+++ b/src/common/metafile.cpp
@@ -22,8 +22,8 @@
#include <windows.h>
#include <stdio.h>
-#include "language.h"
-#include "metafile.h"
+#include "common/language.h"
+#include "common/metafile.h"
diff --git a/src/common/metafile.h b/src/common/metafile.h
index b334b3e..7d7ec3e 100644
--- a/src/common/metafile.h
+++ b/src/common/metafile.h
@@ -16,8 +16,7 @@
// metafile.h
-#ifndef _METAFILE_H_
-#define _METAFILE_H_
+#pragma once
#include <stdio.h>
@@ -75,4 +74,3 @@ protected:
};
-#endif //_METAFILE_H_
diff --git a/src/common/misc.cpp b/src/common/misc.cpp
index ce42de0..e73238f 100644
--- a/src/common/misc.cpp
+++ b/src/common/misc.cpp
@@ -27,13 +27,13 @@
#include <time.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "d3dutil.h"
-#include "language.h"
-#include "event.h"
-#include "misc.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "math/old/d3dmath.h"
+#include "graphics/d3d/d3dutil.h"
+#include "common/language.h"
+#include "common/event.h"
+#include "common/misc.h"
diff --git a/src/common/misc.h b/src/common/misc.h
index 9eaba53..fb1938e 100644
--- a/src/common/misc.h
+++ b/src/common/misc.h
@@ -16,14 +16,14 @@
// misc.h
-#ifndef _MISC_H_
-#define _MISC_H_
+#pragma once
+
#include <time.h>
-#include "metafile.h"
-#include "event.h"
+#include "common/metafile.h"
+#include "common/event.h"
extern CMetaFile g_metafile;
@@ -236,5 +236,3 @@ extern void UserDir(char* buffer, char* dir, char* def);
extern char RetLanguageLetter();
-
-#endif //_MISC_H_
diff --git a/src/common/modfile.cpp b/src/common/modfile.cpp
index 08fb89d..3e1c997 100644
--- a/src/common/modfile.cpp
+++ b/src/common/modfile.cpp
@@ -23,15 +23,15 @@
#include <stdio.h>
#include <d3d.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "language.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "math3d.h"
-#include "modfile.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "math/old/d3dmath.h"
+#include "common/language.h"
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/iman.h"
+#include "math/old/math3d.h"
+#include "common/modfile.h"
diff --git a/src/common/modfile.h b/src/common/modfile.h
index f97ae91..8c11101 100644
--- a/src/common/modfile.h
+++ b/src/common/modfile.h
@@ -16,11 +16,10 @@
// modfile.h
-#ifndef _MODFILE_H_
-#define _MODFILE_H_
+#pragma once
-#include "d3dengine.h"
+#include "graphics/d3d/d3dengine.h"
class CInstanceManager;
@@ -116,4 +115,3 @@ protected:
};
-#endif //_MODFILE_H_
diff --git a/src/common/profile.cpp b/src/common/profile.cpp
index 2baffb0..864cc22 100644
--- a/src/common/profile.cpp
+++ b/src/common/profile.cpp
@@ -23,9 +23,9 @@
#include <d3d.h>
#include <stdlib.h>
-#include "language.h"
-#include "struct.h"
-#include "profile.h"
+#include "common/language.h"
+#include "common/struct.h"
+#include "common/profile.h"
diff --git a/src/common/profile.h b/src/common/profile.h
index 969b764..aaf25a7 100644
--- a/src/common/profile.h
+++ b/src/common/profile.h
@@ -16,8 +16,7 @@
// profile.h
-#ifndef _PROFILE_H_
-#define _PROFILE_H_
+#pragma once
#define STRICT
@@ -33,4 +32,3 @@ extern BOOL SetProfileFloat(char* section, char* key, float value);
extern BOOL GetProfileFloat(char* section, char* key, float &value);
-#endif //_PROFILE_H_
diff --git a/src/common/restext.cpp b/src/common/restext.cpp
index 7422990..42fd438 100644
--- a/src/common/restext.cpp
+++ b/src/common/restext.cpp
@@ -18,14 +18,14 @@
#define D3D_OVERLOADS
#include <stdio.h>
-#include "struct.h"
-#include "d3dengine.h"
-#include "language.h"
-#include "misc.h"
-#include "event.h"
-#include "object.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "common/language.h"
+#include "common/misc.h"
+#include "common/event.h"
+#include "object/object.h"
#include "CBot/resource.h"
-#include "restext.h"
+#include "common/restext.h"
diff --git a/src/common/restext.h b/src/common/restext.h
index 2fe53fe..3e57d20 100644
--- a/src/common/restext.h
+++ b/src/common/restext.h
@@ -16,16 +16,15 @@
// restext.h
-#ifndef _RESTEXT_H_
-#define _RESTEXT_H_
+#pragma once
#define STRICT
#define D3D_OVERLOADS
-#include "d3dengine.h"
-#include "event.h"
+#include "graphics/d3d/d3dengine.h"
+#include "common/event.h"
@@ -156,4 +155,3 @@ extern BOOL GetResource(ResType type, int num, char* text);
extern BOOL GetResourceBase(ResType type, int num, char* text);
-#endif //_RESTEXT_H_
diff --git a/src/common/struct.h b/src/common/struct.h
index 8b90288..376c837 100644
--- a/src/common/struct.h
+++ b/src/common/struct.h
@@ -16,8 +16,8 @@
// struct.h
-#ifndef _STRUCT_H_
-#define _STRUCT_H_
+#pragma once
+
#include <d3d.h>
@@ -70,4 +70,3 @@ struct ColorHSV
};
-#endif //_STRUCT_H_
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-03 14:13:47 +0000