summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2014-09-06 20:22:59 +0000
committerrubidium <rubidium@openttd.org>2014-09-06 20:22:59 +0000
commitb5f5e88d57621d686906a69f419c9809398befe7 (patch)
tree51eed15623f11c86479b098ee5dbc7e3a1c408f9 /src
parent9b0c01e9bf1c9ae971ce931bfb9d73f800388fd2 (diff)
downloadopenttd-b5f5e88d57621d686906a69f419c9809398befe7.tar.xz
(svn r26782) -Fix (r26781): was in the wrong folder when commiting
Diffstat (limited to 'src')
-rw-r--r--src/script/script_info_dummy.cpp2
-rw-r--r--src/script/squirrel.cpp2
-rw-r--r--src/script/squirrel_std.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/script/script_info_dummy.cpp b/src/script/script_info_dummy.cpp
index 15f417c58..e11c63151 100644
--- a/src/script/script_info_dummy.cpp
+++ b/src/script/script_info_dummy.cpp
@@ -9,8 +9,8 @@
/** @file script_info_dummy.cpp Implementation of a dummy Script. */
-#include <squirrel.h>
#include "../stdafx.h"
+#include <squirrel.h>
#include "../string_func.h"
#include "../strings_func.h"
diff --git a/src/script/squirrel.cpp b/src/script/squirrel.cpp
index 22e5354b6..7697edd24 100644
--- a/src/script/squirrel.cpp
+++ b/src/script/squirrel.cpp
@@ -25,7 +25,7 @@ void Squirrel::CompileError(HSQUIRRELVM vm, const SQChar *desc, const SQChar *so
{
SQChar buf[1024];
- seprintf(buf, lastof(buf), "Error %s:" SQ_PRINTF64 "/" SQ_PRINTF64 ": %s", source, line, column, desc);
+ seprintf(buf, lastof(buf), "Error %s:" OTTD_PRINTF64 "/" OTTD_PRINTF64 ": %s", source, line, column, desc);
/* Check if we have a custom print function */
Squirrel *engine = (Squirrel *)sq_getforeignptr(vm);
diff --git a/src/script/squirrel_std.cpp b/src/script/squirrel_std.cpp
index 78cce518d..96f087a2a 100644
--- a/src/script/squirrel_std.cpp
+++ b/src/script/squirrel_std.cpp
@@ -9,9 +9,9 @@
/** @file squirrel_std.cpp Implements the Squirrel Standard Function class */
+#include "../stdafx.h"
#include <squirrel.h>
#include <sqstdmath.h>
-#include "../stdafx.h"
#include "../debug.h"
#include "squirrel_std.hpp"
#include "../core/alloc_func.hpp"