diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2010-05-29 08:12:39 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2010-05-29 08:12:39 +0000 |
commit | 9c6e217f29bb0a76ec153574a3d493b020e5fb60 (patch) | |
tree | b38acde6c091b7f8b0e3205645f9d232f19eeabb /apps/plugins/doom/d_player.h | |
parent | 6980c1e9988a7c959876ad77b760e042272a9ec2 (diff) | |
download | rockbox-9c6e217f29bb0a76ec153574a3d493b020e5fb60.tar.gz rockbox-9c6e217f29bb0a76ec153574a3d493b020e5fb60.zip |
Doom plugin: In anticipation of moving to the EABI toolchain, because of its assumptions about enums being sized as ints, convert enum typdefs to int or unsigned depending upon whether they have negative values in the enumeration. This should effectively preserve the manner in which it is compiled under the old toolchain and avoids having to closely inspect and possibly change many places in the code.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26368 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/doom/d_player.h')
-rw-r--r-- | apps/plugins/doom/d_player.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/apps/plugins/doom/d_player.h b/apps/plugins/doom/d_player.h index f86b68f9be..974d0b22ba 100644 --- a/apps/plugins/doom/d_player.h +++ b/apps/plugins/doom/d_player.h | |||
@@ -58,7 +58,7 @@ | |||
58 | // | 58 | // |
59 | // Player states. | 59 | // Player states. |
60 | // | 60 | // |
61 | typedef enum | 61 | enum |
62 | { | 62 | { |
63 | // Playing or camping. | 63 | // Playing or camping. |
64 | PST_LIVE, | 64 | PST_LIVE, |
@@ -67,13 +67,14 @@ typedef enum | |||
67 | // Ready to restart/respawn??? | 67 | // Ready to restart/respawn??? |
68 | PST_REBORN | 68 | PST_REBORN |
69 | 69 | ||
70 | } playerstate_t; | 70 | }; |
71 | typedef unsigned playerstate_t; | ||
71 | 72 | ||
72 | 73 | ||
73 | // | 74 | // |
74 | // Player internal flags, for cheats and debug. | 75 | // Player internal flags, for cheats and debug. |
75 | // | 76 | // |
76 | typedef enum | 77 | enum |
77 | { | 78 | { |
78 | // No clipping, walk through barriers. | 79 | // No clipping, walk through barriers. |
79 | CF_NOCLIP = 1, | 80 | CF_NOCLIP = 1, |
@@ -82,7 +83,8 @@ typedef enum | |||
82 | // Not really a cheat, just a debug aid. | 83 | // Not really a cheat, just a debug aid. |
83 | CF_NOMOMENTUM = 4 | 84 | CF_NOMOMENTUM = 4 |
84 | 85 | ||
85 | } cheat_t; | 86 | }; |
87 | typedef unsigned cheat_t; | ||
86 | 88 | ||
87 | 89 | ||
88 | // | 90 | // |