[Scummvm-git-logs] scummvm master -> 150df392b435b7e89754869bb7991c0452eed18a

[tag2015]

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

Summary:
150df392b4 AGS: Engine: fixed <3.6.0 Animate functions default volume parameter


Commit: 150df392b435b7e89754869bb7991c0452eed18a
    https://github.com/scummvm/scummvm/commit/150df392b435b7e89754869bb7991c0452eed18a
Author: Walter Agazzi (walter.agazzi at protonmail.com)
Date: 2023-04-29T14:32:39+02:00

Commit Message:
AGS: Engine: fixed <3.6.0 Animate functions default volume parameter

>From upstream d8d94b36a3e4e7fe201e93965952698fc6c8da5e

Changed paths:
    engines/ags/engine/ac/button.cpp
    engines/ags/engine/ac/character.cpp
    engines/ags/engine/ac/global_object.cpp
    engines/ags/engine/ac/object.cpp


diff --git a/engines/ags/engine/ac/button.cpp b/engines/ags/engine/ac/button.cpp
index 9ca362f2d18..3574bcee9f9 100644
--- a/engines/ags/engine/ac/button.cpp
+++ b/engines/ags/engine/ac/button.cpp
@@ -119,12 +119,12 @@ void Button_AnimateEx(GUIButton *butt, int view, int loop, int speed,
 }
 
 void Button_Animate(GUIButton *butt, int view, int loop, int speed, int repeat) {
-	Button_AnimateEx(butt, view, loop, speed, repeat, IN_BACKGROUND, FORWARDS, 0, 100);
+	Button_AnimateEx(butt, view, loop, speed, repeat, IN_BACKGROUND, FORWARDS, 0, 100 /* full volume */);
 }
 
 void Button_Animate7(GUIButton *butt, int view, int loop, int speed, int repeat, int blocking, int direction, int sframe) {
-	 Button_AnimateEx(butt, view, loop, speed, repeat, blocking, direction, sframe, 100);
- }
+	Button_AnimateEx(butt, view, loop, speed, repeat, blocking, direction, sframe, 100 /* full volume */);
+}
 
 const char *Button_GetText_New(GUIButton *butt) {
 	return CreateNewScriptString(butt->GetText().GetCStr());
diff --git a/engines/ags/engine/ac/character.cpp b/engines/ags/engine/ac/character.cpp
index e0db154cdcb..59f47b56791 100644
--- a/engines/ags/engine/ac/character.cpp
+++ b/engines/ags/engine/ac/character.cpp
@@ -178,7 +178,7 @@ void Character_AnimateEx(CharacterInfo *chaa, int loop, int delay, int repeat,
 }
 
 void Character_Animate(CharacterInfo *chaa, int loop, int delay, int repeat, int blocking, int direction) {
-	Character_AnimateEx(chaa, loop, delay, repeat, blocking, direction, 0, -1);
+	Character_AnimateEx(chaa, loop, delay, repeat, blocking, direction, 0, 100 /* full volume */);
 }
 
 void Character_ChangeRoomAutoPosition(CharacterInfo *chaa, int room, int newPos) {
diff --git a/engines/ags/engine/ac/global_object.cpp b/engines/ags/engine/ac/global_object.cpp
index 6cc1de8916b..f9ddc037e66 100644
--- a/engines/ags/engine/ac/global_object.cpp
+++ b/engines/ags/engine/ac/global_object.cpp
@@ -269,7 +269,7 @@ static void LegacyAnimateObjectImpl(int obn, int loopn, int spdd, int rept,
 	if (obn >= LEGACY_ANIMATE_CHARIDBASE) {
 		scAnimateCharacter(obn - LEGACY_ANIMATE_CHARIDBASE, loopn, spdd, rept);
 	} else {
-		AnimateObjectImpl(obn, loopn, spdd, rept, direction, blocking, 0);
+		AnimateObjectImpl(obn, loopn, spdd, rept, direction, blocking, 0, 100 /* full volume */);
 	}
 }
 
diff --git a/engines/ags/engine/ac/object.cpp b/engines/ags/engine/ac/object.cpp
index c75029826d9..00a3a18a10b 100644
--- a/engines/ags/engine/ac/object.cpp
+++ b/engines/ags/engine/ac/object.cpp
@@ -142,7 +142,7 @@ void Object_AnimateEx(ScriptObject *objj, int loop, int delay, int repeat,
 }
 
 void Object_Animate(ScriptObject *objj, int loop, int delay, int repeat, int blocking, int direction) {
-	Object_AnimateEx(objj, loop, delay, repeat, blocking, direction, 0, -1);
+	Object_AnimateEx(objj, loop, delay, repeat, blocking, direction, 0, 100 /* full volume */);
 }
 
 void Object_StopAnimating(ScriptObject *objj) {