AVALANCHE: Everything that is missing from the last commit...

6 files changed, 61 insertions, 61 deletions

diff --git a/engines/avalanche/acci2.cpp b/engines/avalanche/acci2.cpp
index 4938aaa0c2..bdbb6174d3 100644
--- a/engines/avalanche/acci2.cpp
+++ b/engines/avalanche/acci2.cpp
@@ -379,7 +379,7 @@ void Acci::storeInterrogation(byte interrogation) {
 	while ((_vm->_parser->_inputText.lastChar() == ' ') && (!_vm->_parser->_inputText.empty()))
 		_vm->_parser->_inputText.deleteLastChar();
 
-	_vm->_timeout->lose_timer(_vm->_timeout->reason_cardiffsurvey); // If you want to use any other timer, put this into the case statement.
+	_vm->_timeout->lose_timer(_vm->_timeout->kReasonCardiffsurvey); // If you want to use any other timer, put this into the case statement.
 
 	switch (interrogation) {
 	case 1:
@@ -1041,7 +1041,7 @@ void Acci::notInOrder() {
 
 void Acci::goToCauldron() {
 	_vm->_animation->tr[1]._callEachStepFl = false; // Stops Geida_Procs.
-	_vm->_timeout->set_up_timer(1, _vm->_timeout->procspludwick_goes_to_cauldron, _vm->_timeout->reason_spludwalk);
+	_vm->_timeout->set_up_timer(1, _vm->_timeout->procspludwick_goes_to_cauldron, _vm->_timeout->kReasonSpludWalk);
 	_vm->_animation->tr[1].walkto(2);
 }
 
@@ -1143,7 +1143,7 @@ void Acci::standUp() {
 			_vm->_celer->drawBackgroundSprite(-1, -1, 4); // Picture of empty pillow.
 			_vm->_lucerna->incScore(1);
 			_vm->_gyro->_dna._avvyInBed = false;
-			_vm->_timeout->lose_timer(_vm->_timeout->reason_arkata_shouts);
+			_vm->_timeout->lose_timer(_vm->_timeout->kReasonArkataShouts);
 		} else
 			already();
 		break;
@@ -1242,7 +1242,7 @@ void Acci::giveGeidaTheLute() {
 	_vm->_lucerna->refreshObjectList();
 	_vm->_visa->dixi('q', 64); // She plays it.
 
-	_vm->_timeout->set_up_timer(1, _vm->_timeout->procgive_lute_to_geida, _vm->_timeout->reason_geida_sings);
+	_vm->_timeout->set_up_timer(1, _vm->_timeout->procgive_lute_to_geida, _vm->_timeout->kReasonGeidaSings);
 	_vm->_enid->backToBootstrap(4);
 }
 
@@ -1259,7 +1259,7 @@ void Acci::winSequence() {
 	_vm->_sequence->thenShow(8);
 	_vm->_sequence->thenShow(9);
 	_vm->_sequence->startToClose();
-	_vm->_timeout->set_up_timer(30, _vm->_timeout->procwinning, _vm->_timeout->reason_winning);
+	_vm->_timeout->set_up_timer(30, _vm->_timeout->procwinning, _vm->_timeout->kReasonWinning);
 }
 
 void Acci::personSpeaks() {
@@ -1682,7 +1682,7 @@ void Acci::doThat() {
 	case kVerbCodePee:
 		if (_vm->_gyro->setFlag('P')) {
 			_vm->_scrolls->displayText("Hmm, I don't think anyone will notice...");
-			_vm->_timeout->set_up_timer(4, _vm->_timeout->procurinate, _vm->_timeout->reason_gototoilet);
+			_vm->_timeout->set_up_timer(4, _vm->_timeout->procurinate, _vm->_timeout->kReasonGoToToilet);
 		} else
 			_vm->_scrolls->displayText(Common::String("It would be ") + _vm->_scrolls->kControlItalic + "VERY"
 			+ _vm->_scrolls->kControlRoman + " unwise to do that here, Avvy!");
@@ -1706,7 +1706,7 @@ void Acci::doThat() {
 					_vm->_animation->tr[1]._callEachStepFl = true;
 					_vm->_animation->tr[1]._eachStepProc = _vm->_animation->kProcBackAndForth;
 					_vm->_gyro->_dna._avariciusTalk = 14;
-					_vm->_timeout->set_up_timer(177, _vm->_timeout->procavaricius_talks, _vm->_timeout->reason_avariciustalks);
+					_vm->_timeout->set_up_timer(177, _vm->_timeout->procavaricius_talks, _vm->_timeout->kReasonAvariciusTalks);
 				}
 			} else
 				_vm->_scrolls->displayText("Nothing appears to happen...");
@@ -1769,7 +1769,7 @@ void Acci::doThat() {
 
 					_vm->_celer->drawBackgroundSprite(-1, -1, 10);
 					_vm->_gyro->_dna._malagauche = 177;
-					_vm->_timeout->set_up_timer(27, _vm->_timeout->procbuydrinks, _vm->_timeout->reason_drinks);
+					_vm->_timeout->set_up_timer(27, _vm->_timeout->procbuydrinks, _vm->_timeout->kReasonDrinks);
 					break;
 				case 52:
 					examine();
@@ -1795,7 +1795,7 @@ void Acci::doThat() {
 						_vm->_celer->drawBackgroundSprite(-1, -1, 10);
 						_vm->_gyro->_dna._malagauche = 177;
 
-						_vm->_timeout->set_up_timer(27, _vm->_timeout->procbuywine, _vm->_timeout->reason_drinks);
+						_vm->_timeout->set_up_timer(27, _vm->_timeout->procbuywine, _vm->_timeout->kReasonDrinks);
 					}
 					break;
 				}
@@ -1892,7 +1892,7 @@ void Acci::doThat() {
 				else {
 					_vm->_lucerna->incScore(4);
 					_vm->_scrolls->displayText("The drawbridge opens!");
-					_vm->_timeout->set_up_timer(7, _vm->_timeout->procopen_drawbridge, _vm->_timeout->reason_drawbridgefalls);
+					_vm->_timeout->set_up_timer(7, _vm->_timeout->procopen_drawbridge, _vm->_timeout->kReasonDrawbridgeFalls);
 					_vm->_gyro->_dna._drawbridgeOpen = 1;
 				}
 			} else
@@ -1944,7 +1944,7 @@ void Acci::doThat() {
 			_vm->_scrolls->displayText("Not with your head for heights, Avvy!");
 		break;
 	case kVerbCodeJump:
-		_vm->_timeout->set_up_timer(1, _vm->_timeout->procjump, _vm->_timeout->reason_jumping);
+		_vm->_timeout->set_up_timer(1, _vm->_timeout->procjump, _vm->_timeout->kReasonJumping);
 		_vm->_gyro->_dna._userMovesAvvy = false;
 		break;
 	case kVerbCodeHiscores:
@@ -1985,7 +1985,7 @@ void Acci::doThat() {
 				_vm->_scrolls->displayText("You're already sitting!");
 			else {
 				_vm->_animation->tr[0].walkto(4); // Move Avvy to the place, and sit him down.
-				_vm->_timeout->set_up_timer(1, _vm->_timeout->procavvy_sit_down, _vm->_timeout->reason_sitting_down);
+				_vm->_timeout->set_up_timer(1, _vm->_timeout->procavvy_sit_down, _vm->_timeout->kReasonSittingDown);
 			}
 		} else { // Default doodah.
 			_vm->_lucerna->dusk();
diff --git a/engines/avalanche/animation.cpp b/engines/avalanche/animation.cpp
index c71ecd6b22..127fbf9178 100644
--- a/engines/avalanche/animation.cpp
+++ b/engines/avalanche/animation.cpp
@@ -840,7 +840,7 @@ void Animation::catamove(byte ped) {
 
 // This proc gets called whenever you touch a line defined as _vm->_gyro->special.
 void Animation::dawndelay() {
-	_vm->_timeout->set_up_timer(2, _vm->_timeout->procdawn_delay, _vm->_timeout->reason_dawndelay);
+	_vm->_timeout->set_up_timer(2, _vm->_timeout->procdawn_delay, _vm->_timeout->kReasonDawndelay);
 }
 
 void Animation::call_special(uint16 which) {
@@ -849,7 +849,7 @@ void Animation::call_special(uint16 which) {
 		_vm->_celer->drawBackgroundSprite(-1, -1, 1);
 		_vm->_gyro->_dna._brummieStairs = 1;
 		_vm->_gyro->_magics[9]._operation = _vm->_gyro->kMagicNothing;
-		_vm->_timeout->set_up_timer(10, _vm->_timeout->procstairs, _vm->_timeout->reason_brummiestairs);
+		_vm->_timeout->set_up_timer(10, _vm->_timeout->procstairs, _vm->_timeout->kReasonBrummieStairs);
 		stopWalking();
 		_vm->_gyro->_dna._userMovesAvvy = false;
 		break;
@@ -883,7 +883,7 @@ void Animation::call_special(uint16 which) {
 	case 4: // This is the ghost room link.
 		_vm->_lucerna->dusk();
 		tr[0].turn(kDirRight); // you'll see this after we get back from bootstrap
-		_vm->_timeout->set_up_timer(1, _vm->_timeout->procghost_room_phew, _vm->_timeout->reason_ghost_room_phew);
+		_vm->_timeout->set_up_timer(1, _vm->_timeout->procghost_room_phew, _vm->_timeout->kReasonGhostRoomPhew);
 		_vm->_enid->backToBootstrap(3);
 		break;
 	case 5:
@@ -901,7 +901,7 @@ void Animation::call_special(uint16 which) {
 			tr[1]._vanishIfStill = true;
 			tr[1]._doCheck = true; // One of them must have Check_Me switched on.
 			_vm->_gyro->_whereIs[_vm->_gyro->kPeopleFriarTuck - 150] = 177; // Not here, then.
-			_vm->_timeout->set_up_timer(364, _vm->_timeout->prochang_around, _vm->_timeout->reason_hanging_around);
+			_vm->_timeout->set_up_timer(364, _vm->_timeout->prochang_around, _vm->_timeout->kReasonHangingAround);
 		}
 		break;
 	case 6: // _vm->_gyro->special 6: fall down oubliette.
@@ -909,17 +909,17 @@ void Animation::call_special(uint16 which) {
 		tr[0]._moveX = 3;
 		tr[0]._moveY = 0;
 		tr[0]._facingDir = kDirRight;
-		_vm->_timeout->set_up_timer(1, _vm->_timeout->procfall_down_oubliette, _vm->_timeout->reason_falling_down_oubliette);
+		_vm->_timeout->set_up_timer(1, _vm->_timeout->procfall_down_oubliette, _vm->_timeout->kReasonFallingDownOubliette);
 		break;
 	case 7: // _vm->_gyro->special 7: stop falling down oubliette.
 		tr[0]._visible = false;
 		_vm->_gyro->_magics[9]._operation = _vm->_gyro->kMagicNothing;
 		stopWalking();
-		_vm->_timeout->lose_timer(_vm->_timeout->reason_falling_down_oubliette);
+		_vm->_timeout->lose_timer(_vm->_timeout->kReasonFallingDownOubliette);
 		//_vm->_lucerna->mblit(12, 80, 38, 160, 3, 0);
 		//_vm->_lucerna->mblit(12, 80, 38, 160, 3, 1);
 		_vm->_scrolls->displayText("Oh dear, you seem to be down the bottom of an oubliette.");
-		_vm->_timeout->set_up_timer(200, _vm->_timeout->procmeet_avaroid, _vm->_timeout->reason_meeting_avaroid);
+		_vm->_timeout->set_up_timer(200, _vm->_timeout->procmeet_avaroid, _vm->_timeout->kReasonMeetingAvaroid);
 		break;
 	case 8:        // _vm->_gyro->special 8: leave du Lustie's room.
 		if ((_vm->_gyro->_dna._geidaFollows) && (!_vm->_gyro->_dna._lustieIsAsleep)) {
@@ -937,7 +937,7 @@ void Animation::call_special(uint16 which) {
 		tr[1].walkto(4); // She walks to somewhere...
 		tr[0].done();     // Lose Avvy.
 		_vm->_gyro->_dna._userMovesAvvy = false;
-		_vm->_timeout->set_up_timer(40, _vm->_timeout->procrobin_hood_and_geida, _vm->_timeout->reason_robin_hood_and_geida);
+		_vm->_timeout->set_up_timer(40, _vm->_timeout->procrobin_hood_and_geida, _vm->_timeout->kReasonRobinHoodAndGeida);
 		break;
 	case 10: // _vm->_gyro->special 10: transfer north in catacombs.
 		if ((_vm->_gyro->_dna._catacombX == 4) && (_vm->_gyro->_dna._catacombY == 1)) {
@@ -1223,7 +1223,7 @@ void Animation::arrow_procs(byte tripnum) {
 			_vm->_lucerna->gameOver();
 
 			_vm->_gyro->_dna._userMovesAvvy = false; // Stop the user from moving him.
-			_vm->_timeout->set_up_timer(55, _vm->_timeout->procnaughty_duke, _vm->_timeout->reason_naughty_duke);
+			_vm->_timeout->set_up_timer(55, _vm->_timeout->procnaughty_duke, _vm->_timeout->kReasonNaughtyDuke);
 		}
 	} else { // Arrow has hit the wall!
 		tr[tripnum].done(); // Deallocate the arrow.
diff --git a/engines/avalanche/lucerna2.cpp b/engines/avalanche/lucerna2.cpp
index 30d88e5723..a6c6286b47 100644
--- a/engines/avalanche/lucerna2.cpp
+++ b/engines/avalanche/lucerna2.cpp
@@ -340,21 +340,21 @@ void Lucerna::exitRoom(byte x) {
 
 	switch (x) {
 	case r__spludwicks:
-		_vm->_timeout->lose_timer(_vm->_timeout->reason_avariciustalks);
+		_vm->_timeout->lose_timer(_vm->_timeout->kReasonAvariciusTalks);
 		 _vm->_gyro->_dna._avariciusTalk = 0;
 		// He doesn't HAVE to be talking for this to work. It just deletes it IF it exists.
 		break;
 	case r__bridge:
 		if (_vm->_gyro->_dna._drawbridgeOpen > 0) {
 			_vm->_gyro->_dna._drawbridgeOpen = 4; // Fully open.
-			_vm->_timeout->lose_timer(_vm->_timeout->reason_drawbridgefalls);
+			_vm->_timeout->lose_timer(_vm->_timeout->kReasonDrawbridgeFalls);
 		}
 		break;
 	case r__outsidecardiffcastle:
-		_vm->_timeout->lose_timer(_vm->_timeout->reason_cardiffsurvey);
+		_vm->_timeout->lose_timer(_vm->_timeout->kReasonCardiffsurvey);
 		break;
 	case r__robins:
-		_vm->_timeout->lose_timer(_vm->_timeout->reason_getting_tied_up);
+		_vm->_timeout->lose_timer(_vm->_timeout->kReasonGettingTiedUp);
 		break;
 	}
 
@@ -436,7 +436,7 @@ void Lucerna::enterRoom(byte room, byte ped) {
 		if (_vm->_gyro->_dna._avvyInBed) {
 			_vm->_celer->drawBackgroundSprite(-1, -1, 3);
 			_vm->_graphics->refreshBackground();
-			_vm->_timeout->set_up_timer(100, _vm->_timeout->procarkata_shouts, _vm->_timeout->reason_arkata_shouts);
+			_vm->_timeout->set_up_timer(100, _vm->_timeout->procarkata_shouts, _vm->_timeout->kReasonArkataShouts);
 		}
 		break;
 
@@ -464,7 +464,7 @@ void Lucerna::enterRoom(byte room, byte ped) {
 				_vm->_animation->tr[1].init(8, false, _vm->_animation);
 				_vm->_animation->apped(2, 2);
 				_vm->_animation->tr[1].walkto(4);
-				_vm->_timeout->set_up_timer(20, _vm->_timeout->proccrapulus_splud_out, _vm->_timeout->reason_crapulus_says_spludwick_out);
+				_vm->_timeout->set_up_timer(20, _vm->_timeout->proccrapulus_splud_out, _vm->_timeout->kReasonCrapulusSaysSpludwickOut);
 				_vm->_gyro->_dna._crapulusWillTell = false;
 			}
 		}
@@ -472,7 +472,7 @@ void Lucerna::enterRoom(byte room, byte ped) {
 
 	case r__outsidespludwicks:
 		if ((_vm->_gyro->_dna._roomCount[r__outsidespludwicks] == 1) && (ped == 1)) {
-			_vm->_timeout->set_up_timer(20, _vm->_timeout->procbang, _vm->_timeout->reason_explosion);
+			_vm->_timeout->set_up_timer(20, _vm->_timeout->procbang, _vm->_timeout->kReasonExplosion);
 			_vm->_gyro->_dna._spludwickAtHome = true;
 		}
 		break;
@@ -527,7 +527,7 @@ void Lucerna::enterRoom(byte room, byte ped) {
 			_vm->_animation->tr[1]._vanishIfStill = true;
 			_vm->_gyro->_dna._passedCwytalotInHerts = true;
 			// _vm->_gyro->whereis[#157] = r__Nowhere; // can we fit this in?
-			_vm->_timeout->set_up_timer(20, _vm->_timeout->proc_cwytalot_in_herts, _vm->_timeout->reason_cwytalot_in_herts);
+			_vm->_timeout->set_up_timer(20, _vm->_timeout->proc_cwytalot_in_herts, _vm->_timeout->kReasonCwytalotInHerts);
 		}
 		break;
 
@@ -548,7 +548,7 @@ void Lucerna::enterRoom(byte room, byte ped) {
 				_vm->_animation->tr[1].init(6, false, _vm->_animation);
 				_vm->_animation->apped(2, 2);
 				_vm->_animation->tr[1].walkto(3);
-				_vm->_timeout->set_up_timer(36, _vm->_timeout->procget_tied_up, _vm->_timeout->reason_getting_tied_up);
+				_vm->_timeout->set_up_timer(36, _vm->_timeout->procget_tied_up, _vm->_timeout->kReasonGettingTiedUp);
 			}
 		}
 
@@ -572,7 +572,7 @@ void Lucerna::enterRoom(byte room, byte ped) {
 				_vm->_animation->tr[1].init(9, false, _vm->_animation);
 				_vm->_animation->apped(2, 2);
 				_vm->_animation->tr[1].walkto(3);
-				_vm->_timeout->set_up_timer(47, _vm->_timeout->proccardiffsurvey, _vm->_timeout->reason_cardiffsurvey);
+				_vm->_timeout->set_up_timer(47, _vm->_timeout->proccardiffsurvey, _vm->_timeout->kReasonCardiffsurvey);
 			}
 			break;
 			case 5 :
@@ -582,7 +582,7 @@ void Lucerna::enterRoom(byte room, byte ped) {
 				_vm->_animation->tr[1].init(9, false, _vm->_animation);
 				_vm->_animation->apped(2, 3);
 				_vm->_animation->tr[1]._facingDir = Animation::kDirRight;
-				_vm->_timeout->set_up_timer(3, _vm->_timeout->proccardiff_return, _vm->_timeout->reason_cardiffsurvey);
+				_vm->_timeout->set_up_timer(3, _vm->_timeout->proccardiff_return, _vm->_timeout->kReasonCardiffsurvey);
 			}
 			}
 		if (_vm->_gyro->_dna._cardiffQuestionNum < 5)
@@ -650,10 +650,10 @@ void Lucerna::enterRoom(byte room, byte ped) {
 	case r__lustiesroom:
 		_vm->_gyro->_dna._dogFoodPos = 1; // Actually, du Lustie pos.
 		if (_vm->_animation->tr[0]._id == 0) // Avvy in his normal clothes
-			_vm->_timeout->set_up_timer(3, _vm->_timeout->proccallsguards, _vm->_timeout->reason_du_lustie_talks);
+			_vm->_timeout->set_up_timer(3, _vm->_timeout->proccallsguards, _vm->_timeout->kReasonDuLustieTalks);
 		else if (! _vm->_gyro->_dna._enteredLustiesRoomAsMonk) // already
 			// Presumably, Avvy dressed as a monk.
-			_vm->_timeout->set_up_timer(3, _vm->_timeout->procgreetsmonk, _vm->_timeout->reason_du_lustie_talks);
+			_vm->_timeout->set_up_timer(3, _vm->_timeout->procgreetsmonk, _vm->_timeout->kReasonDuLustieTalks);
 
 		if (_vm->_gyro->_dna._geidaFollows) {
 			putGeidaAt(5, ped);
@@ -1190,7 +1190,7 @@ void Lucerna::gameOver() {
 	_vm->_animation->tr[0]._stepNum = 0;
 	_vm->_animation->tr[0].appear(sx, sy, 0);
 
-	_vm->_timeout->set_up_timer(3, _vm->_timeout->procavalot_falls, _vm->_timeout->reason_falling_over);
+	_vm->_timeout->set_up_timer(3, _vm->_timeout->procavalot_falls, _vm->_timeout->kReasonFallingOver);
 	_vm->_gyro->_alive = false;
 }
 
diff --git a/engines/avalanche/scrolls2.cpp b/engines/avalanche/scrolls2.cpp
index 133372dcce..62f2fe3bf3 100644
--- a/engines/avalanche/scrolls2.cpp
+++ b/engines/avalanche/scrolls2.cpp
@@ -219,7 +219,7 @@ void Scrolls::scrollModeMusic() {
 		setReadyLight(0);
 		_vm->_gyro->_seeScroll = false;
 
-		_vm->_timeout->set_up_timer(8, _vm->_timeout->procjacques_wakes_up, _vm->_timeout->reason_jacques_waking_up);
+		_vm->_timeout->set_up_timer(8, _vm->_timeout->procjacques_wakes_up, _vm->_timeout->kReasonJacquesWakingUp);
 		warning("STUB: Scrolls::music_scroll()");
 		return;
 #if 0
diff --git a/engines/avalanche/sequence2.cpp b/engines/avalanche/sequence2.cpp
index 66a95195eb..e233b1300a 100644
--- a/engines/avalanche/sequence2.cpp
+++ b/engines/avalanche/sequence2.cpp
@@ -69,8 +69,8 @@ void Sequence::thenFlip(byte where, byte ped) {
 }
 
 void Sequence::startToClose() {
-	_vm->_timeout->lose_timer(_vm->_timeout->reason_sequencer);
-	_vm->_timeout->set_up_timer(7, _vm->_timeout->procsequence, _vm->_timeout->reason_sequencer);
+	_vm->_timeout->lose_timer(_vm->_timeout->kReasonSequencer);
+	_vm->_timeout->set_up_timer(7, _vm->_timeout->procsequence, _vm->_timeout->kReasonSequencer);
 }
 
 void Sequence::startToOpen() {
diff --git a/engines/avalanche/timeout2.cpp b/engines/avalanche/timeout2.cpp
index bd136d54bf..df2ba941f3 100644
--- a/engines/avalanche/timeout2.cpp
+++ b/engines/avalanche/timeout2.cpp
@@ -229,7 +229,7 @@ void Timeout::open_drawbridge() {
 	if (_vm->_gyro->_dna._drawbridgeOpen == 4)
 		_vm->_gyro->_magics[1]._operation = _vm->_gyro->kMagicNothing; // You may enter the drawbridge.
 	else
-		set_up_timer(7, procopen_drawbridge, reason_drawbridgefalls);
+		set_up_timer(7, procopen_drawbridge, kReasonDrawbridgeFalls);
 }
 
 void Timeout::avaricius_talks() {
@@ -237,7 +237,7 @@ void Timeout::avaricius_talks() {
 	_vm->_gyro->_dna._avariciusTalk++;
 
 	if (_vm->_gyro->_dna._avariciusTalk < 17)
-		set_up_timer(177, procavaricius_talks, reason_avariciustalks);
+		set_up_timer(177, procavaricius_talks, kReasonAvariciusTalks);
 	else
 		_vm->_lucerna->incScore(3);
 }
@@ -246,7 +246,7 @@ void Timeout::urinate() {
 	_vm->_animation->tr[0].turn(Animation::kDirUp);
 	_vm->_animation->stopWalking();
 	_vm->_lucerna->drawDirection();
-	set_up_timer(14, proctoilet2, reason_gototoilet);
+	set_up_timer(14, proctoilet2, kReasonGoToToilet);
 }
 
 void Timeout::toilet2() {
@@ -255,7 +255,7 @@ void Timeout::toilet2() {
 
 void Timeout::bang() {
 	_vm->_scrolls->displayText(Common::String(_vm->_scrolls->kControlItalic) + "< BANG! >");
-	set_up_timer(30, procbang2, reason_explosion);
+	set_up_timer(30, procbang2, kReasonExplosion);
 }
 
 void Timeout::bang2() {
@@ -282,7 +282,7 @@ void Timeout::cardiff_survey() {
 
 	_vm->_gyro->_interrogation = _vm->_gyro->_dna._cardiffQuestionNum;
 
-	set_up_timer(182, proccardiffsurvey, reason_cardiffsurvey);
+	set_up_timer(182, proccardiffsurvey, kReasonCardiffsurvey);
 }
 
 void Timeout::cardiff_return() {
@@ -303,7 +303,7 @@ void Timeout::get_tied_up() {
 	_vm->_animation->tr[1].stophoming();
 	_vm->_animation->tr[1]._callEachStepFl = true;
 	_vm->_animation->tr[1]._eachStepProc = _vm->_animation->kProcGrabAvvy;
-	set_up_timer(70, procget_tied_up2, reason_getting_tied_up);
+	set_up_timer(70, procget_tied_up2, kReasonGettingTiedUp);
 }
 
 void Timeout::get_tied_up2() {
@@ -320,7 +320,7 @@ void Timeout::hang_around() {
 	_vm->_animation->apped(1, 2);
 	_vm->_visa->dixi('q', 39);
 	_vm->_animation->tr[0].walkto(7);
-	set_up_timer(55, prochang_around2, reason_hanging_around);
+	set_up_timer(55, prochang_around2, kReasonHangingAround);
 }
 
 void Timeout::hang_around2() {
@@ -332,7 +332,7 @@ void Timeout::hang_around2() {
 	_vm->_animation->tr[0].done();
 	_vm->_animation->tr[1].done(); // Get rid of Robin Hood and Friar Tuck.
 
-	set_up_timer(1, procafter_the_shootemup, reason_hanging_around);
+	set_up_timer(1, procafter_the_shootemup, kReasonHangingAround);
 	// Immediately call the following proc (when you have a chance).
 
 	_vm->_gyro->_dna._tiedUp = false;
@@ -406,10 +406,10 @@ void Timeout::jacques_wakes_up() {
 	case 1:
 	case 2:
 	case 3:
-		set_up_timer(12, procjacques_wakes_up, reason_jacques_waking_up);
+		set_up_timer(12, procjacques_wakes_up, kReasonJacquesWakingUp);
 		break;
 	case 4:
-		set_up_timer(24, procjacques_wakes_up, reason_jacques_waking_up);
+		set_up_timer(24, procjacques_wakes_up, kReasonJacquesWakingUp);
 		break;
 	}
 }
@@ -424,14 +424,14 @@ void Timeout::naughty_duke() { // This is when the Duke comes in and takes your
 	_vm->_sequence->firstShow(2);
 	_vm->_sequence->startToClose();
 
-	set_up_timer(50, procnaughty_duke2, reason_naughty_duke);
+	set_up_timer(50, procnaughty_duke2, kReasonNaughtyDuke);
 }
 
 void Timeout::naughty_duke2() {
 	_vm->_visa->dixi('q', 48); // "Ha ha, it worked again!"
 	_vm->_animation->tr[1].walkto(1); // Walk to the door.
 	_vm->_animation->tr[1]._vanishIfStill = true; // Then go away!
-	set_up_timer(32, procnaughty_duke3, reason_naughty_duke);
+	set_up_timer(32, procnaughty_duke3, kReasonNaughtyDuke);
 }
 
 void Timeout::naughty_duke3() {
@@ -466,7 +466,7 @@ void Timeout::jump() {
 		_vm->_gyro->_dna._userMovesAvvy = true;
 		_vm->_gyro->_dna._jumpStatus = 0;
 	} else { // Still jumping.
-		set_up_timer(1, procjump, reason_jumping);
+		set_up_timer(1, procjump, kReasonJumping);
 	}
 
 	if ((_vm->_gyro->_dna._jumpStatus == 10) // You're at the highest point of your jump.
@@ -532,7 +532,7 @@ void Timeout::fall_down_oubliette() {
 	_vm->_gyro->_magics[8]._operation = _vm->_gyro->kMagicNothing;
 	_vm->_animation->tr[0]._moveY++; // Increments dx/dy!
 	_vm->_animation->tr[0]._y += _vm->_animation->tr[0]._moveY;   // Dowwwn we go...
-	set_up_timer(3, procfall_down_oubliette, reason_falling_down_oubliette);
+	set_up_timer(3, procfall_down_oubliette, kReasonFallingDownOubliette);
 }
 
 void Timeout::meet_avaroid() {
@@ -543,7 +543,7 @@ void Timeout::meet_avaroid() {
 	} else {
 		_vm->_visa->dixi('Q', 60);
 		_vm->_gyro->_dna._metAvaroid = true;
-		set_up_timer(1, procrise_up_oubliette, reason_rising_up_oubliette);
+		set_up_timer(1, procrise_up_oubliette, kReasonRisingUpOubliette);
 
 		_vm->_animation->tr[0]._facingDir = Animation::kDirLeft;
 		_vm->_animation->tr[0]._x = 151;
@@ -559,7 +559,7 @@ void Timeout::rise_up_oubliette() {
 	_vm->_animation->tr[0]._moveY++; // Decrements dx/dy!
 	_vm->_animation->tr[0]._y -= _vm->_animation->tr[0]._moveY; // Uuuupppp we go...
 	if (_vm->_animation->tr[0]._moveY > 0)
-		set_up_timer(3, procrise_up_oubliette, reason_rising_up_oubliette);
+		set_up_timer(3, procrise_up_oubliette, kReasonRisingUpOubliette);
 	else
 		_vm->_gyro->_dna._userMovesAvvy = true;
 }
@@ -570,7 +570,7 @@ void Timeout::robin_hood_and_geida() {
 	_vm->_animation->tr[0].walkto(6);
 	_vm->_animation->tr[1].stopWalk();
 	_vm->_animation->tr[1]._facingDir = Animation::kDirLeft;
-	set_up_timer(20, procrobin_hood_and_geida_talk, reason_robin_hood_and_geida);
+	set_up_timer(20, procrobin_hood_and_geida_talk, kReasonRobinHoodAndGeida);
 	_vm->_gyro->_dna._geidaFollows = false;
 }
 
@@ -580,7 +580,7 @@ void Timeout::robin_hood_and_geida_talk() {
 	_vm->_animation->tr[1].walkto(2);
 	_vm->_animation->tr[0]._vanishIfStill = true;
 	_vm->_animation->tr[1]._vanishIfStill = true;
-	set_up_timer(162, procavalot_returns, reason_robin_hood_and_geida);
+	set_up_timer(162, procavalot_returns, kReasonRobinHoodAndGeida);
 }
 
 void Timeout::avalot_returns() {
@@ -595,7 +595,7 @@ void Timeout::avalot_returns() {
 void Timeout::avvy_sit_down() {
 // This is used when you sit down in the pub in Notts. It loops around so that it will happen when Avvy stops walking.
 	if (_vm->_animation->tr[0]._homing)    // Still walking.
-		set_up_timer(1, procavvy_sit_down, reason_sitting_down);
+		set_up_timer(1, procavvy_sit_down, kReasonSittingDown);
 	else {
 		_vm->_celer->drawBackgroundSprite(-1, -1, 3);
 		_vm->_gyro->_dna._sittingInPub = true;
@@ -615,7 +615,7 @@ void Timeout::arkata_shouts() {
 
 	_vm->_visa->dixi('q', 76);
 
-	set_up_timer(160, procarkata_shouts, reason_arkata_shouts);
+	set_up_timer(160, procarkata_shouts, kReasonArkataShouts);
 }
 
 void Timeout::winning() {
@@ -638,7 +638,7 @@ void Timeout::winning() {
 void Timeout::avalot_falls() {
 	if (_vm->_animation->tr[0]._stepNum < 5) {
 		_vm->_animation->tr[0]._stepNum++;
-		set_up_timer(3, procavalot_falls, reason_falling_over);
+		set_up_timer(3, procavalot_falls, kReasonFallingOver);
 	} else {
 		Common::String toDisplay;
 		for (byte i = 0; i < 6; i++)
@@ -652,9 +652,9 @@ void Timeout::avalot_falls() {
 
 void Timeout::spludwick_goes_to_cauldron() {
 	if (_vm->_animation->tr[1]._homing)
-		set_up_timer(1, procspludwick_goes_to_cauldron, reason_spludwalk);
+		set_up_timer(1, procspludwick_goes_to_cauldron, kReasonSpludWalk);
 	else
-		set_up_timer(17, procspludwick_leaves_cauldron, reason_spludwalk);
+		set_up_timer(17, procspludwick_leaves_cauldron, kReasonSpludWalk);
 }
 
 void Timeout::spludwick_leaves_cauldron() {