TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use correct size for flickering_light mask

Browse source
This commit is contained in:
Kp 2013-12-31 00:11:05 +00:00
parent cf7a3edee3
commit 549d7ea261
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/main/game.h
View file

@ -26,6 +26,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "vecmat.h"
#ifdef __cplusplus
#include <cstdint>
#define DESIGNATED_GAME_FPS 30 // assuming the original intended Framerate was 30
#define DESIGNATED_GAME_FRAMETIME (F1_0/DESIGNATED_GAME_FPS)
@ -252,7 +253,7 @@ struct object *find_escort();
//Flickering light system
struct flickering_light {
short segnum, sidenum;
unsigned long mask; // determines flicker pattern
uint32_t mask; // determines flicker pattern
fix timer; // time until next change
fix delay; // time between changes
};
@ -273,7 +274,7 @@ void disable_flicker(int segnum, int sidenum);
void enable_flicker(int segnum, int sidenum);
// returns 1 if ok, 0 if error
int add_flicker(int segnum, int sidenum, fix delay, unsigned long mask);
int add_flicker(int segnum, int sidenum, fix delay, uint32_t mask);
/*
* reads a flickering_light structure from a PHYSFS_file

2
similar/main/game.cpp
View file

@ -1541,7 +1541,7 @@ void enable_flicker(int segnum,int sidenum)
#ifdef EDITOR
//returns 1 if ok, 0 if error
int add_flicker(int segnum, int sidenum, fix delay, unsigned long mask)
int add_flicker(int segnum, int sidenum, fix delay, uint32_t mask)
{
int l;
flickering_light *f;