AVALANCHE: cleanup acci2.h

2 files changed, 28 insertions, 107 deletions

diff --git a/engines/avalanche/acci2.cpp b/engines/avalanche/acci2.cpp
index ef6631184c..167faf1188 100644
--- a/engines/avalanche/acci2.cpp
+++ b/engines/avalanche/acci2.cpp
@@ -284,12 +284,6 @@ Common::String Acci::totalTime() {
 	return result + _vm->_gyro->strf(s) + " seconds.";
 }
 
-
-
-void Acci::number(Common::String &codes) {
-	warning("STUB: Acci::number()");
-}
-
 void Acci::cheatParse(Common::String codes) {
 //	uint16 num;
 //	int16 e;
@@ -1332,7 +1326,7 @@ void Acci::doThat() {
 
 	if ((_verb != kVerbCodeLoad) && (_verb != kVerbCodeSave) && (_verb != kVerbCodeQuit) && (_verb != kVerbCodeInfo) && (_verb != kVerbCodeHelp)
 	&& (_verb != kVerbCodeLarrypass) && (_verb != kVerbCodePhaon) && (_verb != kVerbCodeBoss) && (_verb != kVerbCodeCheat) && (_verb != kVerbCodeRestart) && (_verb != kVerbCodeDir)
-	&& (_verb != kVerbCodeScore) && (_verb != kVerbCodeHighscores) && (_verb != kVerbCodeSmartAlec)) {
+	&& (_verb != kVerbCodeScore) && (_verb != kVerbCodeHiscores) && (_verb != kVerbCodeSmartAlec)) {
 		if (!_vm->_gyro->alive) {
 			_vm->_scrolls->display(Common::String("You're dead, so don't talk. What are you, a ghost or something? Try restarting, or restoring a saved game!"));
 			return;
@@ -1885,7 +1879,7 @@ void Acci::doThat() {
 		} else
 			_vm->_visa->dixi('Q', 10);
 		break;
-	case kVerbCodePassword:
+	case kVerbCodePasswd:
 		if (_vm->_gyro->dna.room != r__bridge)
 			_vm->_visa->dixi('Q', 12);
 		else {
@@ -1959,7 +1953,7 @@ void Acci::doThat() {
 		_vm->_timeout->set_up_timer(1, _vm->_timeout->procjump, _vm->_timeout->reason_jumping);
 		_vm->_gyro->dna.user_moves_avvy = false;
 		break;
-	case kVerbCodeHighscores:
+	case kVerbCodeHiscores:
 		//	show_highs();
 		warning("STUB: Acci::doThat() - case kVerbCodehighscores");
 		break;
diff --git a/engines/avalanche/acci2.h b/engines/avalanche/acci2.h
index 4937bb47d4..d881eab222 100644
--- a/engines/avalanche/acci2.h
+++ b/engines/avalanche/acci2.h
@@ -41,67 +41,24 @@ class AvalancheEngine;
 class Acci {
 public:
 	enum VerbCode {
-		kVerbCodeExam = 1,
-		kVerbCodeOpen = 2,
-		kVerbCodePause = 3,
-		kVerbCodeGet = 4,
-		kVerbCodeDrop = 5,
-		kVerbCodeInv = 6,
-		kVerbCodeTalk = 7,
-		kVerbCodeGive = 8,
-		kVerbCodeDrink = 9,
-		kVerbCodeLoad = 10,
-		kVerbCodeSave = 11,
-		kVerbCodePay = 12,
-		kVerbCodeLook = 13,
-		kVerbCodeBreak = 14,
-		kVerbCodeQuit = 15,
-		kVerbCodeSit = 16,
-		kVerbCodeStand = 17,
-		kVerbCodeGo = 18,
-		kVerbCodeInfo = 19,
-		kVerbCodeUndress = 20,
-		kVerbCodeWear = 21,
-		kVerbCodePlay = 22,
-		kVerbCodeRing = 23,
-		kVerbCodeHelp = 24,
-		kVerbCodeLarrypass = 25,
-		kVerbCodePhaon = 26,
-		kVerbCodeBoss = 27,
-		kVerbCodePee = 28,
-		kVerbCodeCheat = 29,
-		kVerbCodeMagic = 30,
-		kVerbCodeRestart = 31,
-		kVerbCodeEat = 32,
-		kVerbCodeListen = 33,
-		kVerbCodeBuy = 34,
-		kVerbCodeAttack = 35,
-		kVerbCodePassword = 36,
-		kVerbCodeDir = 37,
-		kVerbCodeDie = 38,
-		kVerbCodeScore = 39,
-		kVerbCodePut = 40,
-		kVerbCodeKiss = 41,
-		kVerbCodeClimb = 42,
-		kVerbCodeJump = 43,
-		kVerbCodeHighscores = 44,
-		kVerbCodeWake = 45,
-		kVerbCodeHello = 46,
-		kVerbCodeThanks = 47,
-		kVerbCodeSmartAlec = 249,
-		kVerbCodeExpletive = 253
+		kVerbCodeExam = 1,     kVerbCodeOpen = 2,    kVerbCodePause = 3,   kVerbCodeGet = 4,       kVerbCodeDrop = 5,
+		kVerbCodeInv = 6,      kVerbCodeTalk = 7,    kVerbCodeGive = 8,    kVerbCodeDrink = 9,     kVerbCodeLoad = 10,
+		kVerbCodeSave = 11,    kVerbCodePay = 12,    kVerbCodeLook = 13,   kVerbCodeBreak = 14,    kVerbCodeQuit = 15,
+		kVerbCodeSit = 16,     kVerbCodeStand = 17,  kVerbCodeGo = 18,     kVerbCodeInfo = 19,     kVerbCodeUndress = 20,
+		kVerbCodeWear = 21,    kVerbCodePlay = 22,   kVerbCodeRing = 23,   kVerbCodeHelp = 24,     kVerbCodeLarrypass = 25,
+		kVerbCodePhaon = 26,   kVerbCodeBoss = 27,   kVerbCodePee = 28,    kVerbCodeCheat = 29,    kVerbCodeMagic = 30,
+		kVerbCodeRestart = 31, kVerbCodeEat = 32,    kVerbCodeListen = 33, kVerbCodeBuy = 34,      kVerbCodeAttack = 35,
+		kVerbCodePasswd = 36,  kVerbCodeDir = 37,    kVerbCodeDie = 38,    kVerbCodeScore = 39,    kVerbCodePut = 40,
+		kVerbCodeKiss = 41,    kVerbCodeClimb = 42,  kVerbCodeJump = 43,   kVerbCodeHiscores = 44, kVerbCodeWake = 45,
+		kVerbCodeHello = 46,   kVerbCodeThanks = 47, kVerbCodeSmartAlec = 249, kVerbCodeExpletive = 253
 	};
 
 	static const byte kPardon = 254; // Didn't understand / wasn't given.
-
 	static const int16 kParserWordsNum = 277; // How many words does the parser know?
 	static const byte kNothing = 250;
 	static const byte kMoved = 0; // This word was moved. (Usually because it was the subject of conversation.)
-
 	static const int16 kFirstPassword = 88; // words[kFirstPassword] should equal "TIROS".
 
-
-
 	struct VocabEntry {
 		byte _number;
 		Common::String _word;
@@ -109,102 +66,72 @@ public:
 
 	static const VocabEntry kVocabulary[kParserWordsNum];
 
-	static const char kWhat[];
+	Common::String _realWords[11];
+	byte _verb, _person, _thing;
+	bool _polite;
 
+	Acci(AvalancheEngine *vm);
 
+	void init();
+	void parse();
+	void doThat();
+	void verbOpt(byte verb, Common::String &answer, char &ansKey);
+	void drink();
 
+private:
 	struct RankType {
 		uint16 _score;
 		Common::String _title;
 	};
 
 	static const RankType kRanks[9];
-
-
+	static const char kWhat[];
 
 	Common::String _thats;
 	Common::String _unknown;
-	Common::String _realWords[11];
-	byte _verb, _person, _thing, _thing2;
-	bool _polite;
 
+	byte _thing2;
 
-
-
-	Acci(AvalancheEngine *vm);
-
-	void init();
-
-	void clearWords();
-	void parse();
-	void lookAround(); // This is called when you say "look".
-	void openDoor();
-	void doThat();
-	void verbOpt(byte verb, Common::String &answer, char &ansKey);
-	void drink();
-
-private:
 	AvalancheEngine *_vm;
 
-	byte fv;
-
 	byte wordNum(Common::String word);
 	void replace(Common::String oldChars, byte newChar);
 
 	Common::String rank();
 	Common::String totalTime();
 
-	void number(Common::String &codes);
+	void clearWords();
 	void cheatParse(Common::String codes);
-
 	void stripPunctuation(Common::String &word); // Strips punctuation from word.
-
 	void displayWhat(byte target, bool animate, bool &ambiguous); // << It's an adjective!
 	bool doPronouns();
-
 	void properNouns();
+	void lookAround(); // This is called when you say "look".
 	void sayIt();  // This makes Avalot say the response.
+	void openDoor();
 	void storeInterrogation(byte interrogation);
-
 	void examineObject(); // Examine a standard object-thing
-
 	bool isPersonHere();
-
 	void exampers();
-
 	bool holding();
-
 	void openBox(bool isOpening);
 	void examine();
-
 	void inventory();
-
 	void swallow();
-
 	void peopleInRoom(); // This lists the other people in the room.
-
 	void silly();
 	void putProc();  // Called when you call kVerbCodeput.
-
 	void notInOrder();
 	void goToCauldron();
 	bool giveToSpludwick(); // The result of this fn is whether or not he says "Hey, thanks!".
-
 	void cardiffClimbing();
-
 	void already();
 	void standUp(); // Called when you ask Avvy to stand.
-
 	void getProc(char thing);
-
 	void giveGeidaTheLute();
-
 	void playHarp();
-
 	void winSequence();
-
 	void personSpeaks();
-
 	void heyThanks();
 };