summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2014-04-23 20:13:33 +0000
committerrubidium <rubidium@openttd.org>2014-04-23 20:13:33 +0000
commit0463dbdc9e5b39399765015c394e29dedaf7d041 (patch)
tree0d115f2027997f6c452d59d63919f9a6d05cb8be /src/game
parent287ecd158249628a9b12aa5567e0e188499084f5 (diff)
downloadopenttd-0463dbdc9e5b39399765015c394e29dedaf7d041.tar.xz
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
Diffstat (limited to 'src/game')
-rw-r--r--src/game/game_config.cpp2
-rw-r--r--src/game/game_core.cpp2
-rw-r--r--src/game/game_info.cpp2
-rw-r--r--src/game/game_instance.cpp2
-rw-r--r--src/game/game_scanner.cpp2
-rw-r--r--src/game/game_text.cpp2
6 files changed, 12 insertions, 0 deletions
diff --git a/src/game/game_config.cpp b/src/game/game_config.cpp
index a85c2f467..50cd5da4e 100644
--- a/src/game/game_config.cpp
+++ b/src/game/game_config.cpp
@@ -15,6 +15,8 @@
#include "game_config.hpp"
#include "game_info.hpp"
+#include "../safeguards.h"
+
/* static */ GameConfig *GameConfig::GetConfig(ScriptSettingSource source)
{
GameConfig **config;
diff --git a/src/game/game_core.cpp b/src/game/game_core.cpp
index 9fd47a4c8..2f95e2622 100644
--- a/src/game/game_core.cpp
+++ b/src/game/game_core.cpp
@@ -21,6 +21,8 @@
#include "game_instance.hpp"
#include "game_info.hpp"
+#include "../safeguards.h"
+
/* static */ uint Game::frame_counter = 0;
/* static */ GameInfo *Game::info = NULL;
/* static */ GameInstance *Game::instance = NULL;
diff --git a/src/game/game_info.cpp b/src/game/game_info.cpp
index ab49fea12..e6ec3657b 100644
--- a/src/game/game_info.cpp
+++ b/src/game/game_info.cpp
@@ -16,6 +16,8 @@
#include "game_scanner.hpp"
#include "../debug.h"
+#include "../safeguards.h"
+
/**
* Check if the API version provided by the Game is supported.
* @param api_version The API version as provided by the Game.
diff --git a/src/game/game_instance.cpp b/src/game/game_instance.cpp
index f4afc69b9..9d030f296 100644
--- a/src/game/game_instance.cpp
+++ b/src/game/game_instance.cpp
@@ -85,6 +85,8 @@
#include "../script/api/game/game_waypointlist.hpp.sq"
#include "../script/api/game/game_window.hpp.sq"
+#include "../safeguards.h"
+
GameInstance::GameInstance() :
ScriptInstance("GS")
diff --git a/src/game/game_scanner.cpp b/src/game/game_scanner.cpp
index f8c2b4f22..4dceaa733 100644
--- a/src/game/game_scanner.cpp
+++ b/src/game/game_scanner.cpp
@@ -15,6 +15,8 @@
#include "game_info.hpp"
#include "game_scanner.hpp"
+#include "../safeguards.h"
+
void GameScannerInfo::Initialize()
{
diff --git a/src/game/game_text.cpp b/src/game/game_text.cpp
index cd9721b8a..502869249 100644
--- a/src/game/game_text.cpp
+++ b/src/game/game_text.cpp
@@ -24,6 +24,8 @@
#include <stdarg.h>
+#include "../safeguards.h"
+
void CDECL strgen_warning(const char *s, ...)
{
char buf[1024];