Try to build with mingw

5 files changed, 197 insertions, 184 deletions

diff --git a/src/animation/AnimBlendAssocGroup.cpp b/src/animation/AnimBlendAssocGroup.cpp
index e65bdf8d..bdcca2f8 100644
--- a/src/animation/AnimBlendAssocGroup.cpp
+++ b/src/animation/AnimBlendAssocGroup.cpp
@@ -1,5 +1,7 @@
 #include "common.h"
 
+#include "ctype.h"
+
 #include "General.h"
 #include "ModelInfo.h"
 #include "AnimManager.h"
@@ -75,12 +77,21 @@ strcmpIgnoringDigits(const char *s1, const char *s2)
 		c2 = *s2;
 		if(c1) s1++;
 		if(c2) s2++;
-		if(c1 == '\0' && c2 == '\0')
-			return true;
+		if(c1 == '\0' && c2 == '\0') return true;
+#if defined _WIN32 && !defined __MINGW32__
 		if(__ascii_iswdigit(c1) && __ascii_iswdigit(c2))
+#else
+		if(iswdigit(c1) && iswdigit(c2))
+#endif
 			continue;
+#if defined _WIN32 && !defined __MINGW32__
 		c1 = __ascii_toupper(c1);
 		c2 = __ascii_toupper(c2);
+#else
+		c1 = toupper(c1);
+		c2 = toupper(c2);
+#endif
+
 		if(c1 != c2)
 			return false;
 	}
diff --git a/src/animation/AnimBlendAssociation.cpp b/src/animation/AnimBlendAssociation.cpp
index fb8c16d7..daca7d68 100644
--- a/src/animation/AnimBlendAssociation.cpp
+++ b/src/animation/AnimBlendAssociation.cpp
@@ -185,7 +185,7 @@ CAnimBlendAssociation::UpdateBlend(float timeDelta)
 	if(blendAmount <= 0.0f && blendDelta < 0.0f){
 		// We're faded out and are not fading in
 		blendAmount = 0.0f;
-		blendDelta = max(0.0f, blendDelta);
+		blendDelta = Max(0.0f, blendDelta);
 		if(flags & ASSOC_DELETEFADEDOUT){
 			if(callbackType == CB_FINISH || callbackType == CB_DELETE)
 				callback(this, callbackArg);
@@ -197,7 +197,7 @@ CAnimBlendAssociation::UpdateBlend(float timeDelta)
 	if(blendAmount > 1.0f){
 		// Maximally faded in, clamp values
 		blendAmount = 1.0f;
-		blendDelta = min(0.0f, blendDelta);
+		blendDelta = Min(0.0f, blendDelta);
 	}
 
 	return true;
diff --git a/src/animation/AnimBlendHierarchy.cpp b/src/animation/AnimBlendHierarchy.cpp
index 7f39d37a..feeaca3d 100644
--- a/src/animation/AnimBlendHierarchy.cpp
+++ b/src/animation/AnimBlendHierarchy.cpp
@@ -36,7 +36,7 @@ CAnimBlendHierarchy::CalcTotalTime(void)
 		float seqTime = 0.0f;
 		for(j = 0; j < sequences[i].numFrames; j++)
 			seqTime += sequences[i].GetKeyFrame(j)->deltaTime;
-		totalTime = max(totalTime, seqTime);
+		totalTime = Max(totalTime, seqTime);
 	}
 	totalLength = totalTime;
 }
diff --git a/src/animation/AnimManager.h b/src/animation/AnimManager.h
index 93fec74b..1b333b60 100644
--- a/src/animation/AnimManager.h
+++ b/src/animation/AnimManager.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "AnimBlendHierarchy.h"
+#include "AnimationId.h"
 
 enum AssocGroupId
 {
@@ -33,185 +34,6 @@ enum AssocGroupId
 	NUM_ANIM_ASSOC_GROUPS
 };
 
-enum AnimationId
-{
-	ANIM_WALK,
-	ANIM_RUN,
-	ANIM_SPRINT,
-	ANIM_IDLE_STANCE,
-	ANIM_WALK_START,
-	ANIM_RUN_STOP,
-	ANIM_RUN_STOP_R,
-	ANIM_IDLE_CAM,
-	ANIM_IDLE_HBHB,
-	ANIM_IDLE_TIRED,
-	ANIM_IDLE_ARMED,
-	ANIM_IDLE_CHAT,
-	ANIM_IDLE_TAXI,
-	ANIM_KO_SHOT_FRONT1,
-	ANIM_KO_SHOT_FRONT2,
-	ANIM_KO_SHOT_FRONT3,
-	ANIM_KO_SHOT_FRONT4,
-	ANIM_KO_SHOT_FACE,
-	ANIM_KO_SHOT_STOM,
-	ANIM_KO_SHOT_ARML,
-	ANIM_KO_SHOT_ARMR,
-	ANIM_KO_SHOT_LEGL,
-	ANIM_KO_SHOT_LEGR,
-	ANIM_KD_LEFT,
-	ANIM_KD_RIGHT,
-	ANIM_KO_SKID_FRONT,
-	ANIM_KO_SPIN_R, // named left in VC
-	ANIM_KO_SKID_BACK,
-	ANIM_KO_SPIN_L, // named right in VC
-	ANIM_SHOT_FRONT_PARTIAL,
-	ANIM_SHOT_LEFT_PARTIAL,
-	ANIM_SHOT_BACK_PARTIAL,
-	ANIM_SHOT_RIGHT_PARTIAL,
-	ANIM_HIT_FRONT,
-	ANIM_HIT_LEFT,
-	ANIM_HIT_BACK,
-	ANIM_HIT_RIGHT,
-	ANIM_FLOOR_HIT,
-	ANIM_HIT_BODYBLOW,
-	ANIM_HIT_CHEST,
-	ANIM_HIT_HEAD,
-	ANIM_HIT_WALK,
-	ANIM_HIT_WALL,
-	ANIM_FLOOR_HIT_F,
-	ANIM_HIT_BEHIND,
-	ANIM_PUNCH_R,
-	ANIM_KICK_FLOOR,
-	ANIM_WEAPON_BAT_H,
-	ANIM_WEAPON_BAT_V,
-	ANIM_WEAPON_HGUN_BODY,
-	ANIM_WEAPON_AK_BODY,
-	ANIM_WEAPON_PUMP,
-	ANIM_WEAPON_SNIPER,
-	ANIM_WEAPON_THROW,
-	ANIM_WEAPON_THROWU,
-	ANIM_WEAPON_START_THROW,
-	ANIM_BOMBER,
-	ANIM_HGUN_RELOAD,
-	ANIM_AK_RELOAD,
-	ANIM_FPS_PUNCH,
-	ANIM_FPS_BAT,
-	ANIM_FPS_UZI,
-	ANIM_FPS_PUMP,
-	ANIM_FPS_AK,
-	ANIM_FPS_M16,
-	ANIM_FPS_ROCKET,
-	ANIM_FIGHT_IDLE,
-	ANIM_FIGHT2_IDLE,
-	ANIM_FIGHT_SH_F,
-	ANIM_FIGHT_BODYBLOW,
-	ANIM_FIGHT_HEAD,
-	ANIM_FIGHT_KICK,
-	ANIM_FIGHT_KNEE,
-	ANIM_FIGHT_LHOOK,
-	ANIM_FIGHT_PUNCH,
-	ANIM_FIGHT_ROUNDHOUSE,
-	ANIM_FIGHT_LONGKICK,
-	ANIM_FIGHT_PPUNCH,
-	ANIM_CAR_JACKED_RHS,
-	ANIM_CAR_LJACKED_RHS,
-	ANIM_CAR_JACKED_LHS,
-	ANIM_CAR_LJACKED_LHS,
-	ANIM_CAR_QJACK,
-	ANIM_CAR_QJACKED,
-	ANIM_CAR_ALIGN_LHS,
-	ANIM_CAR_ALIGNHI_LHS,
-	ANIM_CAR_OPEN_LHS,
-	ANIM_CAR_DOORLOCKED_LHS,
-	ANIM_CAR_PULLOUT_LHS,
-	ANIM_CAR_PULLOUT_LOW_LHS,
-	ANIM_CAR_GETIN_LHS,
-	ANIM_CAR_GETIN_LOW_LHS,
-	ANIM_CAR_CLOSEDOOR_LHS,
-	ANIM_CAR_CLOSEDOOR_LOW_LHS,
-	ANIM_CAR_ROLLDOOR,
-	ANIM_CAR_ROLLDOOR_LOW,
-	ANIM_CAR_GETOUT_LHS,
-	ANIM_CAR_GETOUT_LOW_LHS,
-	ANIM_CAR_CLOSE_LHS,
-	ANIM_CAR_ALIGN_RHS,
-	ANIM_CAR_ALIGNHI_RHS,
-	ANIM_CAR_OPEN_RHS,
-	ANIM_CAR_DOORLOCKED_RHS,
-	ANIM_CAR_PULLOUT_RHS,
-	ANIM_CAR_PULLOUT_LOW_RHS,
-	ANIM_CAR_GETIN_RHS,
-	ANIM_CAR_GETIN_LOW_RHS,
-	ANIM_CAR_CLOSEDOOR_RHS,
-	ANIM_CAR_CLOSEDOOR_LOW_RHS,
-	ANIM_CAR_SHUFFLE_RHS,
-	ANIM_CAR_LSHUFFLE_RHS,
-	ANIM_CAR_SIT,
-	ANIM_CAR_LSIT,
-	ANIM_CAR_SITP,
-	ANIM_CAR_SITPLO,
-	ANIM_DRIVE_L,
-	ANIM_DRIVE_R,
-	ANIM_DRIVE_LOW_L,
-	ANIM_DRIVE_LOW_R,
-	ANIM_DRIVEBY_L,
-	ANIM_DRIVEBY_R,
-	ANIM_CAR_LB,
-	ANIM_DRIVE_BOAT,
-	ANIM_CAR_GETOUT_RHS,
-	ANIM_CAR_GETOUT_LOW_RHS,
-	ANIM_CAR_CLOSE_RHS,
-	ANIM_CAR_HOOKERTALK,
-	ANIM_COACH_OPEN_L,
-	ANIM_COACH_OPEN_R,
-	ANIM_COACH_IN_L,
-	ANIM_COACH_IN_R,
-	ANIM_COACH_OUT_L,
-	ANIM_TRAIN_GETIN,
-	ANIM_TRAIN_GETOUT,
-	ANIM_CAR_CRAWLOUT_RHS,
-	ANIM_CAR_CRAWLOUT_RHS2,
-	ANIM_VAN_OPEN_L,
-	ANIM_VAN_GETIN_L,
-	ANIM_VAN_CLOSE_L,
-	ANIM_VAN_GETOUT_L,
-	ANIM_VAN_OPEN,
-	ANIM_VAN_GETIN,
-	ANIM_VAN_CLOSE,
-	ANIM_VAN_GETOUT,
-	ANIM_GETUP1,
-	ANIM_GETUP2,
-	ANIM_GETUP3,
-	ANIM_GETUP_FRONT,
-	ANIM_JUMP_LAUNCH,
-	ANIM_JUMP_GLIDE,
-	ANIM_JUMP_LAND,
-	ANIM_FALL_FALL,
-	ANIM_FALL_GLIDE,
-	ANIM_FALL_LAND,
-	ANIM_FALL_COLLAPSE,
-	ANIM_EV_STEP,
-	ANIM_EV_DIVE,
-	ANIM_XPRESS_SCRATCH,
-	ANIM_ROAD_CROSS,
-	ANIM_TURN_180,
-	ANIM_ARREST_GUN,
-	ANIM_DROWN,
-	ANIM_CPR,
-	ANIM_DUCK_DOWN,
-	ANIM_DUCK_LOW,
-	ANIM_RBLOCK_CSHOOT,
-	ANIM_WEAPON_THROWU2,
-	ANIM_HANDSUP,
-	ANIM_HANDSCOWER,
-	ANIM_FUCKU,
-	ANIM_PHONE_IN,
-	ANIM_PHONE_OUT,
-	ANIM_PHONE_TALK,
-
-	NUM_ANIMS
-};
-
 class CAnimBlendAssociation;
 class CAnimBlendAssocGroup;
 
diff --git a/src/animation/AnimationId.h b/src/animation/AnimationId.h
new file mode 100644
index 00000000..82fed8bd
--- /dev/null
+++ b/src/animation/AnimationId.h
@@ -0,0 +1,180 @@
+#pragma once
+
+enum AnimationId
+{
+	ANIM_WALK,
+	ANIM_RUN,
+	ANIM_SPRINT,
+	ANIM_IDLE_STANCE,
+	ANIM_WALK_START,
+	ANIM_RUN_STOP,
+	ANIM_RUN_STOP_R,
+	ANIM_IDLE_CAM,
+	ANIM_IDLE_HBHB,
+	ANIM_IDLE_TIRED,
+	ANIM_IDLE_ARMED,
+	ANIM_IDLE_CHAT,
+	ANIM_IDLE_TAXI,
+	ANIM_KO_SHOT_FRONT1,
+	ANIM_KO_SHOT_FRONT2,
+	ANIM_KO_SHOT_FRONT3,
+	ANIM_KO_SHOT_FRONT4,
+	ANIM_KO_SHOT_FACE,
+	ANIM_KO_SHOT_STOM,
+	ANIM_KO_SHOT_ARML,
+	ANIM_KO_SHOT_ARMR,
+	ANIM_KO_SHOT_LEGL,
+	ANIM_KO_SHOT_LEGR,
+	ANIM_KD_LEFT,
+	ANIM_KD_RIGHT,
+	ANIM_KO_SKID_FRONT,
+	ANIM_KO_SPIN_R, // named left in VC
+	ANIM_KO_SKID_BACK,
+	ANIM_KO_SPIN_L, // named right in VC
+	ANIM_SHOT_FRONT_PARTIAL,
+	ANIM_SHOT_LEFT_PARTIAL,
+	ANIM_SHOT_BACK_PARTIAL,
+	ANIM_SHOT_RIGHT_PARTIAL,
+	ANIM_HIT_FRONT,
+	ANIM_HIT_LEFT,
+	ANIM_HIT_BACK,
+	ANIM_HIT_RIGHT,
+	ANIM_FLOOR_HIT,
+	ANIM_HIT_BODYBLOW,
+	ANIM_HIT_CHEST,
+	ANIM_HIT_HEAD,
+	ANIM_HIT_WALK,
+	ANIM_HIT_WALL,
+	ANIM_FLOOR_HIT_F,
+	ANIM_HIT_BEHIND,
+	ANIM_PUNCH_R,
+	ANIM_KICK_FLOOR,
+	ANIM_WEAPON_BAT_H,
+	ANIM_WEAPON_BAT_V,
+	ANIM_WEAPON_HGUN_BODY,
+	ANIM_WEAPON_AK_BODY,
+	ANIM_WEAPON_PUMP,
+	ANIM_WEAPON_SNIPER,
+	ANIM_WEAPON_THROW,
+	ANIM_WEAPON_THROWU,
+	ANIM_WEAPON_START_THROW,
+	ANIM_BOMBER,
+	ANIM_HGUN_RELOAD,
+	ANIM_AK_RELOAD,
+	ANIM_FPS_PUNCH,
+	ANIM_FPS_BAT,
+	ANIM_FPS_UZI,
+	ANIM_FPS_PUMP,
+	ANIM_FPS_AK,
+	ANIM_FPS_M16,
+	ANIM_FPS_ROCKET,
+	ANIM_FIGHT_IDLE,
+	ANIM_FIGHT2_IDLE,
+	ANIM_FIGHT_SH_F,
+	ANIM_FIGHT_BODYBLOW,
+	ANIM_FIGHT_HEAD,
+	ANIM_FIGHT_KICK,
+	ANIM_FIGHT_KNEE,
+	ANIM_FIGHT_LHOOK,
+	ANIM_FIGHT_PUNCH,
+	ANIM_FIGHT_ROUNDHOUSE,
+	ANIM_FIGHT_LONGKICK,
+	ANIM_FIGHT_PPUNCH,
+	ANIM_CAR_JACKED_RHS,
+	ANIM_CAR_LJACKED_RHS,
+	ANIM_CAR_JACKED_LHS,
+	ANIM_CAR_LJACKED_LHS,
+	ANIM_CAR_QJACK,
+	ANIM_CAR_QJACKED,
+	ANIM_CAR_ALIGN_LHS,
+	ANIM_CAR_ALIGNHI_LHS,
+	ANIM_CAR_OPEN_LHS,
+	ANIM_CAR_DOORLOCKED_LHS,
+	ANIM_CAR_PULLOUT_LHS,
+	ANIM_CAR_PULLOUT_LOW_LHS,
+	ANIM_CAR_GETIN_LHS,
+	ANIM_CAR_GETIN_LOW_LHS,
+	ANIM_CAR_CLOSEDOOR_LHS,
+	ANIM_CAR_CLOSEDOOR_LOW_LHS,
+	ANIM_CAR_ROLLDOOR,
+	ANIM_CAR_ROLLDOOR_LOW,
+	ANIM_CAR_GETOUT_LHS,
+	ANIM_CAR_GETOUT_LOW_LHS,
+	ANIM_CAR_CLOSE_LHS,
+	ANIM_CAR_ALIGN_RHS,
+	ANIM_CAR_ALIGNHI_RHS,
+	ANIM_CAR_OPEN_RHS,
+	ANIM_CAR_DOORLOCKED_RHS,
+	ANIM_CAR_PULLOUT_RHS,
+	ANIM_CAR_PULLOUT_LOW_RHS,
+	ANIM_CAR_GETIN_RHS,
+	ANIM_CAR_GETIN_LOW_RHS,
+	ANIM_CAR_CLOSEDOOR_RHS,
+	ANIM_CAR_CLOSEDOOR_LOW_RHS,
+	ANIM_CAR_SHUFFLE_RHS,
+	ANIM_CAR_LSHUFFLE_RHS,
+	ANIM_CAR_SIT,
+	ANIM_CAR_LSIT,
+	ANIM_CAR_SITP,
+	ANIM_CAR_SITPLO,
+	ANIM_DRIVE_L,
+	ANIM_DRIVE_R,
+	ANIM_DRIVE_LOW_L,
+	ANIM_DRIVE_LOW_R,
+	ANIM_DRIVEBY_L,
+	ANIM_DRIVEBY_R,
+	ANIM_CAR_LB,
+	ANIM_DRIVE_BOAT,
+	ANIM_CAR_GETOUT_RHS,
+	ANIM_CAR_GETOUT_LOW_RHS,
+	ANIM_CAR_CLOSE_RHS,
+	ANIM_CAR_HOOKERTALK,
+	ANIM_COACH_OPEN_L,
+	ANIM_COACH_OPEN_R,
+	ANIM_COACH_IN_L,
+	ANIM_COACH_IN_R,
+	ANIM_COACH_OUT_L,
+	ANIM_TRAIN_GETIN,
+	ANIM_TRAIN_GETOUT,
+	ANIM_CAR_CRAWLOUT_RHS,
+	ANIM_CAR_CRAWLOUT_RHS2,
+	ANIM_VAN_OPEN_L,
+	ANIM_VAN_GETIN_L,
+	ANIM_VAN_CLOSE_L,
+	ANIM_VAN_GETOUT_L,
+	ANIM_VAN_OPEN,
+	ANIM_VAN_GETIN,
+	ANIM_VAN_CLOSE,
+	ANIM_VAN_GETOUT,
+	ANIM_GETUP1,
+	ANIM_GETUP2,
+	ANIM_GETUP3,
+	ANIM_GETUP_FRONT,
+	ANIM_JUMP_LAUNCH,
+	ANIM_JUMP_GLIDE,
+	ANIM_JUMP_LAND,
+	ANIM_FALL_FALL,
+	ANIM_FALL_GLIDE,
+	ANIM_FALL_LAND,
+	ANIM_FALL_COLLAPSE,
+	ANIM_EV_STEP,
+	ANIM_EV_DIVE,
+	ANIM_XPRESS_SCRATCH,
+	ANIM_ROAD_CROSS,
+	ANIM_TURN_180,
+	ANIM_ARREST_GUN,
+	ANIM_DROWN,
+	ANIM_CPR,
+	ANIM_DUCK_DOWN,
+	ANIM_DUCK_LOW,
+	ANIM_RBLOCK_CSHOOT,
+	ANIM_WEAPON_THROWU2,
+	ANIM_HANDSUP,
+	ANIM_HANDSCOWER,
+	ANIM_FUCKU,
+	ANIM_PHONE_IN,
+	ANIM_PHONE_OUT,
+	ANIM_PHONE_TALK,
+
+	NUM_ANIMS
+};
\ No newline at end of file