[Scummvm-git-logs] scummvm master -> 5c7ce253e7f1de641c89304cd4a3d2c797eaa5b1

[mduggan]

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:
5c7ce253e7 ULTIMA8: Remove warnings from some unfinished code


Commit: 5c7ce253e7f1de641c89304cd4a3d2c797eaa5b1
    https://github.com/scummvm/scummvm/commit/5c7ce253e7f1de641c89304cd4a3d2c797eaa5b1
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-05-14T06:22:56+09:00

Commit Message:
ULTIMA8: Remove warnings from some unfinished code

Changed paths:
    engines/ultima/ultima8/convert/crusader/convert_usecode_crusader.h
    engines/ultima/ultima8/graphics/shape.cpp
    engines/ultima/ultima8/gumps/cru_ammo_gump.cpp
    engines/ultima/ultima8/gumps/cru_inventory_gump.cpp
    engines/ultima/ultima8/gumps/cru_weapon_gump.cpp


diff --git a/engines/ultima/ultima8/convert/crusader/convert_usecode_crusader.h b/engines/ultima/ultima8/convert/crusader/convert_usecode_crusader.h
index 5e704d9c08..5879fe167d 100644
--- a/engines/ultima/ultima8/convert/crusader/convert_usecode_crusader.h
+++ b/engines/ultima/ultima8/convert/crusader/convert_usecode_crusader.h
@@ -78,7 +78,7 @@ const char* const ConvertUsecodeCrusader::_intrinsics[] = {
 	"byte Intrinsic008(4 bytes)",
 	"byte Item::I_getZ(Item *)",
 	"void Intrinsic00A(4 bytes)",
-	"int16 I_getSOMETHING_09(MainActor *???)",
+	"int16 I_getSOMETHING_09(MainActor *?)",
 	"void Intrinsic00C(2 bytes)",
 	"byte Intrinsic00D(6 bytes)",
 	"int16 Intrinsic00E(8 bytes)",
diff --git a/engines/ultima/ultima8/graphics/shape.cpp b/engines/ultima/ultima8/graphics/shape.cpp
index 84f4ffeede..575c178f91 100644
--- a/engines/ultima/ultima8/graphics/shape.cpp
+++ b/engines/ultima/ultima8/graphics/shape.cpp
@@ -173,10 +173,11 @@ Common::Array<RawShapeFrame *> Shape::loadGenericFormat(const uint8 *data, uint3
 
 	// Skip unknown
 	if (format->_bytes_header_unk && format != &Crusader2DShapeFormat) {
-		uint32 val = ds.readX(format->_bytes_header_unk);
-		uint16 lowval = val & 0xff;
-		uint16 highval = (val >> 16) & 0xff;
-		uint32 dummy = 0 + lowval + highval + val;
+		//uint32 val =
+		ds.readX(format->_bytes_header_unk);
+		//uint16 lowval = val & 0xff;
+		//uint16 highval = (val >> 16) & 0xff;
+		//uint32 dummy = 0 + lowval + highval + val;
 	} else {
 		// Appears to be shape Width x Height for Crusader 2D shapes,
 		// not needed - we get them by frame.
@@ -197,8 +198,7 @@ Common::Array<RawShapeFrame *> Shape::loadGenericFormat(const uint8 *data, uint3
 
 		// Skip the unknown
 		if (format->_bytes_frameheader_unk) {
-			uint32 val = ds.readX(format->_bytes_frameheader_unk);
-			uint32 dummy = 0 + val;
+			ds.readX(format->_bytes_frameheader_unk);
 		}
 
 		// Read frame_length
diff --git a/engines/ultima/ultima8/gumps/cru_ammo_gump.cpp b/engines/ultima/ultima8/gumps/cru_ammo_gump.cpp
index 116aa56bfe..d253245dbc 100644
--- a/engines/ultima/ultima8/gumps/cru_ammo_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_ammo_gump.cpp
@@ -78,7 +78,7 @@ void CruAmmoGump::PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled)
 	}
 
 	uint16 weapon = a->getDamageType(); // ?? TODO: Where do we store current weapon?
-	const ShapeFrame *frame = _ammoShape->getFrame(weapon);
+	/*const ShapeFrame *frame = */_ammoShape->getFrame(weapon);
 	// TODO: Paint the current weapon
 }
 
diff --git a/engines/ultima/ultima8/gumps/cru_inventory_gump.cpp b/engines/ultima/ultima8/gumps/cru_inventory_gump.cpp
index 74dda19792..8ee296a487 100644
--- a/engines/ultima/ultima8/gumps/cru_inventory_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_inventory_gump.cpp
@@ -78,7 +78,7 @@ void CruInventoryGump::PaintThis(RenderSurface *surf, int32 lerp_factor, bool sc
 	}
 
 	uint16 weapon = a->getDamageType(); // ?? TODO: Where do we store item weapon?
-	const ShapeFrame *frame = _inventoryShape->getFrame(weapon);
+	/*const ShapeFrame *frame = */_inventoryShape->getFrame(weapon);
 	// TODO: Paint the current selected item
 }
 
diff --git a/engines/ultima/ultima8/gumps/cru_weapon_gump.cpp b/engines/ultima/ultima8/gumps/cru_weapon_gump.cpp
index 10be23994d..a81c9ab4f1 100644
--- a/engines/ultima/ultima8/gumps/cru_weapon_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_weapon_gump.cpp
@@ -78,7 +78,7 @@ void CruWeaponGump::PaintThis(RenderSurface *surf, int32 lerp_factor, bool scale
 	}
 
 	uint16 weapon = a->getDamageType(); // ?? TODO: Where do we store current weapon?
-	const ShapeFrame *frame = _weaponShape->getFrame(weapon);
+	/*const ShapeFrame *frame = */_weaponShape->getFrame(weapon);
 	// TODO: Paint the current weapon
 }