commit f871c15bea3485677c0db3679d0d968107a6c2a7
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Mon Dec 1 21:43:35 2008 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Mon Dec 1 21:43:35 2008 +0000
Remove 'uint' type.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1397
---
src/hexen/g_game.c | 2 +-
src/hexen/h2def.h | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/hexen/g_game.c b/src/hexen/g_game.c
index 6fbddcf1..931ba1bb 100644
--- a/src/hexen/g_game.c
+++ b/src/hexen/g_game.c
@@ -1249,7 +1249,7 @@ void G_PlayerReborn(int player)
player_t *p;
int frags[MAXPLAYERS];
int killcount, itemcount, secretcount;
- uint worldTimer;
+ unsigned int worldTimer;
memcpy(frags, players[player].frags, sizeof(frags));
killcount = players[player].killcount;
diff --git a/src/hexen/h2def.h b/src/hexen/h2def.h
index e566657d..a79d8418 100644
--- a/src/hexen/h2def.h
+++ b/src/hexen/h2def.h
@@ -101,8 +101,6 @@
//#define NUMARTIFCTS 28
#define MAXPLAYERS 8
-typedef unsigned int uint;
-
#define BT_ATTACK 1
#define BT_USE 2
#define BT_CHANGE 4 // if true, the next 3 bits hold weapon num
@@ -566,7 +564,7 @@ typedef struct player_s
int colormap; // 0-3 for which color to draw player
pspdef_t psprites[NUMPSPRITES]; // view sprites (gun, etc)
int morphTics; // player is a pig if > 0
- uint jumpTics; // delay the next jump for a moment
+ unsigned int jumpTics; // delay the next jump for a moment
unsigned int worldTimer; // total time the player's been playing
} player_t;