TITANIC: Fixes/renaming for giving ingredients to Barbot

1 files changed, 15 insertions, 7 deletions

diff --git a/engines/titanic/npcs/barbot.h b/engines/titanic/npcs/barbot.h
index 258321150b..94830b2e7d 100644
--- a/engines/titanic/npcs/barbot.h
+++ b/engines/titanic/npcs/barbot.h
@@ -58,20 +58,20 @@ class CBarbot : public CTrueTalkNPC {
 	bool EnterRoomMsg(CEnterRoomMsg *msg);
 	bool TimerMsg(CTimerMsg *msg);
 private:
-	static int _v0;
+	static int _timesCalled;
 private:
 	FrameRanges _frames;
 	int _field108;
 	int _field10C;
 	int _field110;
-	bool _givenLemon;
-	bool _tvGiven;
-	int _field11C;
+	bool _addedLemon;
+	bool _addedTV;
+	bool _addedPuret;
 	int _field120;
 	int _field124;
-	int _field128;
-	bool _givenPuret;
-	int _field130;
+	bool _visCenterOnCounter;
+	bool _addedVodka;
+	bool _ingredientsGiven;
 	int _field134;
 	int _field138;
 	int _field13C;
@@ -89,6 +89,14 @@ private:
 	 * Plays a given range of movie frames
 	 */
 	void playRange(const FrameRange &range, uint flags = 0);
+
+	/**
+	 * Returns true if one of the ingredients (with the exception of Vodka)
+	 * is missing from the concoction
+	 */
+	bool areIngredientsMissing() const {
+		return !_addedPuret || !_addedLemon || !_addedVodka;
+	}
 public:
 	CLASSDEF;
 	CBarbot();