aboutsummaryrefslogtreecommitdiffstats
path: root/demos/3rdparty/doom/doomtype.h
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2013-12-24 19:58:18 +1000
committerinmarket <andrewh@inmarket.com.au>2013-12-24 19:58:18 +1000
commit0345dadebf55980d765826e32854049e498d5759 (patch)
treeaa500fb65cda08d165dc2a66062beedcbdcb30fc /demos/3rdparty/doom/doomtype.h
parentc24512f6edaee109ac10c378e7e89218c48255b7 (diff)
downloaduGFX-0345dadebf55980d765826e32854049e498d5759.tar.gz
uGFX-0345dadebf55980d765826e32854049e498d5759.tar.bz2
uGFX-0345dadebf55980d765826e32854049e498d5759.zip
Fixes to DOOM demo to remove some operating system dependancies.
Also now has working input (although not perfect) - Needs mouse or touch. Also now supports screen size doubling when the screen is significantly larger than doom's screen.
Diffstat (limited to 'demos/3rdparty/doom/doomtype.h')
-rw-r--r--demos/3rdparty/doom/doomtype.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/demos/3rdparty/doom/doomtype.h b/demos/3rdparty/doom/doomtype.h
index e89a7a6d..f1f67236 100644
--- a/demos/3rdparty/doom/doomtype.h
+++ b/demos/3rdparty/doom/doomtype.h
@@ -31,7 +31,13 @@
#ifdef __cplusplus
typedef bool boolean;
#else
-typedef enum {false, true} boolean;
+ #ifdef false
+ #undef false
+ #endif
+ #ifdef true
+ #undef true
+ #endif
+ typedef enum {false, true} boolean;
#endif
typedef unsigned char byte;
#endif