Merge pull request #178 from Fire-Head/master

sampman done

src/core/Timer.h

@@ -35,6 +35,7 @@ public:
 
 	static bool GetIsPaused() { return m_UserPause || m_CodePause; }
 	static bool GetIsUserPaused() { return m_UserPause; }
+	static bool GetIsCodePaused() { return m_CodePause; }
 	static void SetCodePause(bool pause) { m_CodePause = pause; }
 	
 	static void Initialise(void);

src/core/common.h

@@ -180,6 +180,7 @@ void re3_assert(const char *expr, const char *filename, unsigned int lineno, con
 #define max(a, b)  (((a) > (b)) ? (a) : (b)) 
 #define min(a, b)  (((a) < (b)) ? (a) : (b))
 #define ABS(a)  (((a) < 0) ? (-a) : (a))
+#define norm(value, min, max) (((value) < (min)) ? 0 : (((value) > (max)) ? 1 : (((value) - (min)) / ((max) - (min)))))
 
 
 #define STRINGIFY(x)                    #x

src/core/config.h

@@ -93,6 +93,7 @@ enum Config {
 #	define RANDOMSPLASH
 #elif defined GTA_PC
 #	define GTA3_1_1_PATCH
+//#	define GTA3_STEAM_PATCH
 #	ifdef GTA_PS2_STUFF
 //#		define USE_PS2_RAND	// this is unsafe until we have the game reversed
 #		define RANDOMSPLASH	// use random splash as on PS2
@@ -114,6 +115,7 @@ enum Config {
 	// not in any game
 #	define NASTY_GAME	// nasty game for all languages
 #	define NO_MOVIES	// disable intro videos
+#   define NO_CDCHECK
 #	define CHATTYSPLASH	// print what the game is loading
 #endif