mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-31 18:55:23 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' into awards

Browse Source
This commit is contained in:
IntelOrca
2014-05-27 14:03:05 +01:00
parent 88ffb17a4a e4af287153
commit ebcbc2d2f1
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.sh
View File

@@ -12,8 +12,8 @@ pushd build
popd
if [[ -t 1 ]]; then
echo "\033[95mDone! Run OpenRCT2 by typing:\n\nwine openrct2.exe\n\033[0m"
echo -e "\nDone! Run OpenRCT2 by typing:\n\n\033[95mwine openrct2.exe\n\033[0m"
else
echo "Done! Run OpenRCT2 by typing:\n\nwine openrct2.exe\n"
echo -e "\nDone! Run OpenRCT2 by typing:\n\nwine openrct2.exe\n"
fi

10
install.sh
View File

@@ -65,12 +65,10 @@ if [[ ! -d /usr/local/cross-tools/i686-w64-mingw32 ]]; then
fi
if [[ ! -f $cachedir/i686-w64-mingw32-pkg-config ]]; then
if [[ `uname` == "Darwin" ]]; then
# BSD echo doesn't recognize the -e flag.
echo "#! /bin/sh\nexport PKG_CONFIG_LIBDIR=/usr/local/cross-tools/i686-w64-mingw32/lib/pkgconfig\npkg-config \$@" > $cachedir/i686-w64-mingw32-pkg-config;
else
echo -e "#! /bin/sh\nexport PKG_CONFIG_LIBDIR=/usr/local/cross-tools/i686-w64-mingw32/lib/pkgconfig\npkg-config \$@" > $cachedir/i686-w64-mingw32-pkg-config;
fi
# If this fails to work because of newlines, be sure you are running this
# script with Bash, and not sh. We should really move this to a separate
# file.
echo -e "#! /bin/sh\nexport PKG_CONFIG_LIBDIR=/usr/local/cross-tools/i686-w64-mingw32/lib/pkgconfig\npkg-config \$@" > $cachedir/i686-w64-mingw32-pkg-config;
fi
chmod +x $cachedir/i686-w64-mingw32-pkg-config

5
src/rct2.h
View File

@@ -64,7 +64,7 @@ typedef unsigned long long uint64;
#define OPENRCT2_PLATFORM "Windows"
#define OPENRCT2_TIMESTAMP __DATE__ " " __TIME__
// Represent fixed point numbers
// Represent fixed point numbers. dp = decimal point
typedef sint16 fixed16_1dp;
typedef sint16 fixed16_2dp;
typedef sint32 fixed32_1dp;
@@ -74,7 +74,8 @@ typedef sint32 fixed32_2dp;
typedef fixed16_1dp money16;
typedef fixed32_1dp money32;
// Construct a fixed point number.
// Construct a fixed point number. For example, to create the value 3.65 you
// would write FIXED_2DP(3,65)
#define FIXED_XDP(x, whole, fraction) ((whole) * (10 * x) + (fraction))
#define FIXED_1DP(whole, fraction) FIXED_XDP(1, whole, fraction)
#define FIXED_2DP(whole, fraction) FIXED_XDP(2, whole, fraction)

2
src/ride.h
View File

@@ -25,6 +25,8 @@
typedef fixed16_2dp ride_rating;
// Convenience function for writing ride ratings. The result is a 16 bit signed
// integer. To create the ride rating 3.65 type RIDE_RATING(3,65)
#define RIDE_RATING(whole, fraction) FIXED_2DP(whole, fraction)
// Used for return values, for functions that modify all three.