Files
@ r2841:b4a60d909d86
Branch filter:
Location: cpp/openttd-patchpack/source/stdafx.h - annotation
r2841:b4a60d909d86
6.6 KiB
text/x-c
(svn r3389) -Fix: No fence was placed when placing fences and the neighbouring tile is a rail configuration which permits a fence but has a signal
(Per request of peter1138 the above line does not contain any commas)
(Per request of peter1138 the above line does not contain any commas)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 | r2186:5ee653b1b5e1 r2186:5ee653b1b5e1 r2436:963efe8b84cc r2436:963efe8b84cc r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r2223:e7b00765cfd4 r2225:16f8f81c0863 r2731:c44963662119 r2485:c0e24195d844 r2223:e7b00765cfd4 r2485:c0e24195d844 r2223:e7b00765cfd4 r2223:e7b00765cfd4 r858:1cf17deb5e0f r2485:c0e24195d844 r0:d63b455452f6 r0:d63b455452f6 r781:13ab6b3c1f17 r2485:c0e24195d844 r781:13ab6b3c1f17 r781:13ab6b3c1f17 r0:d63b455452f6 r2485:c0e24195d844 r0:d63b455452f6 r0:d63b455452f6 r446:92ad12b6a093 r2485:c0e24195d844 r446:92ad12b6a093 r446:92ad12b6a093 r770:be3f6b12cf89 r915:dabba47e3ed1 r770:be3f6b12cf89 r770:be3f6b12cf89 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r770:be3f6b12cf89 r770:be3f6b12cf89 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r1881:ce1fe6a2816a r0:d63b455452f6 r0:d63b455452f6 r2485:c0e24195d844 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r2485:c0e24195d844 r0:d63b455452f6 r781:13ab6b3c1f17 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r781:13ab6b3c1f17 r796:56ed7be83467 r2485:c0e24195d844 r796:56ed7be83467 r796:56ed7be83467 r0:d63b455452f6 r0:d63b455452f6 r2695:3e8cc1ad4da1 r2695:3e8cc1ad4da1 r2695:3e8cc1ad4da1 r2695:3e8cc1ad4da1 r2695:3e8cc1ad4da1 r2695:3e8cc1ad4da1 r2695:3e8cc1ad4da1 r2695:3e8cc1ad4da1 r2695:3e8cc1ad4da1 r2485:c0e24195d844 r0:d63b455452f6 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r1881:ce1fe6a2816a r1881:ce1fe6a2816a r1881:ce1fe6a2816a r1881:ce1fe6a2816a r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r1881:ce1fe6a2816a r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r2694:5d1e4c76ed3e r2694:5d1e4c76ed3e r2694:5d1e4c76ed3e r2694:5d1e4c76ed3e r2694:5d1e4c76ed3e r2694:5d1e4c76ed3e r2694:5d1e4c76ed3e r2694:5d1e4c76ed3e r2485:c0e24195d844 r2483:fc3798fdd0fa r2482:52d443ba6369 r157:a0ba33830082 r2482:52d443ba6369 r2485:c0e24195d844 r157:a0ba33830082 r1721:cc1286b87d09 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r0:d63b455452f6 r0:d63b455452f6 r2485:c0e24195d844 r0:d63b455452f6 r2485:c0e24195d844 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r1812:a78a2f58cdc8 r2485:c0e24195d844 r0:d63b455452f6 r543:efdb197f91ad r543:efdb197f91ad r2485:c0e24195d844 r543:efdb197f91ad r0:d63b455452f6 r0:d63b455452f6 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2639:e298192a7c03 r2639:e298192a7c03 r2639:e298192a7c03 r2639:e298192a7c03 r2639:e298192a7c03 r0:d63b455452f6 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2639:e298192a7c03 r2639:e298192a7c03 r2485:c0e24195d844 r2639:e298192a7c03 r2639:e298192a7c03 r2485:c0e24195d844 r0:d63b455452f6 r0:d63b455452f6 r2485:c0e24195d844 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r2485:c0e24195d844 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r0:d63b455452f6 r0:d63b455452f6 r781:13ab6b3c1f17 r2485:c0e24195d844 r781:13ab6b3c1f17 r2485:c0e24195d844 r781:13ab6b3c1f17 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r2639:e298192a7c03 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r1317:3783af524858 r0:d63b455452f6 r2485:c0e24195d844 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r0:d63b455452f6 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r2485:c0e24195d844 r0:d63b455452f6 r770:be3f6b12cf89 r569:9a512d458f7a r2485:c0e24195d844 r569:9a512d458f7a r569:9a512d458f7a r2436:963efe8b84cc | /* $Id$ */
#ifndef STDAFX_H
#define STDAFX_H
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
// MacOS X will use an NSAlert to display failed assertaions since they're lost unless running from a terminal
// strgen always runs from terminal and don't need a window for asserts
#if !defined(__APPLE__) || defined(STRGEN)
# include <assert.h>
#else
# include "os/macosx/macos.h"
#endif
#if defined(UNIX) || defined(__MINGW32__)
# include <sys/types.h>
#endif
#if defined(__OS2__)
# include <types.h>
#endif
#ifdef __BEOS__
# include <SupportDefs.h>
#endif
#ifdef SUNOS
# include <alloca.h>
#endif
#ifdef __MORPHOS__
// morphos defines certain amiga defines per default, we undefine them
// here to make the rest of source less messy and more clear what is
// required for morphos and what for amigaos
# ifdef amigaos
# undef amigaos
# endif
# ifdef __amigaos__
# undef __amigaos__
# endif
# ifdef __AMIGA__
# undef __AMIGA__
# endif
# ifdef AMIGA
# undef AMIGA
# endif
# ifdef amiga
# undef amiga
# endif
#endif /* __MORPHOS__ */
#define BSWAP32(x) ((((x) >> 24) & 0xFF) | (((x) >> 8) & 0xFF00) | (((x) << 8) & 0xFF0000) | (((x) << 24) & 0xFF000000))
#define BSWAP16(x) ((x) >> 8 | (x) << 8)
// by default we use [] var arrays
#define VARARRAY_SIZE
// Stuff for GCC
#if defined(__GNUC__)
# define NORETURN
# define FORCEINLINE inline
# define CDECL
//#include <alloca.h>
//#include <malloc.h>
# define __int64 long long
# define NOT_REACHED() assert(0)
# define GCC_PACK __attribute__((packed))
# if (__GNUC__ == 2)
# undef VARARRAY_SIZE
# define VARARRAY_SIZE 0
# endif
#endif /* __GNUC__ */
#if defined(__WATCOMC__)
# define NORETURN
# define FORCEINLINE inline
# define CDECL
# define NOT_REACHED() assert(0)
# define GCC_PACK
# undef TTD_ALIGNMENT_4
# undef TTD_ALIGNMENT_2
# include <malloc.h>
#endif /* __WATCOMC__ */
#if defined(__MINGW32__) || defined(__CYGWIN__)
# include <malloc.h> // alloca()
#endif
// Stuff for MSVC
#if defined(_MSC_VER)
# pragma once
# define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
# pragma warning(disable: 4244) // 'conversion' conversion from 'type1' to 'type2', possible loss of data
# pragma warning(disable: 4761) // integral size mismatch in argument : conversion supplied
# if _MSC_VER < 1300 // MSVC 6 borkdness
# pragma warning(disable: 4018) // 'expression' : signed/unsigned mismatch
# pragma warning(disable: 4305) // 'identifier' : truncation from 'type1' to 'type2'
# endif /* _MSC_VER < 1300 */
# include <malloc.h> // alloca()
# define NORETURN __declspec(noreturn)
# define FORCEINLINE __forceinline
# define inline _inline
# define CDECL _cdecl
# if defined(_DEBUG)
# define NOT_REACHED() assert(0)
# else
# define NOT_REACHED() _assume(0)
# endif /* _DEBUG */
int CDECL snprintf(char *str, size_t size, const char *format, ...);
# if _MSC_VER < 1400
int CDECL vsnprintf(char *str, size_t size, const char *format, va_list ap);
# endif
# if defined(WIN32) && !defined(_WIN64) && !defined(WIN64)
# ifndef _W64
# define _W64
# endif
typedef _W64 int INT_PTR, *PINT_PTR;
typedef _W64 unsigned int UINT_PTR, *PUINT_PTR;
# endif /* WIN32 && !_WIN64 && !WIN64 */
# if _MSC_VER < 1300 // VC6 and lower
# ifdef _WIN64
typedef __int64 intptr_t;
# else
typedef _W64 int intptr_t;
# endif
# endif /* _MSC_VER < 1300 */
# undef TTD_ALIGNMENT_4
# undef TTD_ALIGNMENT_2
# define GCC_PACK
// This is needed to zlib uses the stdcall calling convention on visual studio, also used with libpng (VS6 warning)
# if defined(WITH_ZLIB) || defined(WITH_PNG)
# ifndef ZLIB_WINAPI
# define ZLIB_WINAPI
# endif
# endif
#endif /* defined(_MSC_VER) */
// Windows has always LITTLE_ENDIAN
#if defined(WIN32) || defined(__OS2__) || defined(WIN64)
# define TTD_LITTLE_ENDIAN
#else
// Else include endian[target/host].h, which has the endian-type, autodetected by the Makefile
# if defined(STRGEN)
# include "endian_host.h"
# else
# include "endian_target.h"
# endif
#endif /* WIN32 || __OS2__ || WIN64 */
#if defined(UNIX)
# define PATHSEP "/"
#else
# define PATHSEP "\\"
#endif
typedef unsigned char byte;
#ifndef __BEOS__ // already defined
typedef unsigned char uint8;
typedef unsigned short uint16;
typedef unsigned int uint32;
#endif
// This is already defined in unix
#if !defined(UNIX) && !defined(__CYGWIN__) && !defined(__BEOS__)
typedef unsigned int uint;
#endif
// Not defined in QNX Neutrino (6.x)
#if defined(__QNXNTO__)
typedef unsigned int uint;
#endif
#ifndef __BEOS__
typedef signed char int8;
typedef signed short int16;
typedef signed int int32;
# ifndef __cplusplus
typedef unsigned char bool;
# endif
typedef signed __int64 int64;
typedef unsigned __int64 uint64;
#endif /* __BEOS__ */
// Setup alignment and conversion macros
#if defined(TTD_BIG_ENDIAN)
# define TTD_ALIGNMENT_2
# define TTD_ALIGNMENT_4
static inline uint32 TO_LE32(uint32 x) { return BSWAP32(x); }
static inline uint16 TO_LE16(uint16 x) { return BSWAP16(x); }
static inline uint32 FROM_LE32(uint32 x) { return BSWAP32(x); }
static inline uint16 FROM_LE16(uint16 x) { return BSWAP16(x); }
# define TO_BE32(x) (x)
# define TO_BE16(x) (x)
# define FROM_BE32(x) (x)
# define FROM_BE16(x) (x)
# define TO_BE32X(x) (x)
#else
static inline uint32 TO_BE32(uint32 x) { return BSWAP32(x); }
static inline uint16 TO_BE16(uint16 x) { return BSWAP16(x); }
static inline uint32 FROM_BE32(uint32 x) { return BSWAP32(x); }
static inline uint16 FROM_BE16(uint16 x) { return BSWAP16(x); }
# define TO_LE32(x) (x)
# define TO_LE16(x) (x)
# define TO_BE32X(x) BSWAP32(x)
# define FROM_LE32(x) (x)
# define FROM_LE16(x) (x)
#endif /* TTD_BIG_ENDIAN */
#if !defined(GAME_DATA_DIR)
# define GAME_DATA_DIR ""
#endif
#if !defined(PERSONAL_DIR)
# define PERSONAL_DIR ""
#endif
#ifndef __cplusplus
# ifndef __BEOS__
enum {
false = 0,
true = 1,
};
# endif
#endif /* __cplusplus */
// Compile time assertions
#ifdef __OS2__
# define assert_compile(expr)
#else
# define assert_compile(expr) void __ct_assert__(int a[1 - 2 * !(expr)])
#endif
assert_compile(sizeof(uint32) == 4);
assert_compile(sizeof(uint16) == 2);
assert_compile(sizeof(uint8) == 1);
#define lengthof(x) (sizeof(x)/sizeof(x[0]))
#define endof(x) (&x[lengthof(x)])
#define lastof(x) (&x[lengthof(x) - 1])
#ifndef offsetof
# define offsetof(s,m) (size_t)&(((s *)0)->m)
#endif
// take care of some name clashes on macos
#if defined(__APPLE__)
# define GetString OTTD_GetString
# define DrawString OTTD_DrawString
# define Random OTTD_Random
# define CloseConnection OTTD_CloseConnection
#endif /* __APPLE */
#ifdef __AMIGA__
// it seems AmigaOS already have a Point declared
# define Point OTTD_AMIGA_POINT
#endif
#endif /* STDAFX_H */
|