[Scummvm-git-logs] scummvm master -> 00876a10927899f314f892031ba46f1af15d61cc

[lephilousophe]

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:
00876a1092 AGS: Fix int vs. int32_t discrepancies


Commit: 00876a10927899f314f892031ba46f1af15d61cc
    https://github.com/scummvm/scummvm/commit/00876a10927899f314f892031ba46f1af15d61cc
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-04-24T21:12:17+02:00

Commit Message:
AGS: Fix int vs. int32_t discrepancies

Changed paths:
    engines/ags/engine/ac/global_inventory_item.cpp
    engines/ags/engine/ac/gui_control.cpp
    engines/ags/shared/gui/gui_main.cpp
    engines/ags/shared/gui/gui_main.h


diff --git a/engines/ags/engine/ac/global_inventory_item.cpp b/engines/ags/engine/ac/global_inventory_item.cpp
index 64f2e6974de..1e5037f2a9a 100644
--- a/engines/ags/engine/ac/global_inventory_item.cpp
+++ b/engines/ags/engine/ac/global_inventory_item.cpp
@@ -70,7 +70,7 @@ int GetInvAt(int atx, int aty) {
 	int ongui = GetGUIAt(atx, aty);
 	if (ongui >= 0) {
 		data_to_game_coords(&atx, &aty);
-		int onobj = _GP(guis)[ongui].FindControlAt(atx, aty);
+		int32_t onobj = _GP(guis)[ongui].FindControlAt(atx, aty);
 		GUIObject *guio = _GP(guis)[ongui].GetControl(onobj);
 		if (guio) {
 			_G(mouse_ifacebut_xoffs) = atx - _GP(guis)[ongui].X - guio->X;
diff --git a/engines/ags/engine/ac/gui_control.cpp b/engines/ags/engine/ac/gui_control.cpp
index 05561ff0e56..be2872d5f88 100644
--- a/engines/ags/engine/ac/gui_control.cpp
+++ b/engines/ags/engine/ac/gui_control.cpp
@@ -49,7 +49,7 @@ GUIObject *GetGUIControlAtLocation(int xx, int yy) {
 		return nullptr;
 
 	data_to_game_coords(&xx, &yy);
-	int toret = _GP(guis)[guinum].FindControlAt(xx, yy, 0, false);
+	int32_t toret = _GP(guis)[guinum].FindControlAt(xx, yy, 0, false);
 
 	if (toret < 0)
 		return nullptr;
diff --git a/engines/ags/shared/gui/gui_main.cpp b/engines/ags/shared/gui/gui_main.cpp
index 3145be1303d..3a45fdd9c86 100644
--- a/engines/ags/shared/gui/gui_main.cpp
+++ b/engines/ags/shared/gui/gui_main.cpp
@@ -91,7 +91,7 @@ void GUIMain::InitDefaults() {
 	_ctrlDrawOrder.clear();
 }
 
-int GUIMain::FindControlAt(int atx, int aty, int leeway, bool must_be_clickable) const {
+int32_t GUIMain::FindControlAt(int atx, int aty, int leeway, bool must_be_clickable) const {
 	// translate to GUI's local coordinates
 	return FindControlAtLocal(atx - X, aty - Y, leeway, must_be_clickable);
 }
@@ -125,19 +125,19 @@ int32_t GUIMain::GetControlCount() const {
 	return (int32_t)_controls.size();
 }
 
-GUIObject *GUIMain::GetControl(int index) const {
+GUIObject *GUIMain::GetControl(int32_t index) const {
 	if (index < 0 || (size_t)index >= _controls.size())
 		return nullptr;
 	return _controls[index];
 }
 
-GUIControlType GUIMain::GetControlType(int index) const {
+GUIControlType GUIMain::GetControlType(int32_t index) const {
 	if (index < 0 || (size_t)index >= _ctrlRefs.size())
 		return kGUIControlUndefined;
 	return _ctrlRefs[index].first;
 }
 
-int32_t GUIMain::GetControlID(int index) const {
+int32_t GUIMain::GetControlID(int32_t index) const {
 	if (index < 0 || (size_t)index >= _ctrlRefs.size())
 		return -1;
 	return _ctrlRefs[index].second;
@@ -200,7 +200,7 @@ void GUIMain::RemoveAllControls() {
 	_controls.clear();
 }
 
-bool GUIMain::BringControlToFront(int index) {
+bool GUIMain::BringControlToFront(int32_t index) {
 	return SetControlZOrder(index, (int)_controls.size() - 1);
 }
 
@@ -391,11 +391,11 @@ void GUIMain::SetConceal(bool on) {
 	MarkChanged();
 }
 
-bool GUIMain::SendControlToBack(int index) {
+bool GUIMain::SendControlToBack(int32_t index) {
 	return SetControlZOrder(index, 0);
 }
 
-bool GUIMain::SetControlZOrder(int index, int zorder) {
+bool GUIMain::SetControlZOrder(int32_t index, int zorder) {
 	if (index < 0 || (size_t)index >= _controls.size())
 		return false; // no such control
 
diff --git a/engines/ags/shared/gui/gui_main.h b/engines/ags/shared/gui/gui_main.h
index cb97982e34a..c664469c271 100644
--- a/engines/ags/shared/gui/gui_main.h
+++ b/engines/ags/shared/gui/gui_main.h
@@ -112,11 +112,11 @@ public:
 	// Gets the number of the GUI child controls
 	int32_t GetControlCount() const;
 	// Gets control by its child's index
-	GUIObject *GetControl(int index) const;
+	GUIObject *GetControl(int32_t index) const;
 	// Gets child control's type, looks up with child's index
-	GUIControlType GetControlType(int index) const;
+	GUIControlType GetControlType(int32_t index) const;
 	// Gets child control's global ID, looks up with child's index
-	int32_t GetControlID(int index) const;
+	int32_t GetControlID(int32_t index) const;
 
 	// Child control management
 	// Note that currently GUIMain does not own controls (should not delete them)
@@ -124,21 +124,21 @@ public:
 	void    RemoveAllControls();
 
 	// Operations
-	bool    BringControlToFront(int index);
+	bool    BringControlToFront(int32_t index);
 	void    Draw(Bitmap *ds);
 	void    DrawAt(Bitmap *ds, int x, int y);
 	// Polls GUI state, providing current cursor (mouse) coordinates
 	void    Poll(int mx, int my);
 	HError  RebuildArray();
 	void    ResortZOrder();
-	bool    SendControlToBack(int index);
+	bool    SendControlToBack(int32_t index);
 	// Sets whether GUI should react to player clicking on it
 	void    SetClickable(bool on);
 	// Override GUI visibility; when in concealed mode GUI won't show up
 	// even if Visible = true
 	void    SetConceal(bool on);
 	// Attempts to change control's zorder; returns if zorder changed
-	bool    SetControlZOrder(int index, int zorder);
+	bool    SetControlZOrder(int32_t index, int zorder);
 	// Changes GUI style to the text window or back
 	void    SetTextWindow(bool on);
 	// Sets GUI transparency as a percentage (0 - 100) where 100 = invisible