diff options
author | rubidium <rubidium@openttd.org> | 2007-01-02 19:19:48 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2007-01-02 19:19:48 +0000 |
commit | 66bbf336c6af7353ef0aeed58002c46543b30635 (patch) | |
tree | ad4a63860df2626b22f77e7dac712e958bea54cb /direction.h | |
parent | ccc0a3f4dbf58c005b22341ac8874252924690cd (diff) | |
download | openttd-66bbf336c6af7353ef0aeed58002c46543b30635.tar.xz |
(svn r7759) -Merge: makefile rewrite. This merge features:
- A proper ./configure, so everything needs to be configured only once, not for every make.
- Usage of makedepend when available. This greatly reduces the time needed for generating the dependencies.
- A generator for all project files. There is a single file with sources, which is used to generate Makefiles and the project files for MSVC.
- Proper support for OSX universal binaries.
- Object files for non-MSVC compiles are also placed in separate directories, making is faster to switch between debug and release compiles and it does not touch the directory with the source files.
- Functionality to make a bundle of all needed files for for example a nightly or distribution of a binary with all needed GRFs and language files.
Note: as this merge moves almost all files, it is recommended to make a backup of your working copy before updating your working copy.
Diffstat (limited to 'direction.h')
-rw-r--r-- | direction.h | 147 |
1 files changed, 0 insertions, 147 deletions
diff --git a/direction.h b/direction.h deleted file mode 100644 index 477c34046..000000000 --- a/direction.h +++ /dev/null @@ -1,147 +0,0 @@ -/* $Id$ */ - -#ifndef DIRECTION_H -#define DIRECTION_H - -/* Direction as commonly used in v->direction, 8 way. */ -typedef enum Direction { - DIR_N = 0, - DIR_NE = 1, /* Northeast, upper right on your monitor */ - DIR_E = 2, - DIR_SE = 3, - DIR_S = 4, - DIR_SW = 5, - DIR_W = 6, - DIR_NW = 7, - DIR_END, - INVALID_DIR = 0xFF, -} Direction; - -static inline Direction ReverseDir(Direction d) -{ - return (Direction)(4 ^ d); -} - - -typedef enum DirDiff { - DIRDIFF_SAME = 0, - DIRDIFF_45RIGHT = 1, - DIRDIFF_90RIGHT = 2, - DIRDIFF_REVERSE = 4, - DIRDIFF_90LEFT = 6, - DIRDIFF_45LEFT = 7 -} DirDiff; - -static inline DirDiff DirDifference(Direction d0, Direction d1) -{ - return (DirDiff)((d0 + 8 - d1) % 8); -} - -static inline DirDiff ChangeDirDiff(DirDiff d, DirDiff delta) -{ - return (DirDiff)((d + delta) % 8); -} - - -static inline Direction ChangeDir(Direction d, DirDiff delta) -{ - return (Direction)((d + delta) % 8); -} - - -/* Direction commonly used as the direction of entering and leaving tiles, 4-way */ -typedef enum DiagDirection { - DIAGDIR_NE = 0, /* Northeast, upper right on your monitor */ - DIAGDIR_SE = 1, - DIAGDIR_SW = 2, - DIAGDIR_NW = 3, - DIAGDIR_END, - INVALID_DIAGDIR = 0xFF, -} DiagDirection; - -static inline DiagDirection ReverseDiagDir(DiagDirection d) -{ - return (DiagDirection)(2 ^ d); -} - - -typedef enum DiagDirDiff { - DIAGDIRDIFF_SAME = 0, - DIAGDIRDIFF_90RIGHT = 1, - DIAGDIRDIFF_REVERSE = 2, - DIAGDIRDIFF_90LEFT = 3 -} DiagDirDiff; - -static inline DiagDirection ChangeDiagDir(DiagDirection d, DiagDirDiff delta) -{ - return (DiagDirection)((d + delta) % 4); -} - - -static inline DiagDirection DirToDiagDir(Direction dir) -{ - return (DiagDirection)(dir >> 1); -} - - -static inline Direction DiagDirToDir(DiagDirection dir) -{ - return (Direction)(dir * 2 + 1); -} - - -/* the 2 axis */ -typedef enum Axis { - AXIS_X = 0, - AXIS_Y = 1, - AXIS_END -} Axis; - - -static inline Axis OtherAxis(Axis a) -{ - return (Axis)(a ^ 1); -} - - -static inline Axis DiagDirToAxis(DiagDirection d) -{ - return (Axis)(d & 1); -} - - -/* - * Converts an Axis to a DiagDirection - * Points always in the positive direction, i.e. S[EW] - */ -static inline DiagDirection AxisToDiagDir(Axis a) -{ - return (DiagDirection)(2 - a); -} - -/** - * Convert an axis and a flag for north/south into a DiagDirection - * @param ns north -> 0, south -> 1 - */ -static inline DiagDirection XYNSToDiagDir(Axis xy, uint ns) -{ - return (DiagDirection)(xy * 3 ^ ns * 2); -} - - -static inline bool IsValidDiagDirection(DiagDirection d) -{ - return d < DIAGDIR_END; -} - -static inline bool IsValidDirection(Direction d) -{ - return d < DIR_END; -} - -static inline bool IsValidAxis(Axis d) -{ - return d < AXIS_END; -} - -#endif /* DIRECTION_H */ |