dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	.github/workflows/release-macos.yml
#	src/company_gui.cpp
#	src/linkgraph/linkgraph.cpp
#	src/newgrf_debug_gui.cpp
#	src/strgen/strgen_base.cpp
#	src/timetable_gui.cpp
This commit is contained in:
Jonathan G Rennison
2023-05-28 10:20:03 +01:00
parent b02817f262 1a24016964
commit 6091d7470c
146 changed files with 393 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/3rdparty/squirrel/include/squirrel.h vendored
View File

@@ -32,9 +32,9 @@
#include "../../../string_type.h"
typedef __int64 SQInteger;
typedef unsigned __int64 SQUnsignedInteger;
typedef unsigned __int64 SQHash; /*should be the same size of a pointer*/
typedef int64_t SQInteger;
typedef uint64_t SQUnsignedInteger;
typedef uint64_t SQHash; /*should be the same size of a pointer*/
typedef int SQInt32;
@@ -44,7 +44,7 @@ typedef double SQFloat;
typedef float SQFloat;
#endif
typedef __int64 SQRawObjectVal; //must be 64bits
typedef int64_t SQRawObjectVal; //must be 64bits
#define SQ_OBJECT_RAWINIT() { _unVal.raw = 0; }
typedef void* SQUserPointer;