MM: MM1: Cleanup of encounter methods

engines/mm/mm1/views/encounter.cpp

@@ -62,7 +62,7 @@ void Encounter::draw() {
 
 	case SURPRISED_MONSTERS:
 		writeString(2, 21, STRING["dialogs.encounter.surprise"]);
-		writeString(1, 22, STRING["dialogs.encounter.surprise"]);
+		writeString(1, 22, STRING["dialogs.encounter.approach"]);
 		break;
 
 	case ENCOUNTER_OPTIONS: {
@@ -152,7 +152,7 @@ void Encounter::timeout() {
 	switch (_mode) {
 	case ALERT:
 		// Finished displaying initial encounter alert
-		if (enc._encounterType < 0 /* FORCE_SURPRISED */) {
+		if (enc._encounterType == Game::FORCE_SURPRISED) {
 			_mode = SURPRISED_BY_MONSTERS;
 		} else if (enc._encounterType == Game::NORMAL_SURPRISED ||
 			/* ENCOUNTER_OPTIONS */

engines/mm/mm1/views/encounter.h

@@ -46,12 +46,42 @@ private:
 	 * Handles the end of the encounter
 	 */
 	void encounterEnded();
+
+	/**
+	 * Initiates the combat
+	 */
 	void attack();
+
+	/**
+	 * Try and bribe the enemies
+	 */
 	void bribe();
+
+	/**
+	 * Try and retreat
+	 */
 	void retreat();
+
+	/**
+	 * Try and surrender
+	 */
 	void surrender();
+
+	/**
+	 * Ends an encounter
+	 */
 	void flee();
+
+	/**
+	 * Decreases the alignment counter, gradually turning
+	 * EVIL to NEUTRAL to GOOD
+	 */
 	void decreaseAlignments();
+
+	/**
+	 * Increases the alignment counter, gradually turning
+	 * GOOD to NEUTRAL to EVIL
+	 */
 	void increaseAlignments();
 public:
 	Encounter();