[Scummvm-git-logs] scummvm master -> 78022b853017bd1f44b55a5341184645604182f6

[dreammaster]

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:
78022b8530 AGS: Fix some compiler warnings


Commit: 78022b853017bd1f44b55a5341184645604182f6
    https://github.com/scummvm/scummvm/commit/78022b853017bd1f44b55a5341184645604182f6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-02-22T21:16:38-08:00

Commit Message:
AGS: Fix some compiler warnings

Changed paths:
    engines/ags/engine/main/engine.cpp
    engines/ags/lib/allegro/surface.cpp
    engines/ags/shared/ac/spritecache.cpp
    engines/ags/shared/ac/spritecache.h


diff --git a/engines/ags/engine/main/engine.cpp b/engines/ags/engine/main/engine.cpp
index 0ac53c0831..9dfc9c9982 100644
--- a/engines/ags/engine/main/engine.cpp
+++ b/engines/ags/engine/main/engine.cpp
@@ -643,7 +643,7 @@ int engine_init_sprites() {
 		allegro_exit();
 		proper_exit = 1;
 		platform->DisplayAlert("Could not load sprite set file %s\n%s",
-		                       SpriteCache::DefaultSpriteFileName.GetCStr(),
+		                       SpriteCache::DefaultSpriteFileName,
 		                       err->FullMessage().GetCStr());
 		return EXIT_ERROR;
 	}
diff --git a/engines/ags/lib/allegro/surface.cpp b/engines/ags/lib/allegro/surface.cpp
index 325d0e704e..782d547fe1 100644
--- a/engines/ags/lib/allegro/surface.cpp
+++ b/engines/ags/lib/allegro/surface.cpp
@@ -149,10 +149,10 @@ void BITMAP::draw(const BITMAP *srcBitmap, const Common::Rect &srcRect,
 				format.colorToARGB(pal[*srcVal], aSrc, rSrc, gSrc, bSrc);
 				break;
 			case 2:
-				src.format.colorToARGB(*(uint16 *)srcVal, aSrc, rSrc, gSrc, bSrc);
+				src.format.colorToARGB(*(const uint16 *)srcVal, aSrc, rSrc, gSrc, bSrc);
 				break;
 			case 4:
-				src.format.colorToARGB(*(uint32 *)srcVal, aSrc, rSrc, gSrc, bSrc);
+				src.format.colorToARGB(*(const uint32 *)srcVal, aSrc, rSrc, gSrc, bSrc);
 				break;
 			default:
 				error("Unknown format");
diff --git a/engines/ags/shared/ac/spritecache.cpp b/engines/ags/shared/ac/spritecache.cpp
index 0f1ed2b131..1e3f5edf59 100644
--- a/engines/ags/shared/ac/spritecache.cpp
+++ b/engines/ags/shared/ac/spritecache.cpp
@@ -58,8 +58,8 @@ extern void get_new_size_for_sprite(int, int, int, int &, int &);
 const char *spindexid = "SPRINDEX";
 
 // TODO: should not be part of SpriteCache, but rather some asset management class?
-const String SpriteCache::DefaultSpriteFileName = "acsprset.spr";
-const String SpriteCache::DefaultSpriteIndexName = "sprindex.dat";
+const char *SpriteCache::DefaultSpriteFileName = "acsprset.spr";
+const char *SpriteCache::DefaultSpriteIndexName = "sprindex.dat";
 
 
 SpriteInfo::SpriteInfo()
diff --git a/engines/ags/shared/ac/spritecache.h b/engines/ags/shared/ac/spritecache.h
index 712985ef24..f541a33f90 100644
--- a/engines/ags/shared/ac/spritecache.h
+++ b/engines/ags/shared/ac/spritecache.h
@@ -117,8 +117,8 @@ public:
 	static const size_t   MAX_SPRITE_SLOTS = INT32_MAX;
 
 	// Standart sprite file and sprite index names
-	static const Shared::String DefaultSpriteFileName;
-	static const Shared::String DefaultSpriteIndexName;
+	static const char *DefaultSpriteFileName;
+	static const char *DefaultSpriteIndexName;
 
 	SpriteCache(std::vector<SpriteInfo> &sprInfos);
 	~SpriteCache();