[Scummvm-git-logs] scummvm master -> 8af2dc3a8cf327099dd2679b5ebb04680b1325cf

[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:
8af2dc3a8c AGS: Fix Remaining Compiler Warnings


Commit: 8af2dc3a8cf327099dd2679b5ebb04680b1325cf
    https://github.com/scummvm/scummvm/commit/8af2dc3a8cf327099dd2679b5ebb04680b1325cf
Author: D G Turner (digitall at scummvm.org)
Date: 2022-06-17T12:19:37+01:00

Commit Message:
AGS: Fix Remaining Compiler Warnings

Changed paths:
    engines/ags/engine/ac/draw.cpp
    engines/ags/engine/ac/draw.h
    engines/ags/shared/util/buffered_stream.cpp


diff --git a/engines/ags/engine/ac/draw.cpp b/engines/ags/engine/ac/draw.cpp
index 22106aacce6..48944635191 100644
--- a/engines/ags/engine/ac/draw.cpp
+++ b/engines/ags/engine/ac/draw.cpp
@@ -766,7 +766,7 @@ void draw_sprite_slot_support_alpha(Bitmap *ds, bool ds_has_alpha, int xpos, int
 	                          blend_mode, alpha);
 }
 
-Engine::IDriverDependantBitmap* recycle_ddb_sprite(Engine::IDriverDependantBitmap *ddb, int sprite_id, Shared::Bitmap *source, bool has_alpha, bool opaque) {
+Engine::IDriverDependantBitmap* recycle_ddb_sprite(Engine::IDriverDependantBitmap *ddb, uint32 sprite_id, Shared::Bitmap *source, bool has_alpha, bool opaque) {
 	// no ddb, - get or create shared object
 	if (!ddb)
 		return _G(gfxDriver)->GetSharedDDB(sprite_id, source, has_alpha, opaque);
diff --git a/engines/ags/engine/ac/draw.h b/engines/ags/engine/ac/draw.h
index 426602011d6..ef1826f8db5 100644
--- a/engines/ags/engine/ac/draw.h
+++ b/engines/ags/engine/ac/draw.h
@@ -151,7 +151,7 @@ void mark_current_background_dirty();
 // Avoid freeing and reallocating the memory if possible
 Shared::Bitmap *recycle_bitmap(Shared::Bitmap *bimp, int coldep, int wid, int hit, bool make_transparent = false);
 void recycle_bitmap(std::unique_ptr<Shared::Bitmap> &bimp, int coldep, int wid, int hit, bool make_transparent = false);
-Engine::IDriverDependantBitmap* recycle_ddb_sprite(Engine::IDriverDependantBitmap *ddb, int sprite_id, Shared::Bitmap *source, bool has_alpha = false, bool opaque = false);
+Engine::IDriverDependantBitmap* recycle_ddb_sprite(Engine::IDriverDependantBitmap *ddb, uint32 sprite_id, Shared::Bitmap *source, bool has_alpha = false, bool opaque = false);
 inline Engine::IDriverDependantBitmap* recycle_ddb_bitmap(Engine::IDriverDependantBitmap *ddb, Shared::Bitmap *source, bool has_alpha = false, bool opaque = false) {
 	return recycle_ddb_sprite(ddb, UINT32_MAX, source, has_alpha, opaque);
 }
diff --git a/engines/ags/shared/util/buffered_stream.cpp b/engines/ags/shared/util/buffered_stream.cpp
index e73c40aa2e1..15101d42a73 100644
--- a/engines/ags/shared/util/buffered_stream.cpp
+++ b/engines/ags/shared/util/buffered_stream.cpp
@@ -143,7 +143,7 @@ size_t BufferedStream::Write(const void *buffer, size_t size) {
 	while (size > 0) {
 		if (_position < _bufferPosition || // seeked before buffer pos
 			_position > _bufferPosition + _buffer.size() || // seeked beyond buffer pos
-			_position >= _bufferPosition + BufferSize) // seeked, or exceeded buffer limit
+			_position >= _bufferPosition + (soff_t) BufferSize) // seeked, or exceeded buffer limit
 		{
 			FlushBuffer(_position);
 		}