[Scummvm-git-logs] scummvm master -> 8f102f3ba5b711f2ee34526d8cdd732c47b61d2c
mduggan
mgithub at guarana.org
Tue Jul 28 05:35:00 UTC 2020
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:
8f102f3ba5 ULTIMA8: Remove duplicate variable to fix warning
Commit: 8f102f3ba5b711f2ee34526d8cdd732c47b61d2c
https://github.com/scummvm/scummvm/commit/8f102f3ba5b711f2ee34526d8cdd732c47b61d2c
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-07-28T14:34:49+09:00
Commit Message:
ULTIMA8: Remove duplicate variable to fix warning
Changed paths:
engines/ultima/ultima8/world/item_factory.cpp
diff --git a/engines/ultima/ultima8/world/item_factory.cpp b/engines/ultima/ultima8/world/item_factory.cpp
index dfdebbad3a..4eaaad1591 100644
--- a/engines/ultima/ultima8/world/item_factory.cpp
+++ b/engines/ultima/ultima8/world/item_factory.cpp
@@ -104,8 +104,7 @@ Item *ItemFactory::createItem(uint32 shape, uint32 frame, uint16 quality,
if (objId)
item->assignObjId();
if (GAME_IS_CRUSADER) {
- ShapeInfo *info = item->getShapeInfo();
- if (info && info->_damageInfo && info->_damageInfo->takesDamage()) {
+ if (info->_damageInfo && info->_damageInfo->takesDamage()) {
item->setDamagePoints(info->_damageInfo->damagePoints());
}
}
More information about the Scummvm-git-logs
mailing list