WAGE: Implement decrementUses()

scummvm · Feb 14, 2016 · b5d55fd · b5d55fd
1 parent adc5b87
commit b5d55fd
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/engines/wage/combat.cpp b/engines/wage/combat.cpp
@@ -232,7 +232,23 @@ void WageEngine::performAttack(Chr *attacker, Chr *victim, Obj *weapon) {
 }
 
 void WageEngine::decrementUses(Obj *obj) {
-	warning("STUB: decrementUses()");
+	int numberOfUses = obj->_numberOfUses;
+	if (numberOfUses != -1) {
+		numberOfUses--;
+		if (numberOfUses > 0) {
+			obj->_numberOfUses = numberOfUses;
+		} else {
+			if (!obj->_failureMessage.empty()) {
+				appendText(obj->_failureMessage.c_str());
+			}
+			if (obj->_returnToRandomScene) {
+				_world->move(obj, _world->getRandomScene());
+			} else {
+				_world->move(obj, _world->_storageScene);
+			}
+			obj->resetState(obj->_currentOwner, obj->_currentScene);
+		}
+	}
 }
 
 bool WageEngine::attackHit(Chr *attacker, Chr *victim, Obj *weapon, int targetIndex) {

diff --git a/engines/wage/entities.cpp b/engines/wage/entities.cpp
@@ -281,6 +281,10 @@ Designed *Obj::removeFromCharOrScene() {
 	return from;
 }
 
+void Obj::resetState(Chr *owner, Scene *scene) {
+	warning("STUB: Obj::resetState()");
+}
+
 Chr::Chr(String name, Common::SeekableReadStream *data) {
 	_name = name;
 	_classType = CHR;

diff --git a/engines/wage/entities.h b/engines/wage/entities.h
@@ -288,13 +288,10 @@ class Obj : public Designed {
 			_currentOwner = NULL;
 	}
 
-	void decrementNumberOfUses() {
-		if (_numberOfUses != -1)
-			_numberOfUses--;
-	}
-
 	Chr *removeFromChr();
 	Designed *removeFromCharOrScene();
+
+	void resetState(Chr *owner, Scene *scene);
 };
 
 class Scene : public Designed {