Commit9ec05f9

committed

ItemManager: Add tooltip text for disabled equip slots

1 parentc4d63e9 commit9ec05f9Copy full SHA for 9ec05f9

File tree

+11

-1

lines changed

+11

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ Engine features:`
`43`	`43`	`* Added 'show_permadeath' option to menus/gamenew.txt config.`
`44`	`44`	`* Added 'log.padding' property to engine/widget_settings.txt config.`
`45`	`45`	`* Added 'sound.activate' property to engine/widget_settings.txt config.`
	`46`	`+* Added tooltip text for items that prevent use of other equip slots.`
`46`	`47`	`* Android: Enabled use of external input devices (gamepads, keyboards, mice)`
`47`	`48`
`48`	`49`	`Engine fixes:`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1095,6 +1095,15 @@ TooltipData ItemManager::getTooltip(ItemStack stack, StatBlock *stats, int conte`
`1095`	`1095`	`tip.addText(msg->get(item_type.name));`
`1096`	`1096`	`}`
`1097`	`1097`
	`1098`	`+if (!item->disable_slots.empty()) {`
	`1099`	`+for (size_t i =0; i < item->disable_slots.size(); ++i) {`
	`1100`	`+ItemType& disable_type =getItemType(item->disable_slots[i]);`
	`1101`	`+if (!disable_type.name.empty()) {`
	`1102`	`+tip.addColoredText(msg->getv("Prevents use of slot: %s", disable_type.name.c_str()), font->getColor(FontEngine::COLOR_ITEM_PENALTY));`
	`1103`	`+}`
	`1104`	`+}`
	`1105`	`+}`
	`1106`	`+`
`1098`	`1107`	`// item quality text for colorblind users`
`1099`	`1108`	`if (settings->colorblind && item->quality < item_qualities.size() && !item_qualities[item->quality].name.empty()) {`
`1100`	`1109`	`color = font->getColor(FontEngine::COLOR_WIDGET_NORMAL);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ FLARE. If not, see http://www.gnu.org/licenses/`
`30`	`30`
`31`	`31`	`#include<SDL.h>`
`32`	`32`
`33`		`-VersionVersionInfo::ENGINE(1,14,195);`
	`33`	`+VersionVersionInfo::ENGINE(1,14,196);`
`34`	`34`	`VersionVersionInfo::MIN(0,0,0);`
`35`	`35`	`VersionVersionInfo::MAX(USHRT_MAX, USHRT_MAX, USHRT_MAX);`
`36`	`36`

Comments

(0)