X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Ftypes.h;h=f7d8ad462e42b5ce198adfb7c529145d56887820;hb=24e6fe624376685e6c63861aa132c6f6cdf2bd4d;hp=9970c9ea32cc185b760bf9fd8d4a293e78326f1d;hpb=24101bdeee0ac963cfd48b5220f6d9b0188a6f69;p=rocksndiamonds.git

diff --git a/src/libgame/types.h b/src/libgame/types.h
index 9970c9ea..f7d8ad46 100644
--- a/src/libgame/types.h
+++ b/src/libgame/types.h
@@ -1,15 +1,13 @@
-/***********************************************************
-* Artsoft Retro-Game Library                               *
-*----------------------------------------------------------*
-* (c) 1994-2002 Artsoft Entertainment                      *
-*               Holger Schemel                             *
-*               Detmolder Strasse 189                      *
-*               33604 Bielefeld                            *
-*               Germany                                    *
-*               e-mail: info@artsoft.org                   *
-*----------------------------------------------------------*
-* types.h                                                  *
-***********************************************************/
+// ============================================================================
+// Artsoft Retro-Game Library
+// ----------------------------------------------------------------------------
+// (c) 1995-2014 by Artsoft Entertainment
+//     		    Holger Schemel
+//		    info@artsoft.org
+//		    https://www.artsoft.org/
+// ----------------------------------------------------------------------------
+// types.h
+// ============================================================================
 
 #ifndef TYPES_H
 #define TYPES_H
@@ -20,43 +18,87 @@
 #include <string.h>
 #include <sys/types.h>
 
-typedef int boolean;
 
-#if !defined(PLATFORM_WIN32)
+#if !defined(PLATFORM_WINDOWS)
+typedef int boolean;
 typedef unsigned char byte;
 #endif
 
-#ifndef FALSE
-#define FALSE		0
-#define TRUE		(!FALSE)
+#ifdef TRUE
+#undef TRUE
+#endif
+
+#ifdef FALSE
+#undef FALSE
+#endif
+
+#ifdef STATE_AUTO
+#undef STATE_AUTO
+#endif
+
+#ifdef STATE_ASK
+#undef STATE_ASK
 #endif
 
+// values for boolean data type
+#define TRUE			1
+#define FALSE			0
+
+// values for 3-state data type (for "yes/no/auto" or "yes/no/ask")
+#define STATE_TRUE		1
+#define STATE_FALSE		0
+#define STATE_AUTO		-1
+#define STATE_ASK		-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
-#define ABS(a)		((a) < 0 ? -(a) : (a))
+#define ABS(a)			((a) < 0 ? -(a) : (a))
 #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))
-#define SIZEOF_ARRAY_INT(array)		SIZEOF_ARRAY(array, int)
+#ifndef ODD
+#define ODD(a)			(((a) & 1) == 1)
+#endif
+
+#ifndef EVEN
+#define EVEN(a)			(((a) & 1) == 0)
+#endif
+
+#define ARRAY_SIZE(array)	(sizeof(array) / sizeof(array[0]))
+
+#define PTR_TO_INT(p)		((int) (long) (p))
+#define PTR_TO_UINT(p)		((unsigned int) (unsigned long) (p))
+
+#define INT_TO_PTR(i)		((void *) (long) (i))
+#define UINT_TO_PTR(u)		((void *) (unsigned long) (u))
+
+#define STRUCT_OFFSET(s, m)	(offsetof(s, m))
 
 
 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