summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2008-11-23 17:52:48 +0000
committerSimon Howard2008-11-23 17:52:48 +0000
commit09f98f80fc8ed9e42ea937804618952f03244bde (patch)
tree58e7d18857a673cc8b45cf817fca0fb6ff7933c6
parent828b09914106de7dc00199fa810278e12988324b (diff)
downloadchocolate-doom-09f98f80fc8ed9e42ea937804618952f03244bde.tar.gz
chocolate-doom-09f98f80fc8ed9e42ea937804618952f03244bde.tar.bz2
chocolate-doom-09f98f80fc8ed9e42ea937804618952f03244bde.zip
Shut up some Hexen compiler warnings.
Subversion-branch: /branches/raven-branch Subversion-revision: 1386
-rw-r--r--src/hexen/p_lights.c10
-rw-r--r--src/hexen/sb_bar.c1
2 files changed, 11 insertions, 0 deletions
diff --git a/src/hexen/p_lights.c b/src/hexen/p_lights.c
index cec7c302..c7e85f9b 100644
--- a/src/hexen/p_lights.c
+++ b/src/hexen/p_lights.c
@@ -124,6 +124,10 @@ boolean EV_SpawnLight(line_t * line, byte * arg, lighttype_t type)
boolean think;
boolean rtn;
+ /*
+ Original code; redundant considering that a byte value is always
+ in the range 0-255:
+
arg1 = arg[1] > 255 ? 255 : arg[1];
arg1 = arg1 < 0 ? 0 : arg1;
arg2 = arg[2] > 255 ? 255 : arg[2];
@@ -132,6 +136,12 @@ boolean EV_SpawnLight(line_t * line, byte * arg, lighttype_t type)
arg3 = arg3 < 0 ? 0 : arg3;
arg4 = arg[4] > 255 ? 255 : arg[4];
arg4 = arg4 < 0 ? 0 : arg4;
+ */
+
+ arg1 = arg[1];
+ arg2 = arg[2];
+ arg3 = arg[3];
+ arg4 = arg[4];
secNum = -1;
rtn = false;
diff --git a/src/hexen/sb_bar.c b/src/hexen/sb_bar.c
index f190b1a3..4a9e4dd8 100644
--- a/src/hexen/sb_bar.c
+++ b/src/hexen/sb_bar.c
@@ -29,6 +29,7 @@
#include "i_video.h"
#include "m_bbox.h"
#include "m_cheat.h"
+#include "m_misc.h"
#include "p_local.h"
#include "s_sound.h"
#include "v_video.h"