SCUMM: HE: Fix build and warnings

scummvm · Apr 21, 2024 · ffc8d3f · ffc8d3f
1 parent 84d64a0
commit ffc8d3f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/engines/scumm/he/logic/moonbase_logic.cpp b/engines/scumm/he/logic/moonbase_logic.cpp
@@ -467,10 +467,15 @@ bool LogicHEmoonbase::overrideImageHitTest(int *outValue, int globNum, int state
 		return false;
 	}
 
-	if (!_vm->_wiz->moonbaseLayeredWizHitTest(outValue, 0, globPtr, state, x, y, flags, 0)) {
+	int32 actualValue = 0;
+	int32 eatValue = 0;
+
+	if (!_vm->_wiz->moonbaseLayeredWizHitTest(&eatValue, &actualValue, globPtr, state, x, y, flags, (uint32)0)) {
 		return false;
 	}
 
+	*outValue = (int)eatValue;
+
 	return true;
 }
 
@@ -486,7 +491,7 @@ bool LogicHEmoonbase::overrideImagePixelHitTest(int *outValue, int globNum, int
 	int32 actualValue = ~0;
 	int32 eatValue = 0;
 
-	if (!_vm->_wiz->moonbaseLayeredWizHitTest(&eatValue, &actualValue, globPtr, state, x, y, flags, 0)) {
+	if (!_vm->_wiz->moonbaseLayeredWizHitTest(&eatValue, &actualValue, globPtr, state, x, y, flags, (uint32)0)) {
 		return false;
 	}
 

diff --git a/engines/scumm/he/moonbase/moonbase_gfx.cpp b/engines/scumm/he/moonbase/moonbase_gfx.cpp
@@ -174,7 +174,7 @@ bool Wiz::drawMoonbaseLayeredWiz(
 	mappedRawbitmap.height = dstHeight;
 	mappedRawbitmap.dataSize = (mappedRawbitmap.width * sizeof(WizRawPixel16)) * mappedRawbitmap.height;
 
-	if (dstPitch != (mappedRawbitmap.width * sizeof(WizRawPixel16))) {
+	if (dstPitch != (int)(mappedRawbitmap.width * sizeof(WizRawPixel16))) {
 		return false;
 	}
 
@@ -197,9 +197,9 @@ bool Wiz::drawMoonbaseLayeredWiz(
 void Wiz::drawMoonbaseImageEx(
 	WizRawBitmap *bitmapPtr, WizImage *wizPtr, int x, int y, int state,
 	Common::Rect *clipRectPtr, int32 flags, Common::Rect *optionalSrcRect,
-	int32 conditionBits, WizRawPixel16 *ptr8BppToXBppClut, byte *altSourceBuffer) {
+	uint32 conditionBits, WizRawPixel16 *ptr8BppToXBppClut, byte *altSourceBuffer) {
 	WizMoonbaseCompressedImage fakedHeader;
-	int stateCompressionType;
+	int32 stateCompressionType;
 	WizRawBitmap fakedBitmap;
 	Common::Rect src, dstRect;
 	int32 sizeX, sizeY;
@@ -595,7 +595,7 @@ void Wiz::trleFLIPDecompMoonbaseImageHull(
 	}
 }
 
-bool Wiz::moonbaseLayeredWizHitTest(int32 *outValue, int32 *optionalOutActualValue, byte *globPtr, int state, int x, int y, int32 flags, int32 conditionBits) {
+bool Wiz::moonbaseLayeredWizHitTest(int32 *outValue, int32 *optionalOutActualValue, byte *globPtr, int state, int x, int y, int32 flags, uint32 conditionBits) {
 	WizImage wiz;
 
 	wiz.data = globPtr;
@@ -636,17 +636,17 @@ bool Wiz::moonbaseLayeredWizHitTest(int32 *outValue, int32 *optionalOutActualVal
 void Wiz::handleCompositeDrawMoonbaseImage(
 	WizRawBitmap *bitmapPtr, WizImage *wizPtr, byte *compositeInfoBlockPtr,
 	int x, int y, Common::Rect *srcRect, Common::Rect *clipRect,
-	int32 flags, int32 conditionBits, int32 outerSizeX, int32 outerSizeY,
+	int32 flags, uint32 conditionBits, int32 outerSizeX, int32 outerSizeY,
 	WizRawPixel16 *ptr8BppToXBppClut, byte *altSourceBuffer) {
 
 	int layerCount, xPos, yPos, subState, cmdSize;
-	int32 layerConditionBits, layerCmdDataBits;
-	int32 subConditionBits, drawFlags;
+	uint32 layerConditionBits, layerCmdDataBits;
+	uint32 subConditionBits, drawFlags;
 	WizImage nestedMultiStateWiz;
 	byte *nestedBlockHeader;
 	byte *nestedWizHeader;
 	byte *cmdPtr;
-	int32 conditionType;
+	uint32 conditionType;
 	int32 stateSizeX = 0, stateSizeY = 0;
 
 	// Get the nested block...	

diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp
@@ -2523,7 +2523,8 @@ void ScummEngine_v100he::o100_getSpriteGroupInfo() {
 		break;
 	case SO_NEW_GENERAL_PROPERTY:
 		type = pop();
-		if (spriteGroupId = pop())
+		spriteGroupId = pop();
+		if (spriteGroupId)
 			push(_sprite->getGroupGeneralProperty(spriteGroupId, type));
 		else
 			push(0);

diff --git a/engines/scumm/he/wiz_he.h b/engines/scumm/he/wiz_he.h
@@ -660,13 +660,13 @@ class Wiz {
 	void handleCompositeDrawMoonbaseImage(
 		WizRawBitmap *bitmapPtr, WizImage *wizPtr, byte *compositeInfoBlockPtr,
 		int x, int y, Common::Rect *srcRect, Common::Rect *clipRect,
-		int32 flags, int32 conditionBits, int32 outerSizeX, int32 outerSizeY,
+		int32 flags, uint32 conditionBits, int32 outerSizeX, int32 outerSizeY,
 		WizRawPixel16 *p8BppToXBppClut, byte *pAltSourceBuffer);
 
 	void drawMoonbaseImageEx(
 		WizRawBitmap *bitmapPtr, WizImage *wizPtr, int x, int y, int state,
 		Common::Rect *clipRectPtr, int32 flags, Common::Rect *optionalSrcRect,
-		int32 conditionBits, WizRawPixel16 *p8BppToXBppClut, byte *pAltSourceBuffer);
+		uint32 conditionBits, WizRawPixel16 *p8BppToXBppClut, byte *pAltSourceBuffer);
 
 	bool getRawMoonbaseBitmapInfoForState(WizRawBitmap *bitmapPtr, WizImage *wizPtr, int state);
 	void rawMoonbaseBitmapBlit(WizRawBitmap *dstBitmap, Common::Rect *dstRectPtr, WizRawBitmap *srcBitmap, Common::Rect *srcRectPtr);
@@ -678,7 +678,7 @@ class Wiz {
 		WizRawPixel16 *bufferPtr, int bufferWidth, Common::Rect *destRect, byte *compData, Common::Rect *sourceRect, byte *extraPtr,
 		void (*functionPtr)(Wiz *wiz, WizRawPixel *destPtr, byte *dataStream, int skipAmount, int decompAmount, byte *extraPtr));
 
-	bool moonbaseLayeredWizHitTest(int32 *outValue, int32 *pOptionalOutActualValue, byte *globPtr, int state, int x, int y, int32 flags, int32 dwConditionBits);
+	bool moonbaseLayeredWizHitTest(int32 *outValue, int32 *optionalOutActualValue, byte *globPtr, int state, int x, int y, int32 flags, uint32 conditionBits);
 
 	void dispatchBlitRGB555(
 		byte *bufferData, int bufferWidth, int bufferHeight, int bufferPitch,