[Scummvm-git-logs] scummvm master -> 5c120727105612109cd0547ec8d03c1083abd8f9

digitall noreply at scummvm.org
Sun Nov 17 01:18:10 UTC 2024


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:
5c12072710 SCUMM: HE: Fix Duplicated Semicolons Causing GCC Compiler Warnings


Commit: 5c120727105612109cd0547ec8d03c1083abd8f9
    https://github.com/scummvm/scummvm/commit/5c120727105612109cd0547ec8d03c1083abd8f9
Author: D G Turner (digitall at scummvm.org)
Date: 2024-11-17T01:17:09Z

Commit Message:
SCUMM: HE: Fix Duplicated Semicolons Causing GCC Compiler Warnings

These are emitted if -Wpedantic is passed to GCC.

Changed paths:
    engines/scumm/he/moonbase/map_katton.h
    engines/scumm/he/moonbase/map_spiff.h


diff --git a/engines/scumm/he/moonbase/map_katton.h b/engines/scumm/he/moonbase/map_katton.h
index 02899bdffd8..72887768b9e 100644
--- a/engines/scumm/he/moonbase/map_katton.h
+++ b/engines/scumm/he/moonbase/map_katton.h
@@ -43,9 +43,9 @@ private:
 
 	int _size = 0; // 32, 40, 48, or 56
 	int _tileset = 0;
-	int _startloc[20][2] = { {}, {} };;
+	int _startloc[20][2] = { {}, {} };
 	int _board[MAX_TILE_COUNT][MAX_TILE_COUNT] = { {}, {} };
-	int _special[MAX_TILE_COUNT][MAX_TILE_COUNT] = { {}, {} };;
+	int _special[MAX_TILE_COUNT][MAX_TILE_COUNT] = { {}, {} };
 
 	int getRandomNumber();
 
diff --git a/engines/scumm/he/moonbase/map_spiff.h b/engines/scumm/he/moonbase/map_spiff.h
index 881ecd220b7..1148cefd56c 100644
--- a/engines/scumm/he/moonbase/map_spiff.h
+++ b/engines/scumm/he/moonbase/map_spiff.h
@@ -77,8 +77,8 @@ private:
 
 	int _mapCornerMaxG = 0; // size of random section
 	int _mapMiddleMaxG = 0;
-	int _mapCorner[MAXSIZE+1][MAXSIZE+1] = { {}, {} };;
-	int _mapMiddle[MAXSIZE][MAXSIZE] = { {}, {} };;
+	int _mapCorner[MAXSIZE+1][MAXSIZE+1] = { {}, {} };
+	int _mapMiddle[MAXSIZE][MAXSIZE] = { {}, {} };
 
 	float getRandomFloat();
 	int spiffRand(int min, int max);




More information about the Scummvm-git-logs mailing list