X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Ftypes.h;h=0c935a21efd2d6e78e4304559643a74b251312d9;hb=HEAD;hp=1278a553a6418c85f6ee2f1bde885f78ca8594fa;hpb=49897535af06400f05c764d203a4450c06a10769;p=rocksndiamonds.git diff --git a/src/libgame/types.h b/src/libgame/types.h index 1278a553..0c935a21 100644 --- a/src/libgame/types.h +++ b/src/libgame/types.h @@ -4,7 +4,7 @@ // (c) 1995-2014 by Artsoft Entertainment // Holger Schemel // info@artsoft.org -// http://www.artsoft.org/ +// https://www.artsoft.org/ // ---------------------------------------------------------------------------- // types.h // ============================================================================ @@ -19,7 +19,7 @@ #include -#if !defined(PLATFORM_WIN32) +#if !defined(PLATFORM_WINDOWS) typedef int boolean; typedef unsigned char byte; #endif @@ -41,11 +41,11 @@ typedef unsigned char byte; #define AUTO -1 #ifndef MIN -#define MIN(a,b) ((a) < (b) ? (a) : (b)) +#define MIN(a, b) ((a) < (b) ? (a) : (b)) #endif #ifndef MAX -#define MAX(a,b) ((a) > (b) ? (a) : (b)) +#define MAX(a, b) ((a) > (b) ? (a) : (b)) #endif #ifndef ABS @@ -64,8 +64,7 @@ typedef unsigned char byte; #define EVEN(a) (((a) & 1) == 0) #endif -#define SIZEOF_ARRAY(array, type) (sizeof(array) / sizeof(type)) -#define SIZEOF_ARRAY_INT(array) SIZEOF_ARRAY(array, int) +#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0])) struct ListNode @@ -77,4 +76,11 @@ struct ListNode }; typedef struct ListNode ListNode; -#endif /* TYPES_H */ +struct DelayCounter +{ + unsigned int value; + unsigned int count; +}; +typedef struct DelayCounter DelayCounter; + +#endif // TYPES_H