[Scummvm-git-logs] scummvm branch-2-6 -> 9a74f0d16acaf901db0652ceeea39bd73e3043e7

[criezy]

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:
9a74f0d16a AGS: Restored "Button::Animate^7" in API and fixed volume default


Commit: 9a74f0d16acaf901db0652ceeea39bd73e3043e7
    https://github.com/scummvm/scummvm/commit/9a74f0d16acaf901db0652ceeea39bd73e3043e7
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2022-06-25T23:34:12+01:00

Commit Message:
AGS: Restored "Button::Animate^7" in API and fixed volume default

"Animate^7" was an intermediate API function during 3.6.0 alpha
development, and apparently there are games which used it.

>From upstream eb4c0aec426c1501c84e93851e9aa31eaf8e2f27

Changed paths:
    engines/ags/engine/ac/button.cpp


diff --git a/engines/ags/engine/ac/button.cpp b/engines/ags/engine/ac/button.cpp
index 207d41767f6..a66259c854d 100644
--- a/engines/ags/engine/ac/button.cpp
+++ b/engines/ags/engine/ac/button.cpp
@@ -119,9 +119,13 @@ 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, -1);
+	Button_AnimateEx(butt, view, loop, speed, repeat, IN_BACKGROUND, FORWARDS, 0, 100);
 }
 
+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);
+ }
+
 const char *Button_GetText_New(GUIButton *butt) {
 	return CreateNewScriptString(butt->GetText().GetCStr());
 }
@@ -344,7 +348,11 @@ RuntimeScriptValue Sc_Button_Animate(void *self, const RuntimeScriptValue *param
 	API_OBJCALL_VOID_PINT4(GUIButton, Button_Animate);
 }
 
-RuntimeScriptValue Sc_Button_AnimateEx(void *self, const RuntimeScriptValue *params, int32_t param_count) {
+RuntimeScriptValue Sc_Button_Animate7(void *self, const RuntimeScriptValue *params, int32_t param_count) {
+	API_OBJCALL_VOID_PINT7(GUIButton, Button_Animate7);
+}
+
+RuntimeScriptValue Sc_Button_Animate8(void *self, const RuntimeScriptValue *params, int32_t param_count) {
 	API_OBJCALL_VOID_PINT8(GUIButton, Button_AnimateEx);
 }
 
@@ -458,7 +466,8 @@ RuntimeScriptValue Sc_Button_GetView(void *self, const RuntimeScriptValue *param
 
 void RegisterButtonAPI() {
 	ccAddExternalObjectFunction("Button::Animate^4", Sc_Button_Animate);
-	ccAddExternalObjectFunction("Button::Animate^8", Sc_Button_AnimateEx);
+	ccAddExternalObjectFunction("Button::Animate^7", Sc_Button_Animate7);
+	ccAddExternalObjectFunction("Button::Animate^8", Sc_Button_Animate8);
 	ccAddExternalObjectFunction("Button::Click^1", Sc_Button_Click);
 	ccAddExternalObjectFunction("Button::GetText^1", Sc_Button_GetText);
 	ccAddExternalObjectFunction("Button::SetText^1", Sc_Button_SetText);