summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-07-04 23:10:04 +0200
committeraap <aap@papnet.eu>2019-07-04 23:10:04 +0200
commitd62c6165459048c1a616d0e056e25e366b09c505 (patch)
tree6f623e18dcf18859c58b1821823f4a75dbc4fa42
parentMerge pull request #110 from erorcun/erorcun (diff)
downloadre3-d62c6165459048c1a616d0e056e25e366b09c505.tar
re3-d62c6165459048c1a616d0e056e25e366b09c505.tar.gz
re3-d62c6165459048c1a616d0e056e25e366b09c505.tar.bz2
re3-d62c6165459048c1a616d0e056e25e366b09c505.tar.lz
re3-d62c6165459048c1a616d0e056e25e366b09c505.tar.xz
re3-d62c6165459048c1a616d0e056e25e366b09c505.tar.zst
re3-d62c6165459048c1a616d0e056e25e366b09c505.zip
-rw-r--r--src/General.h6
-rw-r--r--src/Stats.h2
-rw-r--r--src/config.h2
3 files changed, 3 insertions, 7 deletions
diff --git a/src/General.h b/src/General.h
index d315d50b..cae1caa0 100644
--- a/src/General.h
+++ b/src/General.h
@@ -4,10 +4,6 @@ class CGeneral
{
public:
static float GetATanOfXY(float x, float y){
-// why exactly doesn't this work?
-// if(y >= 0.0f) return atan2(x, y);
-// return atan2(x, y) + 2*M_PI;
-
if(x == 0.0f && y == 0.0f)
return 0.0f;
float xabs = fabs(x);
@@ -85,7 +81,7 @@ public:
// not too sure about all these...
static uint16 GetRandomNumber(void)
- { return myrand() & 0xFFFF; }
+ { return myrand() & MYRAND_MAX; }
// Probably don't want to ever reach high
static float GetRandomNumberInRange(float low, float high)
{ return low + (high - low)*(GetRandomNumber()/float(MYRAND_MAX + 1)); }
diff --git a/src/Stats.h b/src/Stats.h
index 4508e8a8..e7cc3dc5 100644
--- a/src/Stats.h
+++ b/src/Stats.h
@@ -5,4 +5,4 @@ class CStats
public:
static int32 &DaysPassed;
static int32 &HeadShots;
-}; \ No newline at end of file
+};
diff --git a/src/config.h b/src/config.h
index a753b678..a1e7335d 100644
--- a/src/config.h
+++ b/src/config.h
@@ -85,7 +85,7 @@ enum Config {
#elif defined GTA_PC
# define GTA3_1_1_PATCH
# ifdef GTA_PS2_STUFF
-# define USE_PS2_RAND
+//# define USE_PS2_RAND // this is unsafe until we have the game reversed
# define RANDOMSPLASH // use random splash as on PS2
# define PS2_MATFX
# endif