X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Ftypes.h;h=0c935a21efd2d6e78e4304559643a74b251312d9;hb=HEAD;hp=0dfed15a1ba29280b6cac09091287218d5825926;hpb=abe44529b439ad39b4d8dbf19cbd67c9b9844279;p=rocksndiamonds.git diff --git a/src/libgame/types.h b/src/libgame/types.h index 0dfed15a..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 // ============================================================================ @@ -18,9 +18,9 @@ #include #include -typedef int boolean; -#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,16 +64,23 @@ 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 { char *key; void *content; + struct ListNode *prev; struct ListNode *next; }; typedef struct ListNode ListNode; -#endif /* TYPES_H */ +struct DelayCounter +{ + unsigned int value; + unsigned int count; +}; +typedef struct DelayCounter DelayCounter; + +#endif // TYPES_H