summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2006-03-28 16:46:10 +0000
committerDave Chapman <dave@dchapman.com>2006-03-28 16:46:10 +0000
commitcd88582478749aa09000361b9f4e48e73b5b307e (patch)
treeeee7c5e78181418323b9696695aa4a430f8dec22
parent909b6d2653aa8b157a60b0f11fb5ca1eb37ea64e (diff)
downloadrockbox-cd88582478749aa09000361b9f4e48e73b5b307e.tar.gz
rockbox-cd88582478749aa09000361b9f4e48e73b5b307e.zip
64-bit sim fixes
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9316 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/doom/p_saveg.c2
-rw-r--r--apps/plugins/doom/p_spec.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/plugins/doom/p_saveg.c b/apps/plugins/doom/p_saveg.c
index bf1a2edc45..7d012c7f76 100644
--- a/apps/plugins/doom/p_saveg.c
+++ b/apps/plugins/doom/p_saveg.c
@@ -44,7 +44,7 @@ byte *save_p;
44 44
45// Pads save_p to a 4-byte boundary 45// Pads save_p to a 4-byte boundary
46// so that the load/save works on SGI&Gecko. 46// so that the load/save works on SGI&Gecko.
47#define PADSAVEP() do { save_p += (4 - ((int) save_p & 3)) & 3; } while (0) 47#define PADSAVEP() do { save_p += (4 - ((unsigned long) save_p & 3)) & 3; } while (0)
48// 48//
49// P_ArchivePlayers 49// P_ArchivePlayers
50// 50//
diff --git a/apps/plugins/doom/p_spec.c b/apps/plugins/doom/p_spec.c
index 2876b7f4e5..8e3c81b76e 100644
--- a/apps/plugins/doom/p_spec.c
+++ b/apps/plugins/doom/p_spec.c
@@ -955,11 +955,11 @@ int P_SectorActive(special_e t,sector_t *sec)
955 switch (t) // return whether thinker of same type is active 955 switch (t) // return whether thinker of same type is active
956 { 956 {
957 case floor_special: 957 case floor_special:
958 return (int)sec->floordata; 958 return (sec->floordata!=NULL);
959 case ceiling_special: 959 case ceiling_special:
960 return (int)sec->ceilingdata; 960 return (sec->ceilingdata!=NULL);
961 case lighting_special: 961 case lighting_special:
962 return (int)sec->lightingdata; 962 return (sec->lightingdata!=NULL);
963 } 963 }
964 return 1; // don't know which special, must be active, shouldn't be here 964 return 1; // don't know which special, must be active, shouldn't be here
965} 965}