[Scummvm-git-logs] scummvm master -> 780d10756cdab5f50ce0ae46aad4f9d284a00d2c

[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:
780d10756c AGS: Fix int32/int types and don't use int pointers as size may change


Commit: 780d10756cdab5f50ce0ae46aad4f9d284a00d2c
    https://github.com/scummvm/scummvm/commit/780d10756cdab5f50ce0ae46aad4f9d284a00d2c
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-07-19T12:52:05+02:00

Commit Message:
AGS: Fix int32/int types and don't use int pointers as size may change

Changed paths:
    engines/ags/plugins/ags_waves/draw.cpp


diff --git a/engines/ags/plugins/ags_waves/draw.cpp b/engines/ags/plugins/ags_waves/draw.cpp
index 0ecbb92f75..53a7fe9fdd 100644
--- a/engines/ags/plugins/ags_waves/draw.cpp
+++ b/engines/ags/plugins/ags_waves/draw.cpp
@@ -44,17 +44,17 @@ void AGSWaves::CastWave(int delayMax, int PixelsWide, int n) {
 }
 
 void AGSWaves::DrawEffect(int sprite_a, int sprite_b, int id, int n) {
-	int x, y;
+	int32 x, y;
 
 	BITMAP *src_a = _engine->GetSpriteGraphic(sprite_a);
 	BITMAP *src_b = _engine->GetSpriteGraphic(sprite_b);
 
-	unsigned int **pixel_a = (unsigned int **)_engine->GetRawBitmapSurface(src_a);
-	unsigned int **pixel_b = (unsigned int **)_engine->GetRawBitmapSurface(src_b);
+	uint32 **pixel_a = (uint32 **)_engine->GetRawBitmapSurface(src_a);
+	uint32 **pixel_b = (uint32 **)_engine->GetRawBitmapSurface(src_b);
 
-	int src_width = 640;
-	int src_height = 360;
-	int src_depth = 32;
+	int32 src_width = 640;
+	int32 src_height = 360;
+	int32 src_depth = 32;
 	_engine->GetBitmapDimensions(src_a, &src_width, &src_height, &src_depth);
 
 
@@ -79,9 +79,9 @@ void AGSWaves::DrawEffect(int sprite_a, int sprite_b, int id, int n) {
 
 
 		for (x = 0; x < src_width; x++) {
-			unsigned int colorfromB = pixel_b[y][x];
-			int getX = x;
-			int getY = y;
+			uint32 colorfromB = pixel_b[y][x];
+			int32 getX = x;
+			int32 getY = y;
 
 			if (id == 0) {
 				getX = x - ::AGS::g_vm->getRandomNumber(1) - 2;