Move check to better place

clintbellanger · Jul 7, 2012 · 56fe7ef · 56fe7ef
1 parent 0bac0e9
commit 56fe7ef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/GameStatePlay.cpp b/src/GameStatePlay.cpp
@@ -337,8 +337,6 @@ void GameStatePlay::checkLootDrop() {
 void GameStatePlay::checkConsumable() {
 	if (powers->used_item != -1) {
 		if (menu->items->items[powers->used_item].type == ITEM_TYPE_CONSUMABLE) {
-			//don't use untransform item if hero is not transformed
-			if (powers->powers[menu->items->items[powers->used_item].power].spawn_type == "untransform" && !pc->stats.transformed) return;
 			menu->inv->remove(powers->used_item);
 			powers->used_item = -1;
 		}

diff --git a/src/StatBlock.cpp b/src/StatBlock.cpp
@@ -508,6 +508,9 @@ StatBlock::~StatBlock() {
 bool StatBlock::canUsePower(const Power &power, unsigned powerid) const {
 	// needed to unlock shapeshifter powers
 	if (transformed) return mp >= power.requires_mp;
+
+	//don't use untransform power if hero is not transformed
+	else if (power.spawn_type == "untransform" && !transformed) return false;
 	else
 	return (!power.requires_mental_weapon || wielding_mental)
 		&& (!power.requires_offense_weapon || wielding_offense)