From 9c707d58e5004fad1540c7d05bdda54773d5ed71 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Wed, 24 Sep 2008 18:19:42 +0000
Subject: Replace all occurrences of long with int in the Heretic code.

Subversion-branch: /branches/raven-branch
Subversion-revision: 1270
---
 src/heretic/am_map.c  | 4 ++--
 src/heretic/doomdef.h | 2 +-
 src/heretic/info.h    | 6 +++---
 src/heretic/sounds.h  | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/heretic')

diff --git a/src/heretic/am_map.c b/src/heretic/am_map.c
index 77fa2524..923c4fbd 100644
--- a/src/heretic/am_map.c
+++ b/src/heretic/am_map.c
@@ -1118,7 +1118,7 @@ void DrawWuLine(int X0, int Y0, int X1, int Y1, byte * BaseColor,
         /* Y-major line; calculate 16-bit fixed-point fractional part of a
            pixel that X advances each time Y advances 1 pixel, truncating the
            result so that we won't overrun the endpoint along the X axis */
-        ErrorAdj = ((unsigned long) DeltaX << 16) / (unsigned long) DeltaY;
+        ErrorAdj = ((unsigned int) DeltaX << 16) / (unsigned int) DeltaY;
         /* Draw all pixels other than the first and last */
         while (--DeltaY)
         {
@@ -1147,7 +1147,7 @@ void DrawWuLine(int X0, int Y0, int X1, int Y1, byte * BaseColor,
     /* It's an X-major line; calculate 16-bit fixed-point fractional part of a
        pixel that Y advances each time X advances 1 pixel, truncating the
        result to avoid overrunning the endpoint along the X axis */
-    ErrorAdj = ((unsigned long) DeltaY << 16) / (unsigned long) DeltaX;
+    ErrorAdj = ((unsigned int) DeltaY << 16) / (unsigned int) DeltaX;
     /* Draw all pixels other than the first and last */
     while (--DeltaX)
     {
diff --git a/src/heretic/doomdef.h b/src/heretic/doomdef.h
index e7f5c064..51633d98 100644
--- a/src/heretic/doomdef.h
+++ b/src/heretic/doomdef.h
@@ -491,7 +491,7 @@ typedef struct
 
 typedef struct
 {
-    long id;
+    int id;
     short intnum;               // DOOM executes an int to execute commands
 
 // communication between DOOM and the driver
diff --git a/src/heretic/info.h b/src/heretic/info.h
index 95adef0e..0a27657b 100644
--- a/src/heretic/info.h
+++ b/src/heretic/info.h
@@ -1368,11 +1368,11 @@ typedef enum
 typedef struct
 {
     spritenum_t sprite;
-    long frame;
-    long tics;
+    int frame;
+    int tics;
     void (*action) ();
     statenum_t nextstate;
-    long misc1, misc2;
+    int misc1, misc2;
 } state_t;
 
 extern state_t states[NUMSTATES];
diff --git a/src/heretic/sounds.h b/src/heretic/sounds.h
index 67cc377c..685bfa61 100644
--- a/src/heretic/sounds.h
+++ b/src/heretic/sounds.h
@@ -115,15 +115,15 @@ typedef struct sfxinfo_s
 typedef struct
 {
     mobj_t *mo;
-    long sound_id;
-    long handle;
-    long pitch;
+    int sound_id;
+    int handle;
+    int pitch;
     int priority;
 } channel_t;
 
 typedef struct
 {
-    long id;
+    int id;
     unsigned short priority;
     char *name;
     mobj_t *mo;
-- 
cgit v1.2.3