Merge pull request #550 from erorcun/miami

Weapon layer in Peds

src/animation/AnimBlendAssocGroup.cpp

@@ -44,7 +44,7 @@ CAnimBlendAssocGroup::DestroyAssociations(void)
 CAnimBlendAssociation*
 CAnimBlendAssocGroup::GetAnimation(uint32 id)
 {
-	return &assocList[id];
+	return &assocList[id - firstAnimId];
 }
 
 CAnimBlendAssociation*

src/animation/AnimBlendAssociation.h

@@ -18,6 +18,7 @@ enum {
 	ASSOC_NOWALK = 0x400,	// see CPed::PlayFootSteps(void)
 	ASSOC_BLOCK = 0x800,	// unused in assoc description, blocks other anims from being played
 	ASSOC_FRONTAL = 0x1000, // anims that we fall to front
+	ASSOC_DRIVING = 0x2000,	// new in VC
 };
 
 // Anim hierarchy associated with a clump

src/animation/AnimManager.h

@@ -6,6 +6,35 @@
 enum AssocGroupId
 {
 	ASSOCGRP_STD,
+	ASSOCGRP_VAN,
+	ASSOCGRP_COACH,
+	ASSOCGRP_BIKES,
+	ASSOCGRP_BIKEV,
+	ASSOCGRP_BIKEH,
+	ASSOCGRP_BIKED,
+	ASSOCGRP_UNARMED,
+	ASSOCGRP_SCREWDRIVER,
+	ASSOCGRP_KNIFE,
+	ASSOCGRP_BASEBALLBAT,
+	ASSOCGRP_GOLFCLUB,
+	ASSOCGRP_CHAINSAW,
+	ASSOCGRP_PYTHON,
+	ASSOCGRP_COLT,
+	ASSOCGRP_SHOTGUN,
+	ASSOCGRP_BUDDY,
+	ASSOCGRP_TEC,
+	ASSOCGRP_UZI,
+	ASSOCGRP_RIFLE,
+	ASSOCGRP_M60,
+	ASSOCGRP_SNIPER,
+	ASSOCGRP_THROW,
+	ASSOCGRP_FLAMETHROWER,
+	ASSOCGRP_MEDIC,
+	ASSOCGRP_SUNBATHE,
+	ASSOCGRP_PLAYER_IDLE,
+	ASSOCGRP_RIOT,
+	ASSOCGRP_STRIP,
+	ASSOCGRP_LANCE,
 	ASSOCGRP_PLAYER,
 	ASSOCGRP_PLAYERROCKET,
 	ASSOCGRP_PLAYER1ARMED,
@@ -38,7 +67,7 @@ enum AssocGroupId
 	ASSOCGRP_CHAINSAWLEFT,
 	ASSOCGRP_CHAINSAWRIGHT,
 
-	NUM_ANIM_ASSOC_GROUPS	// should be 61 in the end
+	NUM_ANIM_ASSOC_GROUPS
 };
 
 class CAnimBlendAssociation;

src/animation/AnimationId.h

@@ -47,27 +47,6 @@ enum AnimationId
 	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,
@@ -80,6 +59,21 @@ enum AnimationId
 	ANIM_FIGHT_ROUNDHOUSE,
 	ANIM_FIGHT_LONGKICK,
 	ANIM_FIGHT_PPUNCH,
+
+	ANIM_FIGHT_JAB,
+	ANIM_FIGHT_ELBOW_L,
+	ANIM_FIGHT_ELBOW_R,
+	ANIM_FIGHT_BKICK_L,
+	ANIM_FIGHT_BKICK_R,
+
+	ANIM_BOMBER,
+	ANIM_PUNCH_R,
+	ANIM_FIGHT_PPUNCH2,
+	ANIM_KICK_FLOOR,
+
+	ANIM_WEAPON_THROWU,
+	ANIM_FIGHT_SH_BACK,
+
 	ANIM_CAR_JACKED_RHS,
 	ANIM_CAR_LJACKED_RHS,
 	ANIM_CAR_JACKED_LHS,
@@ -98,6 +92,7 @@ enum AnimationId
 	ANIM_CAR_CLOSEDOOR_LOW_LHS,
 	ANIM_CAR_ROLLDOOR,
 	ANIM_CAR_ROLLDOOR_LOW,
+	ANIM_CAR_JUMPIN_LHS,
 	ANIM_CAR_GETOUT_LHS,
 	ANIM_CAR_GETOUT_LOW_LHS,
 	ANIM_CAR_CLOSE_LHS,
@@ -123,29 +118,36 @@ enum AnimationId
 	ANIM_DRIVE_LOW_R,
 	ANIM_DRIVEBY_L,
 	ANIM_DRIVEBY_R,
+	ANIM_DRIVEBY_L_L,	// TODO: is this LOW?
+	ANIM_DRIVEBY_L_R,
 	ANIM_CAR_LB,
 	ANIM_DRIVE_BOAT,
+	ANIM_DRIVE_BOAT_L,
+	ANIM_DRIVE_BOAT_R,
+	ANIM_DRIVE_BOAT_BACK,
+
+	ANIM_BIKE_PICKUP_R,
+	ANIM_BIKE_PICKUP_L,
+	ANIM_BIKE_PULLUP_R,
+	ANIM_BIKE_PULLUP_L,
+	ANIM_BIKE_ELBOW_R,
+	ANIM_BIKE_ELBOW_L,
+	ANIM_BIKE_FALL_OFF,
+	ANIM_BIKE_FALL_R,
+
 	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_IDLE_STANCE2,
+	ANIM_IDLE_STANCE3,
+
 	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_CAR_ROLLOUT_LHS,
+	ANIM_CAR_ROLLOUT_LHS2,	// was this meant to be RHS?
+
 	ANIM_GETUP1,
 	ANIM_GETUP2,
 	ANIM_GETUP3,
@@ -157,24 +159,113 @@ enum AnimationId
 	ANIM_FALL_GLIDE,
 	ANIM_FALL_LAND,
 	ANIM_FALL_COLLAPSE,
+	ANIM_FALL_BACK,
+	ANIM_FALL_FRONT,
+
 	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_WEAPON_CROUCH,
+
 	ANIM_RBLOCK_CSHOOT,
-	ANIM_WEAPON_THROWU2,
 	ANIM_HANDSUP,
 	ANIM_HANDSCOWER,
 	ANIM_FUCKU,
 	ANIM_PHONE_IN,
 	ANIM_PHONE_OUT,
 	ANIM_PHONE_TALK,
 
+	ANIM_SEAT_DOWN,
+	ANIM_SEAT_UP,
+	ANIM_SEAT_IDLE,
+	ANIM_SEAT_DOWN2,
+	ANIM_ATM,
+	ANIM_ABSEIL,
+
+	NUM_STD_ANIMS,
+
+	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_COACH_OPEN_L,
+	ANIM_COACH_OPEN_R,
+	ANIM_COACH_IN_L,
+	ANIM_COACH_IN_R,
+	ANIM_COACH_OUT_L,
+
+	ANIM_BIKE_RIDE,
+	ANIM_BIKE_STILL,
+	ANIM_BIKE_LEFT,
+	ANIM_BIKE_RIGHT,
+	ANIM_BIKE_BACK,
+	ANIM_BIKE_FWD,
+	ANIM_BIKE_PUSHES,
+	ANIM_BIKE_JUMPON_R,
+	ANIM_BIKE_JUMPON_L,
+	ANIM_BIKE_KICK,
+	ANIM_BIKE_HIT,
+	ANIM_BIKE_GETOFF_RHS,
+	ANIM_BIKE_GETOFF_LHS,
+	ANIM_BIKE_GETOFF_BACK,
+	ANIM_BIKE_DRIVEBY_RHS,
+	ANIM_BIKE_DRIVEBY_LHS,
+	ANIM_BIKE_DRIVEBY_FT,
+	ANIM_BIKE_PASSENGER,
+
+	ANIM_WEAPON_FIRE,
+	ANIM_WEAPON_CROUCHFIRE,
+	ANIM_WEAPON_RELOAD,
+	ANIM_WEAPON_CROUCHRELOAD,
+	ANIM_WEAPON_SPECIAL,
+	ANIM_MELEE_ATTACK = ANIM_WEAPON_FIRE,
+	ANIM_MELEE_ATTACK_2ND,
+	ANIM_MELEE_ATTACK_START,
+	ANIM_THROWABLE_THROW = ANIM_WEAPON_FIRE,
+	ANIM_THROWABLE_THROWU,
+	ANIM_THROWABLE_START_THROW,
+	ANIM_WEAPON_FIRE_2ND = ANIM_WEAPON_CROUCHFIRE,
+	ANIM_WEAPON_FIRE_3RD = ANIM_WEAPON_SPECIAL,
+
+	ANIM_SUNBATHE,
+	ANIM_SUNBATHE_DOWN,
+	ANIM_SUNBATHE_UP,
+	ANIM_SUNBATHE_ESCAPE,
+
+	ANIM_CPR,
+
+	ANIM_IDLE_STRETCH,
+	ANIM_IDLE_TIME,
+	ANIM_IDLE_SHOULDER,
+	ANIM_IDLE_STRETCH_LEG,
+
+	ANIM_RIOT_ANGRY,
+	ANIM_RIOT_ANGRY_B,
+	ANIM_RIOT_CHANT,
+	ANIM_RIOT_PUNCHES,
+	ANIM_RIOT_SHOUT,
+	ANIM_RIOT_CHALLENGE,
+	ANIM_RIOT_FUKU,
+
+	ANIM_STRIP_A,
+	ANIM_STRIP_B,
+	ANIM_STRIP_C,
+	ANIM_STRIP_D,
+	ANIM_STRIP_E,
+	ANIM_STRIP_F,
+	ANIM_STRIP_G,
+
 	NUM_ANIMS
 };

src/control/Script.cpp

@@ -3860,7 +3860,7 @@ int8 CRunningScript::ProcessCommands400To499(int32 command)
 	{
 		CollectParameters(&m_nIp, 2);
 		CPlayerPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
-		for (int i = 0; i < WEAPONTYPE_TOTAL_INVENTORY_WEAPONS; i++){
+		for (int i = 0; i < TOTAL_WEAPON_SLOTS; i++){
 			if (pPed->m_weapons[i].m_eWeaponType == ScriptParams[1])
 				pPed->m_nSelectedWepSlot = i;
 		}
@@ -3870,7 +3870,7 @@ int8 CRunningScript::ProcessCommands400To499(int32 command)
 	{
 		CollectParameters(&m_nIp, 2);
 		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
-		for (int i = 0; i < WEAPONTYPE_TOTAL_INVENTORY_WEAPONS; i++) {
+		for (int i = 0; i < TOTAL_WEAPON_SLOTS; i++) {
 			if (pPed->m_weapons[i].m_eWeaponType == ScriptParams[1])
 				pPed->SetCurrentWeapon(i);
 		}

src/core/Cam.cpp

@@ -1627,20 +1627,6 @@ CCam::Process_FollowPedWithMouse(const CVector &CameraTarget, float TargetOrient
 			entity = nil;
 	}
 
-	if(CamTargetEntity->m_rwObject){
-		// what's going on here?
-		if(RpAnimBlendClumpGetAssociation(CamTargetEntity->GetClump(), ANIM_WEAPON_PUMP) ||
-		   RpAnimBlendClumpGetAssociation(CamTargetEntity->GetClump(), ANIM_WEAPON_THROW) ||
-		   RpAnimBlendClumpGetAssociation(CamTargetEntity->GetClump(), ANIM_WEAPON_THROWU) ||
-		   RpAnimBlendClumpGetAssociation(CamTargetEntity->GetClump(), ANIM_WEAPON_START_THROW)){
-			CPed *player = FindPlayerPed();
-			float PlayerDist = (Source - player->GetPosition()).Magnitude();
-			if(PlayerDist < 2.75f)
-				Near = PlayerDist/2.75f * DEFAULT_NEAR - 0.3f;
-			RwCameraSetNearClipPlane(Scene.camera, Max(Near, 0.1f));
-		}
-	}
-
 	TheCamera.m_bCamDirectlyInFront = false;
 	TheCamera.m_bCamDirectlyBehind = false;
 

src/core/FileLoader.cpp

@@ -375,11 +375,11 @@ CFileLoader::FindRelatedModelInfoCB(RpAtomic *atomic, void *data)
 	mi = (CSimpleModelInfo*)CModelInfo::GetModelInfo(name, nil);
 	if(mi){
 		assert(mi->IsSimple());
+		CVisibilityPlugins::SetAtomicRenderCallback(atomic, nil);
 		mi->SetAtomic(n, atomic);
 		RpClumpRemoveAtomic(clump, atomic);
 		RpAtomicSetFrame(atomic, RwFrameCreate());
 		CVisibilityPlugins::SetAtomicModelInfo(atomic, mi);
-		CVisibilityPlugins::SetAtomicRenderCallback(atomic, nil);
 	}else{
 		debug("Can't find Atomic %s\n", name);
 	}
@@ -506,11 +506,11 @@ CFileLoader::SetRelatedModelInfoCB(RpAtomic *atomic, void *data)
 
 	nodename = GetFrameNodeName(RpAtomicGetFrame(atomic));
 	GetNameAndLOD(nodename, name, &n);
+	CVisibilityPlugins::SetAtomicRenderCallback(atomic, nil);
 	gpRelatedModelInfo->SetAtomic(n, atomic);
 	RpClumpRemoveAtomic(clump, atomic);
 	RpAtomicSetFrame(atomic, RwFrameCreate());
 	CVisibilityPlugins::SetAtomicModelInfo(atomic, gpRelatedModelInfo);
-	CVisibilityPlugins::SetAtomicRenderCallback(atomic, nil);
 	return atomic;
 }
 

src/core/Game.cpp

@@ -314,6 +314,7 @@ bool CGame::Initialise(const char* datFile)
 	printf("Streaming uses %dK of its memory", CStreaming::ms_memoryUsed / 1024);
 	LoadingScreen("Loading the Game", "Load animations", GetRandomSplashScreen());
 	CAnimManager::LoadAnimFiles();
+	CStreaming::LoadInitialWeapons();
 	CPed::Initialise();
 	CRouteNode::Initialise();
 	CEventList::Initialise();