[Scummvm-git-logs] scummvm master -> 3ef9fb93fd38790edca3ae24159eebd16950a9c3

neuromancer noreply at scummvm.org
Fri Jun 3 18:59:25 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:
3ef9fb93fd HYPNO: Add a missing argument in function call


Commit: 3ef9fb93fd38790edca3ae24159eebd16950a9c3
    https://github.com/scummvm/scummvm/commit/3ef9fb93fd38790edca3ae24159eebd16950a9c3
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2022-06-03T20:59:23+02:00

Commit Message:
HYPNO: Add a missing argument in function call

Reported by GCC 12:

../scummvm/engines/hypno/cursors.cpp:146:96: warning: the address of 'Hypno::HypnoEngine::_pixelFormat' will never be NULL [-Waddress]
  146 |         CursorMan.replaceCursor(entry->getPixels(), entry->w, entry->h, hotspotX, hotspotY, 0, &_pixelFormat);
      |                                                                                                ^~~~~~~~~~~~~

Changed paths:
    engines/hypno/cursors.cpp


diff --git a/engines/hypno/cursors.cpp b/engines/hypno/cursors.cpp
index aeb34c183a1..6da21b888dd 100644
--- a/engines/hypno/cursors.cpp
+++ b/engines/hypno/cursors.cpp
@@ -153,7 +153,7 @@ void HypnoEngine::changeCursor(const Common::String &cursor, uint32 n, bool cent
 	Graphics::Surface *entry = decodeFrame(cursor, n, &palette);
 	uint32 hotspotX = centerCursor ? entry->w / 2 : 0;
 	uint32 hotspotY = centerCursor ? entry->h / 2 : 0;
-	CursorMan.replaceCursor(entry->getPixels(), entry->w, entry->h, hotspotX, hotspotY, 0, &_pixelFormat);
+	CursorMan.replaceCursor(entry->getPixels(), entry->w, entry->h, hotspotX, hotspotY, 0, false, &_pixelFormat);
 	CursorMan.replaceCursorPalette(palette, 0, 256);
 	entry->free();
 	delete entry;
@@ -163,7 +163,7 @@ void HypnoEngine::changeCursor(const Common::String &cursor, uint32 n, bool cent
 void HypnoEngine::changeCursor(const Graphics::Surface &entry, byte *palette, bool centerCursor) {
 	uint32 hotspotX = centerCursor ? entry.w / 2 : 0;
 	uint32 hotspotY = centerCursor ? entry.h / 2 : 0;
-	CursorMan.replaceCursor(entry.getPixels(), entry.w, entry.h, hotspotX, hotspotY, 0, &_pixelFormat);
+	CursorMan.replaceCursor(entry.getPixels(), entry.w, entry.h, hotspotX, hotspotY, 0, false, &_pixelFormat);
 	CursorMan.replaceCursorPalette(palette, 0, 256);
 	CursorMan.showMouse(true);
 }




More information about the Scummvm-git-logs mailing list