X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Ftypes.h;h=d6f49bdd68026c47a6557575f8eb15ad2e8c1d86;hb=401f78b66d66488fe465945bef36b10faa6b55ef;hp=1c527d09faed9d414877114d847be9e1a0eaa419;hpb=28f0f8708f4b4f8c4f39f1b23bc5fc7e0fed7579;p=rocksndiamonds.git diff --git a/src/libgame/types.h b/src/libgame/types.h index 1c527d09..d6f49bdd 100644 --- a/src/libgame/types.h +++ b/src/libgame/types.h @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -17,16 +17,31 @@ #include #include #include +#include #include -typedef unsigned char boolean; +typedef int boolean; + +#if !defined(PLATFORM_WIN32) typedef unsigned char byte; +#endif -#ifndef FALSE -#define FALSE 0 -#define TRUE (!FALSE) +#ifdef TRUE +#undef TRUE +#endif + +#ifdef FALSE +#undef FALSE #endif +#ifdef AUTO +#undef AUTO +#endif + +#define TRUE 1 +#define FALSE 0 +#define AUTO -1 + #ifndef MIN #define MIN(a,b) ((a) < (b) ? (a) : (b)) #endif @@ -40,7 +55,7 @@ typedef unsigned char byte; #endif #ifndef SIGN -#define SIGN(a) ((a) < 0 ? -1 : ((a)>0 ? 1 : 0)) +#define SIGN(a) ((a) < 0 ? -1 : ((a) > 0 ? 1 : 0)) #endif #define SIZEOF_ARRAY(array, type) (sizeof(array) / sizeof(type))