From 549d7ea26129f700b7270ae9e4ed5b212cb53972 Mon Sep 17 00:00:00 2001 From: Kp Date: Tue, 31 Dec 2013 00:11:05 +0000 Subject: [PATCH] Use correct size for flickering_light mask --- common/main/game.h | 5 +++-- similar/main/game.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/main/game.h b/common/main/game.h index 2acb4c97a..30b159515 100644 --- a/common/main/game.h +++ b/common/main/game.h @@ -26,6 +26,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "vecmat.h" #ifdef __cplusplus +#include #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 diff --git a/similar/main/game.cpp b/similar/main/game.cpp index 7c7326980..9ee61e47e 100644 --- a/similar/main/game.cpp +++ b/similar/main/game.cpp @@ -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;