[Scummvm-git-logs] scummvm master -> 945285270724200bb255c5541c6da4ebcaa898ad

[mduggan]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
43b1359750 ULTIMA8: Add more Crusader animation values to enum
9452852707 ULTIMA8: Correct Remorse menu music id


Commit: 43b13597507e83980a122d37ce576fa871c4427b
    https://github.com/scummvm/scummvm/commit/43b13597507e83980a122d37ce576fa871c4427b
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-10-16T21:18:51+09:00

Commit Message:
ULTIMA8: Add more Crusader animation values to enum

Changed paths:
    engines/ultima/ultima8/world/actors/animation.h


diff --git a/engines/ultima/ultima8/world/actors/animation.h b/engines/ultima/ultima8/world/actors/animation.h
index b94ff8d736..ce41a0f98e 100644
--- a/engines/ultima/ultima8/world/actors/animation.h
+++ b/engines/ultima/ultima8/world/actors/animation.h
@@ -69,11 +69,11 @@ enum Sequence {
 	//36: Vividos only: magic?
 	//37: Mythran only: magic?
 	//38: Vividos only: ?
-	//39: unused
+	//39: unused in u8
 	//40: ? - could be a slow attack or quick block ???
-	//41: unused
+	//41: unused in u8
 	keepBalance = 42,
-	//43: unused
+	//43: unused in u8
 	fallBackwards = 44,
 	hang = 45,
 	climbUp = 46,
@@ -91,28 +91,50 @@ enum Sequence {
 	kick = 58,
 	startBlock = 59,
 	stopBlock = 60,
-	            //61: unused
-	            //62: unused
-	            //63: unused
+	            //61: unused in u8
+	            //62: unused in u8
+	            //63: unused in u8
 	// Some crusader-specific animations (some use the same IDs as above)
 	reload = 15,
 	combatRollLeft = 23,
 	combatRollRight = 24,
 	walkWithGun = 25,
 	kneelAndFire = 26,
+	slideLeft = 28,
 	slideRight = 29,
 	startRunWithLargeWeapon = 31,
 	teleportIn = 32,
 	teleportOut = 33,
 	startRunWithSmallWeapon = 34,
 	startRunWithLargeWeapon2 = 35,
+	advanceWithSmallWeapon = 36,
+	halfStep = 37,
 	startRun = 38,
 	stopRunningAndDrawWeapon = 39,
+	kneelStart = 40,
+	kneelEnd = 41,
 	kneelAndFire2 = 42,
 	kneelAndFire3 = 43,
+	advanceWithLargeWeapon = 44,
+	quickRetreat = 45,
+	kneelingWithSmallWeapon = 46,
+	kneelingWithLargeWeapon = 47,
+	run2 = 48,
+	runWithSmallWeapon = 49,
 	runWithLargeWeapon = 50,
+	kneelingRetreat = 51,
+	kneelingAdvance = 52,
+	kneelingSlowRetreat = 53,
+	fire2 = 54,
+	electrocuted = 55,
+	jumpForward = 56,
 	surrender = 57,
+	anotherJump = 58,
+	jumpLanding = 59,
 	surrenderStand = 60,
+	slowCombatRollLeft = 61,
+	slowCombatRollRight = 62,
+	finishFiring = 63,
 	teleportInReplacement = 0x1020,	//!< See notes in Actor::I_doAnim
 	teleportOutReplacement = 0x1021	//!< See notes in Actor::I_doAnim
 };


Commit: 945285270724200bb255c5541c6da4ebcaa898ad
    https://github.com/scummvm/scummvm/commit/945285270724200bb255c5541c6da4ebcaa898ad
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-10-16T21:19:17+09:00

Commit Message:
ULTIMA8: Correct Remorse menu music id

Changed paths:
    engines/ultima/ultima8/gumps/remorse_menu_gump.cpp


diff --git a/engines/ultima/ultima8/gumps/remorse_menu_gump.cpp b/engines/ultima/ultima8/gumps/remorse_menu_gump.cpp
index 0777cdba11..682ac3d188 100644
--- a/engines/ultima/ultima8/gumps/remorse_menu_gump.cpp
+++ b/engines/ultima/ultima8/gumps/remorse_menu_gump.cpp
@@ -51,7 +51,7 @@ namespace Ultima8 {
 
 DEFINE_RUNTIME_CLASSTYPE_CODE(RemorseMenuGump)
 
-static const int MENU_MUSIC_REMORSE = 21;
+static const int MENU_MUSIC_REMORSE = 20;
 static const int MENU_MUSIC_REGRET = 18;
 
 RemorseMenuGump::RemorseMenuGump()