mirror of https://github.com/OpenTTD/OpenTTD
(svn r8398) -Cleanup: Remove WATCOM crud from strgen and map.h include from macros.h as it is no longer needed.
parent
fb5a0ba6df
commit
9727bb4cfc
|
@ -3,8 +3,6 @@
|
||||||
#ifndef MACROS_H
|
#ifndef MACROS_H
|
||||||
#define MACROS_H
|
#define MACROS_H
|
||||||
|
|
||||||
#include "map.h"
|
|
||||||
|
|
||||||
/// Fetch n bits starting at bit s from x
|
/// Fetch n bits starting at bit s from x
|
||||||
#define GB(x, s, n) (((x) >> (s)) & ((1U << (n)) - 1))
|
#define GB(x, s, n) (((x) >> (s)) & ((1U << (n)) - 1))
|
||||||
/// Set n bits starting at bit s in x to d
|
/// Set n bits starting at bit s in x to d
|
||||||
|
|
|
@ -27,14 +27,6 @@
|
||||||
#define stderr stdout
|
#define stderr stdout
|
||||||
#endif /* __MORPHOS__ */
|
#endif /* __MORPHOS__ */
|
||||||
|
|
||||||
#ifdef __WATCOMC__
|
|
||||||
uint _map_log_x; // an unpleasant hack required because Watcom is insisting on
|
|
||||||
uint _map_size_x; // these variables being valid references in map.h
|
|
||||||
uint _map_size_y;
|
|
||||||
uint _map_tile_mask;
|
|
||||||
uint _map_size;
|
|
||||||
#endif /* __WATCOMC__ */
|
|
||||||
|
|
||||||
/* Compiles a list of strings into a compiled string list */
|
/* Compiles a list of strings into a compiled string list */
|
||||||
|
|
||||||
typedef void (*ParseCmdProc)(char *buf, int value);
|
typedef void (*ParseCmdProc)(char *buf, int value);
|
||||||
|
|
Loading…
Reference in New Issue