[Scummvm-git-logs] scummvm master -> 274500e0d7e721a78ab8c72b148256e041a155f6

dreammaster noreply at scummvm.org
Tue May 3 02:04:45 UTC 2022


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:
274500e0d7 AGS: Compilation fixes


Commit: 274500e0d7e721a78ab8c72b148256e041a155f6
    https://github.com/scummvm/scummvm/commit/274500e0d7e721a78ab8c72b148256e041a155f6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2022-05-02T19:04:31-07:00

Commit Message:
AGS: Compilation fixes

Changed paths:
    engines/ags/shared/gui/gui_main.h
    engines/ags/shared/gui/gui_slider.cpp


diff --git a/engines/ags/shared/gui/gui_main.h b/engines/ags/shared/gui/gui_main.h
index dce0388725f..b5be1f763ff 100644
--- a/engines/ags/shared/gui/gui_main.h
+++ b/engines/ags/shared/gui/gui_main.h
@@ -208,7 +208,7 @@ private:
 	// Array of child control references (not exclusively owned!)
 	std::vector<GUIObject *> _controls;
 	// Sorted array of controls in z-order.
-	std::vector<int32_t>    _ctrlDrawOrder;
+	std::vector<int>         _ctrlDrawOrder;
 };
 
 
diff --git a/engines/ags/shared/gui/gui_slider.cpp b/engines/ags/shared/gui/gui_slider.cpp
index 3456fc8629a..db18d9f77db 100644
--- a/engines/ags/shared/gui/gui_slider.cpp
+++ b/engines/ags/shared/gui/gui_slider.cpp
@@ -207,7 +207,7 @@ void GUISlider::OnMouseMove(int x, int y) {
 	if (!IsMousePressed)
 		return;
 
-	int value;
+	int32_t value;
 	assert(_handleRange > 0);
 	if (IsHorizontal())
 		value = (int)(((float)((x - X) - 2) * (float)(MaxValue - MinValue)) / (float)_handleRange) + MinValue;




More information about the Scummvm-git-logs mailing list