[Scummvm-git-logs] scummvm master -> eeab444d578956ef029f587ac97e96b1d4f3895a

aquadran noreply at scummvm.org
Sun May 29 10:04:27 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:
eeab444d57 GLK: Silence few compiler warnings


Commit: eeab444d578956ef029f587ac97e96b1d4f3895a
    https://github.com/scummvm/scummvm/commit/eeab444d578956ef029f587ac97e96b1d4f3895a
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-05-29T12:04:21+02:00

Commit Message:
GLK: Silence few compiler warnings

Changed paths:
    engines/glk/scott/decompress_z80.cpp
    engines/glk/scott/scott.h


diff --git a/engines/glk/scott/decompress_z80.cpp b/engines/glk/scott/decompress_z80.cpp
index 1586f15bb24..5d7662e952c 100644
--- a/engines/glk/scott/decompress_z80.cpp
+++ b/engines/glk/scott/decompress_z80.cpp
@@ -29,12 +29,12 @@ namespace Scott {
 
 /* Sizes of some of the arrays in the snap structure */
 const int SNAPSHOT_RAM_PAGES = 16;
-const int SNAPSHOT_SLT_PAGES = 256;
-const int SNAPSHOT_ZXATASP_PAGES = 32;
-const int SNAPSHOT_ZXCF_PAGES = 64;
-const int SNAPSHOT_DOCK_EXROM_PAGES = 8;
-const int SNAPSHOT_JOYSTICKS = 7;
-const int SNAPSHOT_DIVIDE_PAGES = 4;
+//const int SNAPSHOT_SLT_PAGES = 256;
+//const int SNAPSHOT_ZXATASP_PAGES = 32;
+//const int SNAPSHOT_ZXCF_PAGES = 64;
+//const int SNAPSHOT_DOCK_EXROM_PAGES = 8;
+//const int SNAPSHOT_JOYSTICKS = 7;
+//const int SNAPSHOT_DIVIDE_PAGES = 4;
 
 void *libspectrumReallocN(void *ptr, size_t nmemb, size_t size) {
 	if (nmemb > SIZE_MAX / size)
diff --git a/engines/glk/scott/scott.h b/engines/glk/scott/scott.h
index b916e7a4f62..096d068ff7f 100644
--- a/engines/glk/scott/scott.h
+++ b/engines/glk/scott/scott.h
@@ -135,7 +135,7 @@ private:
 	Globals _globals;
 	char _nounText[16];
 	int _options = 0;   ///< Option flags set
-	int _width = 0;     ///< Terminal width
+	//int _width = 0;     ///< Terminal width
 	int _topHeight = 0; ///< Height of top window
 	int _topWidth = 0;
 




More information about the Scummvm-git-logs mailing list