zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 09:21:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix warnings from pointer math with the trackers.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3139 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
Plagman 2012-11-10 01:53:50 +00:00
parent a0dd0c85a5
commit a1b82232fd
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
polymer/eduke32/build/include/build.h
View file

@ -172,9 +172,9 @@ enum {
#ifdef __cplusplus #ifdef __cplusplus
static inline void sector_tracker_hook(unsigned int address); static inline void sector_tracker_hook(uintptr_t address);
static inline void wall_tracker_hook(unsigned int address); static inline void wall_tracker_hook(uintptr_t address);
static inline void sprite_tracker_hook(unsigned int address); static inline void sprite_tracker_hook(uintptr_t address);
#define __TRACKER_NAME SectorTracker #define __TRACKER_NAME SectorTracker
#define __TRACKER_GLOBAL_HOOK sector_tracker_hook #define __TRACKER_GLOBAL_HOOK sector_tracker_hook
@ -358,9 +358,9 @@ EXTERN char wallclean[MAXWALLS + M32_FIXME_WALLS];
EXTERN char spriteclean[MAXSPRITES]; EXTERN char spriteclean[MAXSPRITES];
EXTERN char tspriteclean[MAXSPRITESONSCREEN]; EXTERN char tspriteclean[MAXSPRITESONSCREEN];
static inline void sector_tracker_hook(unsigned int address) static inline void sector_tracker_hook(uintptr_t address)
{ {
address -= (int)(sector); address -= (uintptr_t)(sector);
address /= sizeof(sectortype); address /= sizeof(sectortype);
if (address > MAXSECTORS + M32_FIXME_SECTORS) return; if (address > MAXSECTORS + M32_FIXME_SECTORS) return;
@ -368,9 +368,9 @@ static inline void sector_tracker_hook(unsigned int address)
sectorclean[address] = 0; sectorclean[address] = 0;
} }
static inline void wall_tracker_hook(unsigned int address) static inline void wall_tracker_hook(uintptr_t address)
{ {
address -= (int)(wall); address -= (uintptr_t)(wall);
address /= sizeof(walltype); address /= sizeof(walltype);
if (address > MAXWALLS + M32_FIXME_WALLS) return; if (address > MAXWALLS + M32_FIXME_WALLS) return;
@ -378,17 +378,17 @@ static inline void wall_tracker_hook(unsigned int address)
wallclean[address] = 0; wallclean[address] = 0;
} }
static inline void sprite_tracker_hook(unsigned int address) static inline void sprite_tracker_hook(uintptr_t address)
{ {
if (address >= (int)(sprite) && if (address >= (uintptr_t)(sprite) &&
address < (int)(sprite) + MAXSPRITES * sizeof(spritetype)) address < (uintptr_t)(sprite) + MAXSPRITES * sizeof(spritetype))
{ {
address -= (int)(sprite); address -= (uintptr_t)(sprite);
address /= sizeof(spritetype); address /= sizeof(spritetype);
spriteclean[address] = 0; spriteclean[address] = 0;
} else { } else {
address -= (int)(tsprite); address -= (uintptr_t)(tsprite);
address /= sizeof(spritetype); address /= sizeof(spritetype);
if (address > MAXSPRITESONSCREEN) return; if (address > MAXSPRITESONSCREEN) return;