[Scummvm-git-logs] scummvm master -> 0e8d0bc76f1a412afd526962ec3648a8abb2e534

[digitall]

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:
0e8d0bc76f AGS: Fix GCC Warnings in AGS Waves Plugin Code


Commit: 0e8d0bc76f1a412afd526962ec3648a8abb2e534
    https://github.com/scummvm/scummvm/commit/0e8d0bc76f1a412afd526962ec3648a8abb2e534
Author: D G Turner (digitall at scummvm.org)
Date: 2021-07-21T05:36:40+01:00

Commit Message:
AGS: Fix GCC Warnings in AGS Waves Plugin Code

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 1877f619c3..85c55b0110 100644
--- a/engines/ags/plugins/ags_waves/draw.cpp
+++ b/engines/ags/plugins/ags_waves/draw.cpp
@@ -240,7 +240,7 @@ void AGSWaves::DrawCylinder(ScriptMethodParams &params) {
 				cposy > height - 1) {
 				pixela[y * width + x] = SetColorRGBA(0, 0, 0, 0);
 			} else {
-				pixela[y * width + x] = pixelb[cposy & src2->w + cposx];
+				pixela[y * width + x] = pixelb[cposy * src2->w + cposx];
 			}
 		}
 	}
@@ -251,10 +251,10 @@ void AGSWaves::DrawCylinder(ScriptMethodParams &params) {
 void AGSWaves::DrawForceField(ScriptMethodParams &params) {
 	PARAMS4(int, spriteD, int, scale, float, speed, int, id);
 
-	if (id < 0 || id >4) {
+	if (id < 0 || id > 4) {
 		return;
 	}
-	if (b_time[id] == NULL) b_time[id] = 1.0;
+	if (b_time[id] == 0.0) b_time[id] = 1.0;
 	if (b_time[id] < 1.0) b_time[id] = 1.0;
 	b_time[id] += speed;
 	BITMAP *src = _engine->GetSpriteGraphic(spriteD);