refactor: Remove use of 'long' integral type. (w3dhub#80)

The 'long' type varies in size between different 64bit ABIs and as such is an issue for portability.

Author: OmniBlade

Code/BandTest/BandTest.cpp

@@ -115,4 +115,4 @@ typedef struct tBandtestSettingsStruct {
 
 #define BANDTEST_API_VERSION 0x101
 
-BANDTEST_API unsigned long Detect_Bandwidth(unsigned long server_ip, unsigned long my_ip, int retries, int &failure_code, unsigned long &downstream, unsigned long api_version, BandtestSettingsStruct *settings = NULL, char *regpath = NULL);
+BANDTEST_API unsigned int Detect_Bandwidth(unsigned int server_ip, unsigned int my_ip, int retries, int &failure_code, unsigned int &downstream, unsigned int api_version, BandtestSettingsStruct *settings = NULL, char *regpath = NULL);

Code/BandTest/BandTest.h

@@ -254,7 +254,7 @@ void BINKMovieClass::Render()
 	}
 
 	if (SubTitleManager) {
-		unsigned long movieTime = (Bink->FrameNum * TicksPerFrame);
+		unsigned int movieTime = (Bink->FrameNum * TicksPerFrame);
 		SubTitleManager->Process(movieTime);
 		SubTitleManager->Render();
 	}

Code/BinkMovie/BinkPlayer.cpp

@@ -34,7 +34,7 @@ class BINKMovieClass : public MovieClass
 		HBINK Bink;
 		bool FrameChanged;
 		unsigned TextureCount;
-		unsigned long TicksPerFrame;
+		unsigned int TicksPerFrame;
 
 		struct TextureInfoStruct {
 			TextureClass* Texture;

Code/BinkMovie/BinkPlayer.h

@@ -113,9 +113,9 @@ void SubTitleClass::Set_RGB_Color(
 {
 	// Combine components as 8:8:8
 	mRGBColor = (
-		((unsigned long)red << 16) |
-		((unsigned long)green << 8) |
-		(unsigned long)blue);
+		((unsigned int)red << 16) |
+		((unsigned int)green << 8) |
+		(unsigned int)blue);
 }
 
 

Code/BinkMovie/subtitle.cpp

@@ -52,22 +52,22 @@ class SubTitleClass
 	~SubTitleClass();
 
 	// Set the time (in milliseconds) at which the subtitle is to be displayed.
-	void Set_Display_Time(unsigned long time) { mTimeStamp = time; }
+	void Set_Display_Time(unsigned int time) { mTimeStamp = time; }
 
 	// Retrieve the time in ticks (1/60 seconds) this subtitle is to be displayed.
-	unsigned long Get_Display_Time(void) const { return mTimeStamp; }
+	unsigned int Get_Display_Time(void) const { return mTimeStamp; }
 
 	// Set the time duration in ticks (1/60 seconds) for the subtitle to remain displayed.
-	void Set_Display_Duration(unsigned long duration) { mDuration = duration; }
+	void Set_Display_Duration(unsigned int duration) { mDuration = duration; }
 
 	// Retrieve the duration time in ticks (1/60 seconds) for the subtitle.
-	unsigned long Get_Display_Duration(void) const { return mDuration; }
+	unsigned int Get_Display_Duration(void) const { return mDuration; }
 
 	// Set the color the subtitle caption should be displayed in.
 	void Set_RGB_Color(unsigned char red, unsigned char green, unsigned char blue);
 
 	// Retrieve the color of the subtitle
-	unsigned long Get_RGB_Color(void) const { return mRGBColor; }
+	unsigned int Get_RGB_Color(void) const { return mRGBColor; }
 
 	// Set the line position the subtitle should be displayed at.
 	void Set_Line_Position(int linePos)
@@ -101,9 +101,9 @@ class SubTitleClass
 	const wchar_t* Get_Caption(void) const { return mCaption; }
 
 private:
-	unsigned long mTimeStamp;
-	unsigned long mDuration;
-	unsigned long mRGBColor;
+	unsigned int mTimeStamp;
+	unsigned int mDuration;
+	unsigned int mRGBColor;
 	int mLinePosition;
 	Alignment mAlignment;
 	wchar_t* mCaption;

Code/BinkMovie/subtitle.h

@@ -214,7 +214,7 @@ bool SubTitleManagerClass::Load_Sub_Titles(const char* moviename, const char* su
 *
 ******************************************************************************/
 
-bool SubTitleManagerClass::Process(unsigned long movieTime)
+bool SubTitleManagerClass::Process(unsigned int movieTime)
 {
 	if (mSubTitles == NULL) {
 		return false;
@@ -234,7 +234,7 @@ bool SubTitleManagerClass::Process(unsigned long movieTime)
 
 		// Check the display time against the current movie time. If it is time
 		// to display the subtitle then send a subtitle event to the client.
-		unsigned long displayTime = subtitle->Get_Display_Time();
+		unsigned int displayTime = subtitle->Get_Display_Time();
 
 		// If its not time then we are done.
 		if (displayTime > movieTime) {
@@ -256,7 +256,7 @@ bool SubTitleManagerClass::Process(unsigned long movieTime)
 	// If the active subtitles duration has expired then remove it as being active.
 	if (mActiveSubTitle != NULL) {
 		SubTitleClass* subtitle = mActiveSubTitle;
-		unsigned long expireTime = subtitle->Get_Display_Time() + subtitle->Get_Display_Duration();
+		unsigned int expireTime = subtitle->Get_Display_Time() + subtitle->Get_Display_Duration();
 
 		if (movieTime >= expireTime) {
 			mActiveSubTitle = NULL;
@@ -339,7 +339,7 @@ void SubTitleManagerClass::Draw_Sub_Title(const SubTitleClass* subtitle)
 	Renderer.Build_Sentence(string);
 
 	// Set font color
-	unsigned long rgbColor = subtitle->Get_RGB_Color()|0xff000000;
+	unsigned int rgbColor = subtitle->Get_RGB_Color()|0xff000000;
 
 	Renderer.Draw_Sentence(rgbColor);
 }

Code/BinkMovie/subtitlemanager.cpp

@@ -65,7 +65,7 @@ class SubTitleManagerClass
 	void Reset(void);
 
 	// Process subtitles
-	bool Process(unsigned long movieTime);
+	bool Process(unsigned int movieTime);
 	void Render();
 
 private:

Code/BinkMovie/subtitlemanager.h

@@ -52,7 +52,7 @@
 #define COLOR_TOKEN      L"Color"
 #define TEXT_TOKEN       L"Text"
 
-unsigned long DecodeTimeString(wchar_t* string);
+unsigned int DecodeTimeString(wchar_t* string);
 void Parse_Time(wchar_t* string, SubTitleClass* subTitle);
 void Parse_Duration(wchar_t* string, SubTitleClass* subTitle);
 void Parse_Position(wchar_t* string, SubTitleClass* subTitle);
@@ -442,7 +442,7 @@ wchar_t* SubTitleParserClass::Get_Next_Line(void)
 
 
 // Convert a time string in the format hh:mm:ss:tt into 1/60 second ticks.
-unsigned long Decode_Time_String(wchar_t* string)
+unsigned int Decode_Time_String(wchar_t* string)
 {
 	#define TICKS_PER_SECOND 60
 	#define TICKS_PER_MINUTE (60 * TICKS_PER_SECOND)
@@ -460,27 +460,27 @@ unsigned long Decode_Time_String(wchar_t* string)
 	wchar_t* separator = wcschr(ptr, L':');
 	WWASSERT(separator != NULL);
 	*separator++ = 0;
-	unsigned long hours = wcstoul(ptr, NULL, 10);
+	unsigned int hours = wcstoul(ptr, NULL, 10);
 
 	// Isolate minutes part
 	ptr = separator;
 	separator = wcschr(ptr, L':');
 	WWASSERT(separator != NULL);
 	*separator++ = 0;
-	unsigned long minutes = wcstoul(ptr, NULL, 10);
+	unsigned int minutes = wcstoul(ptr, NULL, 10);
 
 	// Isolate seconds part
 	ptr = separator;
 	separator = wcschr(ptr, L':');
 	WWASSERT(separator != NULL);
 	*separator++ = 0;
-	unsigned long seconds = wcstoul(ptr, NULL, 10);
+	unsigned int seconds = wcstoul(ptr, NULL, 10);
 
 	// Isolate hundredth part (1/100th of a second)
 	ptr = separator;
-	unsigned long hundredth = wcstoul(ptr, NULL, 10);
+	unsigned int hundredth = wcstoul(ptr, NULL, 10);
 
-	unsigned long time = (hours * TICKS_PER_HOUR);
+	unsigned int time = (hours * TICKS_PER_HOUR);
 	time += (minutes * TICKS_PER_MINUTE);
 	time += (seconds * TICKS_PER_SECOND);
 	time += ((hundredth * TICKS_PER_SECOND) / 100);
@@ -493,7 +493,7 @@ void Parse_Time(wchar_t* param, SubTitleClass* subTitle)
 {
 	WWASSERT(param != NULL);
 	WWASSERT(subTitle != NULL);
-	unsigned long time = Decode_Time_String(param);
+	unsigned int time = Decode_Time_String(param);
 	subTitle->Set_Display_Time(time);
 }
 
@@ -502,7 +502,7 @@ void Parse_Duration(wchar_t* param, SubTitleClass* subTitle)
 {
 	WWASSERT(param != NULL);
 	WWASSERT(subTitle != NULL);
-	unsigned long time = Decode_Time_String(param);
+	unsigned int time = Decode_Time_String(param);
 
 	if (time > 0) {
 		subTitle->Set_Display_Duration(time);

Code/BinkMovie/subtitleparser.cpp

@@ -80,7 +80,7 @@ class	ActionParamsStruct {
 	ActionParamsStruct( void );
 
 	void	Set_Basic( GameObjObserverClass * script, float priority, int action_id, SoldierAIState ai_state = NO_AI_STATE_CHANGE ) { ObserverID = script->Get_ID(); Priority = priority; ActionID = action_id; AIState = ai_state; }
-   void	Set_Basic( long observer_id, float priority, int action_id, SoldierAIState ai_state = NO_AI_STATE_CHANGE ) { ObserverID = observer_id; Priority = priority; ActionID = action_id; AIState = ai_state; }
+   void	Set_Basic( int observer_id, float priority, int action_id, SoldierAIState ai_state = NO_AI_STATE_CHANGE ) { ObserverID = observer_id; Priority = priority; ActionID = action_id; AIState = ai_state; }
 
 	void	Set_Look( const Vector3 & location, float duration ) { LookLocation = location; LookDuration = duration; }	
 	void	Set_Look( GameObject * object, float duration ) { LookObject = object; LookDuration = duration; }
@@ -106,7 +106,7 @@ class	ActionParamsStruct {
 	// Note:  all of these must be saved in SafeActionParamsStruct::Save
 	int					Priority;
 	int					ActionID;
-	long					ObserverID;
+	int					ObserverID;
 
 	Vector3				LookLocation;
 	GameObject *		LookObject;