From b6306976cfcf5c1bab9b6f83f05249b8a45865d9 Mon Sep 17 00:00:00 2001
From: uruk
Date: Thu, 5 Sep 2013 23:57:58 +0200
Subject: AVALANCHE: Start renaming in Gyro.

---
 engines/avalanche/acci2.cpp     |  52 +++++------
 engines/avalanche/avalot.cpp    |   8 +-
 engines/avalanche/dropdown2.cpp |  16 ++--
 engines/avalanche/gyro2.cpp     | 178 ++++++++++++++++----------------------
 engines/avalanche/gyro2.h       | 162 ++++++++++++----------------------
 engines/avalanche/lucerna2.cpp  |  48 +++++------
 engines/avalanche/timeout2.cpp  |  20 ++---
 engines/avalanche/trip6.cpp     | 186 ++++++++++++++++++++--------------------
 8 files changed, 292 insertions(+), 378 deletions(-)

(limited to 'engines')

diff --git a/engines/avalanche/acci2.cpp b/engines/avalanche/acci2.cpp
index 8f852ddb60..05d4166407 100644
--- a/engines/avalanche/acci2.cpp
+++ b/engines/avalanche/acci2.cpp
@@ -412,7 +412,7 @@ void Acci::storeInterrogation(byte interrogation) {
 		_vm->_visa->dixi('z', 5); // His closing statement...
 		_vm->_trip->tr[1].walkto(4); // The end of the drawbridge
 		_vm->_trip->tr[1].vanishifstill = true; // Then go away!
-		_vm->_gyro->magics[1].op = _vm->_gyro->nix;
+		_vm->_gyro->magics[1].op = _vm->_gyro->kMagicNothing;
 		_vm->_gyro->dna.cardiff_things = 5;
 		break;
 	case 99:
@@ -449,8 +449,8 @@ void Acci::parse() {
 	}
 
 	// Are we being interrogated right now?
-	if (_vm->_gyro->interrogation > 0) {
-		storeInterrogation(_vm->_gyro->interrogation);
+	if (_vm->_gyro->_interrogation > 0) {
+		storeInterrogation(_vm->_gyro->_interrogation);
 		_vm->_gyro->weirdword = true;
 		return;
 	}
@@ -623,7 +623,7 @@ void Acci::parse() {
 
 void Acci::examineObject() {   
 	if (_thing != _vm->_gyro->thinks)
-		_vm->_lucerna->thinkabout(_thing, _vm->_gyro->a_thing);
+		_vm->_lucerna->thinkabout(_thing, _vm->_gyro->kThing);
 	switch (_thing) {
 	case Gyro::wine :
 		switch (_vm->_gyro->dna.winestate) {// 4 is perfect wine. 0 is not holding the wine.
@@ -650,7 +650,7 @@ void Acci::examineObject() {
 }
 
 bool Acci::isPersonHere() { // Person equivalent of "holding".
-	if ((_person == kPardon) || (_person == 0) || (_vm->_gyro->whereis[_person - 150] == _vm->_gyro->dna.room))
+	if ((_person == kPardon) || (_person == 0) || (_vm->_gyro->_whereIs[_person - 150] == _vm->_gyro->dna.room))
 		return true;
 	else {
 		if (_person < 175)
@@ -665,7 +665,7 @@ bool Acci::isPersonHere() { // Person equivalent of "holding".
 void Acci::exampers() {
 	if (isPersonHere()) {
 		if (_thing != _vm->_gyro->thinks)
-			_vm->_lucerna->thinkabout(_person, _vm->_gyro->a_person);
+			_vm->_lucerna->thinkabout(_person, _vm->_gyro->kPerson);
 		_person -= 149;
 		switch (_person) { // Special cases
 		case 11:
@@ -826,7 +826,7 @@ void Acci::peopleInRoom() {
 	byte numPeople = 0; // Number of people in the room.
 	
 	for (byte i = 1; i < 29; i++) { // Start at 1 so we don't list Avvy himself!
-		if (_vm->_gyro->whereis[i] == _vm->_gyro->dna.room)
+		if (_vm->_gyro->_whereIs[i] == _vm->_gyro->dna.room)
 			numPeople++;
 	}
 
@@ -835,7 +835,7 @@ void Acci::peopleInRoom() {
 
 	byte actPerson = 0; // Actually listed people.
 	for (byte i = 1; i < 29; i++) {
-		if (_vm->_gyro->whereis[i] == _vm->_gyro->dna.room) {
+		if (_vm->_gyro->_whereIs[i] == _vm->_gyro->dna.room) {
 			actPerson++;
 			if (actPerson == 1) // First on the list.
 				_vm->_scrolls->display(_vm->_gyro->getname(i + 150) + _vm->_scrolls->kControlToBuffer);
@@ -923,23 +923,23 @@ void Acci::openDoor() {
 			fv -= 8;
 
 			switch (_vm->_gyro->portals[fv].op) {
-			case Gyro::exclaim:
+			case Gyro::kMagicExclaim:
 				_vm->_trip->tr[0].bounce();
 				_vm->_visa->dixi('x', _vm->_gyro->portals[fv].data);
 				break;
-			case Gyro::transport:
+			case Gyro::kMagicTransport:
 				_vm->_trip->fliproom((_vm->_gyro->portals[fv].data) >> 8,  // High byte 
 					                 (_vm->_gyro->portals[fv].data) & 0x0F // Low byte
 									 );
 				break;
-			case Gyro::unfinished:
+			case Gyro::kMagicUnfinished:
 				_vm->_trip->tr[0].bounce();
 				_vm->_scrolls->display("Sorry. This place is not available yet!");
 				break;
-			case Gyro::special:
+			case Gyro::kMagicSpecial:
 				_vm->_trip->call_special(_vm->_gyro->portals[fv].data);
 				break;
-			case Gyro::mopendoor:
+			case Gyro::kMagicOpenDoor:
 				_vm->_trip->open_the_door((_vm->_gyro->portals[fv].data) >> 8, (_vm->_gyro->portals[fv].data) & 0x0F, fv + 9);
 				break;
 			}
@@ -1038,7 +1038,7 @@ void Acci::putProc() {
 
 void Acci::notInOrder() {
 	_vm->_scrolls->display(Common::String("Sorry, I need the ingredients in the right order for this potion. What I need next is ")
-			+ _vm->_gyro->get_better(_vm->_gyro->spludwick_order[_vm->_gyro->dna.given2spludwick])
+			+ _vm->_gyro->get_better(_vm->_gyro->kSpludwicksOrder[_vm->_gyro->dna.given2spludwick])
 			+ _vm->_scrolls->kControlRegister + 2 + _vm->_scrolls->kControlSpeechBubble);
 }
 
@@ -1053,7 +1053,7 @@ void Acci::goToCauldron() {
  * @remarks	Originally called 'give2spludwick'
  */
 bool Acci::giveToSpludwick() { 
-	if (_vm->_gyro->spludwick_order[_vm->_gyro->dna.given2spludwick] != _thing) {
+	if (_vm->_gyro->kSpludwicksOrder[_vm->_gyro->dna.given2spludwick] != _thing) {
 		notInOrder();
 		return false;
 	}
@@ -1142,7 +1142,7 @@ void Acci::standUp() {
 			_vm->_trip->tr[0].visible = true;
 			_vm->_gyro->dna.user_moves_avvy = true;
 			_vm->_trip->apped(1, 2);
-			_vm->_gyro->dna.rw = _vm->_gyro->left;
+			_vm->_gyro->dna.rw = _vm->_gyro->kDirectionLeft;
 			_vm->_celer->drawBackgroundSprite(-1, -1, 4); // Picture of empty pillow.
 			_vm->_lucerna->points(1);
 			_vm->_gyro->dna.avvy_in_bed = false;
@@ -1267,13 +1267,13 @@ void Acci::winSequence() {
 
 void Acci::personSpeaks() {
 	if ((_person == kPardon) || (_person == 0)) {
-		if ((_vm->_gyro->him == kPardon) || (_vm->_gyro->whereis[_vm->_gyro->him - 150] != _vm->_gyro->dna.room))
+		if ((_vm->_gyro->him == kPardon) || (_vm->_gyro->_whereIs[_vm->_gyro->him - 150] != _vm->_gyro->dna.room))
 			_person = _vm->_gyro->her;
 		else
 			_person = _vm->_gyro->him;
 	}
 
-	if (_vm->_gyro->whereis[_person - 150] != _vm->_gyro->dna.room) {
+	if (_vm->_gyro->_whereIs[_person - 150] != _vm->_gyro->dna.room) {
 		_vm->_scrolls->display(Common::String(_vm->_scrolls->kControlRegister) + '1' + _vm->_scrolls->kControlToBuffer); // Avvy himself!
 		return;
 	}
@@ -1289,7 +1289,7 @@ void Acci::personSpeaks() {
 
 	if (!found) {
 		for (byte i = 0; i < 16; i++) {
-			if ((_vm->_gyro->quasipeds[i].who == _person) && (_vm->_gyro->quasipeds[i].room == _vm->_gyro->dna.room))
+			if ((_vm->_gyro->kQuasipeds[i].who == _person) && (_vm->_gyro->kQuasipeds[i].room == _vm->_gyro->dna.room))
 				_vm->_scrolls->display(Common::String(_vm->_scrolls->kControlRegister) + byte(i + 65) + _vm->_scrolls->kControlToBuffer);
 		}
 	}
@@ -1506,7 +1506,7 @@ void Acci::doThat() {
 		_vm->_scrolls->display("Vandalism is prohibited within this game!");
 		break;
 	case kVerbCodeQuit: // quit
-		if (_vm->_gyro->demo) {
+		if (_vm->_gyro->kDemo) {
 			warning("STUB: Acci::doThat() - case kVerbCodequit");
 		//	_vm->_visa->dixi('pos', 31);
 		//	close(demofile);
@@ -1632,10 +1632,10 @@ void Acci::doThat() {
 			case Gyro::lute :
 					_vm->_visa->dixi('U', 7);
 
-					if (_vm->_gyro->whereis[_vm->_gyro->pcwytalot - 150] == _vm->_gyro->dna.room)
+					if (_vm->_gyro->_whereIs[_vm->_gyro->pcwytalot - 150] == _vm->_gyro->dna.room)
 						_vm->_visa->dixi('U', 10);
 
-					if (_vm->_gyro->whereis[_vm->_gyro->pdulustie - 150] == _vm->_gyro->dna.room)
+					if (_vm->_gyro->_whereIs[_vm->_gyro->pdulustie - 150] == _vm->_gyro->dna.room)
 						_vm->_visa->dixi('U', 15);
 				break;
 			case 52:
@@ -1699,7 +1699,7 @@ void Acci::doThat() {
 		else {
 			if ((_vm->_gyro->dna.room == 12) & (_vm->_trip->infield(2))) { // Avaricius appears!
 				_vm->_visa->dixi('q', 17);
-				if (_vm->_gyro->whereis[1] == 12)
+				if (_vm->_gyro->_whereIs[1] == 12)
 					_vm->_visa->dixi('q', 18);
 				else {
 					_vm->_trip->tr[1].init(1, false, _vm->_trip); // Avaricius
@@ -1842,7 +1842,7 @@ void Acci::doThat() {
 	case kVerbCodeAttack:
 		if ((_vm->_gyro->dna.room == r__brummieroad) &&
 				((_person == 157) || (_thing == _vm->_gyro->crossbow) || (_thing == _vm->_gyro->bolt))
-				&& (_vm->_gyro->whereis[7] == _vm->_gyro->dna.room)) {
+				&& (_vm->_gyro->_whereIs[7] == _vm->_gyro->dna.room)) {
 			switch (_vm->_gyro->dna.obj[_vm->_gyro->bolt - 1] + _vm->_gyro->dna.obj[_vm->_gyro->crossbow - 1] * 2) {
 				// 0 = neither, 1 = only bolt, 2 = only crossbow, 3 = both.
 			case 0:
@@ -1861,12 +1861,12 @@ void Acci::doThat() {
 				_vm->_gyro->dna.obj[_vm->_gyro->bolt - 1] = false;
 				_vm->_gyro->dna.obj[_vm->_gyro->crossbow - 1] = false;
 				_vm->_lucerna->objectlist();
-				_vm->_gyro->magics[11].op = _vm->_gyro->nix;
+				_vm->_gyro->magics[11].op = _vm->_gyro->kMagicNothing;
 				_vm->_lucerna->points(7);
 				_vm->_trip->tr[1].walkto(2);
 				_vm->_trip->tr[1].vanishifstill = true;
 				_vm->_trip->tr[1].call_eachstep = false;
-				_vm->_gyro->whereis[7] = 177;
+				_vm->_gyro->_whereIs[7] = 177;
 				break;
 			default:
 				_vm->_visa->dixi('Q', 10); // Please try not to be so violent!
diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index 2bc3ce3463..3f948c3224 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -153,7 +153,7 @@ void Avalot::setup() {
 	_vm->_gyro->ledstatus = 177;
 	_vm->_gyro->defaultled = 2;
 	// TSkellern = 0; Replace with a more local variable sometime
-	_vm->_gyro->dna.rw = _vm->_gyro->stopped;
+	_vm->_gyro->dna.rw = _vm->_gyro->kDirectionStopped;
 	_vm->_gyro->enid_filename = ""; // Undefined.
 	_vm->_lucerna->toolbar();
 	_vm->_scrolls->state(2);
@@ -167,7 +167,7 @@ void Avalot::setup() {
 	_vm->_lucerna->dawn();
 	_vm->_parser->_cursorState = false;
 	_vm->_parser->cursorOn();
-	_vm->_trip->tr[0].xs = _vm->_gyro->walk;
+	_vm->_trip->tr[0].xs = _vm->_gyro->kWalk;
 	_vm->_trip->newspeed();
 
 
@@ -175,7 +175,7 @@ void Avalot::setup() {
 	int16 loadSlot = Common::ConfigManager::instance().getInt("save_slot");
 	if (loadSlot >= 0) {	
 		_vm->_gyro->thinks = 2; // You always have money.
-		_vm->_lucerna->thinkabout(_vm->_gyro->money, _vm->_gyro->a_thing);
+		_vm->_lucerna->thinkabout(_vm->_gyro->money, _vm->_gyro->kThing);
 
 		_vm->loadGame(loadSlot);
 	} else {
@@ -184,7 +184,7 @@ void Avalot::setup() {
 
 		_vm->_gyro->soundfx = ! _vm->_gyro->soundfx;
 		_vm->_lucerna->fxtoggle();
-		_vm->_lucerna->thinkabout(_vm->_gyro->money, _vm->_gyro->a_thing);
+		_vm->_lucerna->thinkabout(_vm->_gyro->money, _vm->_gyro->kThing);
 
 		_vm->_visa->dixi('q', 83); // Info on the game, etc. 
 	}	
diff --git a/engines/avalanche/dropdown2.cpp b/engines/avalanche/dropdown2.cpp
index d54e667328..a97aa1b332 100644
--- a/engines/avalanche/dropdown2.cpp
+++ b/engines/avalanche/dropdown2.cpp
@@ -459,7 +459,7 @@ void Dropdown::setupMenuAction() {
 		_activeMenuItem.setupOption("Open the door", 'O', "f7", _vm->_trip->neardoor());
 	_activeMenuItem.setupOption("Look around", 'L', "f8", true);
 	_activeMenuItem.setupOption("Inventory", 'I', "Tab", true);
-	if (_vm->_trip->tr[0].xs == _vm->_gyro->walk)
+	if (_vm->_trip->tr[0].xs == _vm->_gyro->kWalk)
 		_activeMenuItem.setupOption("Run fast", 'R', "^R", true);
 	else
 		_activeMenuItem.setupOption("Walk slowly", 'W', "^W", true);
@@ -474,7 +474,7 @@ void Dropdown::setupMenuPeople() {
 	_activeMenuItem.reset();
 
 	for (byte i = 150; i <= 178; i++)
-		if (_vm->_gyro->whereis[i - 150] == _vm->_gyro->dna.room) {
+		if (_vm->_gyro->_whereIs[i - 150] == _vm->_gyro->dna.room) {
 			_activeMenuItem.setupOption(_vm->_gyro->getname(i), _vm->_gyro->getnamechar(i), "", true);
 			people = people + i;
 		}
@@ -509,7 +509,7 @@ void Dropdown::setupMenuWith() {
 		// or (c), the _person you've selected is YOU!
 		
 		if ((_vm->_gyro->last_person == _vm->_gyro->pavalot) || (_vm->_gyro->last_person == _vm->_acci->kNothing)
-			|| (_vm->_gyro->whereis[_vm->_gyro->last_person - 150] != _vm->_gyro->dna.room))
+			|| (_vm->_gyro->_whereIs[_vm->_gyro->last_person - 150] != _vm->_gyro->dna.room))
 			_activeMenuItem.setupOption("Give to...", 'G', "", false); // Not here.
 		else {
 			_activeMenuItem.setupOption(Common::String("Give to ") + _vm->_gyro->getname(_vm->_gyro->last_person), 'G', "", true);
@@ -629,10 +629,10 @@ void Dropdown::runMenuAction() {
 		_vm->_lucerna->callverb(_vm->_acci->kVerbCodeInv);
 		break;
 	case 5: {
-		if (_vm->_trip->tr[0].xs == _vm->_gyro->walk)
-			_vm->_trip->tr[0].xs = _vm->_gyro->run;
+		if (_vm->_trip->tr[0].xs == _vm->_gyro->kWalk)
+			_vm->_trip->tr[0].xs = _vm->_gyro->kRun;
 		else
-			_vm->_trip->tr[0].xs = _vm->_gyro->walk;
+			_vm->_trip->tr[0].xs = _vm->_gyro->kWalk;
 		_vm->_trip->newspeed();
 	}
 	break;
@@ -640,11 +640,11 @@ void Dropdown::runMenuAction() {
 }
 
 void Dropdown::runMenuObjects() {
-	_vm->_lucerna->thinkabout(_vm->_gyro->objlist[_activeMenuItem._choiceNum + 1], _vm->_gyro->a_thing);
+	_vm->_lucerna->thinkabout(_vm->_gyro->objlist[_activeMenuItem._choiceNum + 1], _vm->_gyro->kThing);
 }
 
 void Dropdown::runMenuPeople() {
-	_vm->_lucerna->thinkabout(people[_activeMenuItem._choiceNum], _vm->_gyro->a_person);
+	_vm->_lucerna->thinkabout(people[_activeMenuItem._choiceNum], _vm->_gyro->kPerson);
 	_vm->_gyro->last_person = people[_activeMenuItem._choiceNum];
 }
 
diff --git a/engines/avalanche/gyro2.cpp b/engines/avalanche/gyro2.cpp
index 58a38c73c0..d154bb07e4 100644
--- a/engines/avalanche/gyro2.cpp
+++ b/engines/avalanche/gyro2.cpp
@@ -51,103 +51,33 @@ const char *Gyro::vernum = "1.30";
 const char *Gyro::copyright = "1995";
 
 
-const mp Gyro::mps[9] = {
-	{
-		// 1 - up-arrow
-		{	{65151, 64575, 64575, 63519, 63519, 61455, 61455, 57351, 57351, 49155, 49155, 64575, 64575, 64575, 64575, 64575},
-		{0, 384, 384, 960, 960, 2016, 2016, 4080, 4080, 8184, 384, 384, 384, 384, 384, 0}
-		},	
-			8,
-			0
-	},
-
-	{
-		// 2 - screwdriver
-		{	{8191, 4095, 2047, 34815, 50175, 61951, 63743, 64543, 65039, 65031, 65027, 65281, 65408, 65472, 65505, 65523},
-		{0, 24576, 28672, 12288, 2048, 1024, 512, 256, 224, 176, 216, 96, 38, 10, 12, 0}
-		},
-			0,
-			0
-	},
-
-	{
-		// 3 - right-arrow
-		{	{65535, 65535, 64639, 64543, 7, 1, 0, 1, 7, 64543, 64639, 65535, 65535, 65535, 65535, 65535},
-		{0, 0, 0, 384, 480, 32760, 32766, 32760, 480, 384, 0, 0, 0, 0, 0, 0}	
-		},
-			15,
-			6
-	},
-
-	{
-		// 4 - fletch
-		{	{255, 511, 1023, 2047, 1023, 4607, 14591, 31871, 65031, 65283, 65281, 65280, 65280, 65409, 65473, 65511},
-		{0, 10240, 20480, 24576, 26624, 17408, 512, 256, 128, 88, 32, 86, 72, 20, 16, 0}
-		},
-			0,
-			0
-	},
-
-	{
-		// 5 - hourglass
-		{	{0, 0, 0, 34785, 50115, 61455, 61455, 63519, 63519, 61839, 61455, 49155, 32769, 0, 0, 0},
-		{0, 32766, 16386, 12300, 2064, 1440, 1440, 576, 576, 1056, 1440, 3024, 14316, 16386, 32766, 0}
-		},
-			8,
-			7
-	},
-
-	{
-		// 6 - TTHand
-		{	{62463, 57855, 57855, 57855, 57471, 49167, 32769, 0, 0, 0, 0, 32768, 49152, 57344, 61441, 61443},
-		{3072, 4608, 4608, 4608, 4992, 12912, 21070, 36937, 36873, 36865, 32769, 16385, 8193, 4097, 2050, 4092}
-		},
-			4,
-			0
-	},
-
-	{
-		// 7- Mark's crosshairs
-		{	{65535, 65151, 65151, 65151, 65151, 0, 65151, 65151, 65151, 65151, 65535, 65535, 65535, 65535, 65535, 65535},
-		{0, 384, 384, 384, 384, 65535, 384, 384, 384, 384, 0, 0, 0, 0, 0, 0}
-		},
-			8,
-			5
-	},
-
-	{
-		// 8- I-beam
-		{	{65535, 65535, 63631, 63503, 63503, 65087, 65087, 65087, 65087, 65087, 63503, 63503, 63631, 65535, 65535, 65535},
-		{0, 0, 0, 864, 128, 128, 128, 128, 128, 128, 128, 864, 0, 0, 0, 0}
-		},
-			8,
-			7
-	},
-
-	{
-		// 9 - question mark
-		{	{511, 1023, 2047, 31, 15, 8199, 32647, 65415, 63503, 61471, 61503, 61695, 63999, 63999, 61695, 61695},
-		{65024, 33792, 34816, 34784, 40976, 57224, 32840, 72, 1936, 2080, 2496, 2304, 1536, 1536, 2304, 3840}
-		},
-			0,
-			0
-	}
+const MouseHotspotType Gyro::kMouseHotSpots[9] = {
+	{8,0}, // 1 - up-arrow
+	{0,0}, // 2 - screwdriver
+	{15,6}, // 3 - right-arrow
+	{0,0}, // 4 - fletch
+	{8,7}, // 5 - hourglass
+	{4,0}, // 6 - TTHand
+	{8,5}, // 7- Mark's crosshairs
+	{8,7}, // 8- I-beam
+	{0,0} // 9 - question mark
 };
 
-const Common::String Gyro::lads[17] = {
+const Common::String Gyro::kLads[17] = {
 	"Avalot", "Spludwick", "Crapulus", "Dr. Duck", "Malagauche", "Friar Tuck",
 	"Robin Hood", "Cwytalot", "du Lustie", "the Duke of Cardiff", "Dogfood",
 	"A trader", "Ibythneth", "Ayles", "Port", "Spurge", "Jacques"
 };
 
-const Common::String Gyro::lasses[4] =
+const Common::String Gyro::kLasses[4] =
 {"Arkata", "Geida", "±", "the Wise Woman"};
 
-const char Gyro::ladchar[] = "ASCDMTRwLfgeIyPu";
+const char Gyro::kLadChar[] = "ASCDMTRwLfgeIyPu";
 
-const char Gyro::lasschar[] = "kG±o";
+const char Gyro::kLassChar[] = "kG±o";
 
-const int32 Gyro::catamap[8][8] = {
+// Art gallery at 2,1; notice about this at 2,2.
+const int32 Gyro::kCatacombMap[8][8] = {
 	// Geida's room
 	// 1     2			3   | 4     5		6		7     8
 	{0x204, 0x200, 0xd0f0, 0xf0ff, 0xff, 0xd20f, 0xd200, 0x200},
@@ -161,9 +91,45 @@ const int32 Gyro::catamap[8][8] = {
 };
 // vv Stairs trap.
 
-const char Gyro::spludwick_order[3] = {onion, ink, mushroom};
-
-const quasiped_type Gyro::quasipeds[16] = {
+/* Explanation: $NSEW.
+		Nibble N: North.
+		0     = no connection,
+		2     = (left,) middle(, right) door with left-hand handle,
+		5     = (left,) middle(, right) door with right-hand handle,
+		7     = arch,
+		8     = arch and 1 north of it,
+		9     = arch and 2 north of it,
+		D     = no connection + WINDOW,
+		E     = no connection + TORCH,
+		F     = recessed door (to Geida's room.)
+
+		Nibble S: South.
+		0     = no connection,
+		1,2,3 = left, middle, right door.
+
+		Nibble E: East.
+		0     = no connection (wall),
+		1     = no connection (wall + window),
+		2     = wall with door,
+		3     = wall with door and window,
+		6     = wall with candles,
+		7     = wall with door and candles,
+		F     = straight-through corridor.
+
+		Nibble W: West.
+		0     = no connection (wall),
+		1     = no connection (wall + shield),
+		2     = wall with door,
+		3     = wall with door and shield,
+		4     = no connection (window),
+		5     = wall with door and window,
+		6     = wall with candles,
+		7     = wall with door and candles,
+		F     = straight-through corridor. */
+
+const char Gyro::kSpludwicksOrder[3] = {onion, ink, mushroom};
+
+const QuasipedType Gyro::kQuasipeds[16] = {
 	{2, kColorLightgray, 19, kColorBrown, pdogfood},                       // A: Dogfood (screen 19). 
 	{3, kColorGreen,     19, kColorWhite, pibythneth},                     // B: Ibythneth (screen 19).
 	{3, kColorWhite,     1, kColorMagenta, parkata},                       // C: Arkata (screen 1).
@@ -182,18 +148,18 @@ const quasiped_type Gyro::quasipeds[16] = {
 	{2, kColorLightgreen, 51, kColorDarkgray, pdrduck}                     // P: Duck (screen 51).
 };
 
-const char Gyro::keys[] = "QWERTYUIOP[]";
+const char Gyro::kMusicKeys[] = "QWERTYUIOP[]";
 
-const uint16 Gyro::notes[12] = {196, 220, 247, 262, 294, 330, 350, 392, 440, 494, 523, 587};
+const uint16 Gyro::kNotes[12] = {196, 220, 247, 262, 294, 330, 350, 392, 440, 494, 523, 587};
 
-const tunetype Gyro::tune = {
-	higher, higher, lower, same, higher, higher, lower, higher, higher, higher,
-	lower, higher, higher,
-	same, higher, lower, lower, lower, lower, higher, higher, lower, lower, lower,
-	lower, same, lower, higher, same, lower, higher
+const TuneType Gyro::kTune = {
+	kPitchHigher, kPitchHigher, kPitchLower, kPitchSame, kPitchHigher, kPitchHigher, kPitchLower, kPitchHigher, kPitchHigher, kPitchHigher,
+	kPitchLower, kPitchHigher, kPitchHigher,
+	kPitchSame, kPitchHigher, kPitchLower, kPitchLower, kPitchLower, kPitchLower, kPitchHigher, kPitchHigher, kPitchLower, kPitchLower, kPitchLower,
+	kPitchLower, kPitchSame, kPitchLower, kPitchHigher, kPitchSame, kPitchLower, kPitchHigher
 };
 
-byte Gyro::whereis[29] = {
+byte Gyro::_whereIs[29] = {
 	// The Lads
 	r__yours, // Avvy
 	r__spludwicks, // Spludwick
@@ -237,7 +203,7 @@ const Common::String Gyro::better[numobjs] = {
 
 const char Gyro::betterchar[] = "WMBParCLguKeSnIohn";
 
-Gyro::Gyro(AvalancheEngine *vm) : interrogation(0), oncandopageswap(true) {
+Gyro::Gyro(AvalancheEngine *vm) : _interrogation(0), _onCanDoPageSwap(true) {
 	_vm = vm;
 
 	// Needed because of Lucerna::load_also()
@@ -306,7 +272,7 @@ void Gyro::shbox(int16 x1, int16 y1, int16 x2, int16 y2, Common::String t) {
 }
 
 void Gyro::newgame() { 
-	for (byte gm = 0; gm < numtr; gm++) {
+	for (byte gm = 0; gm < kMaxSprites; gm++) {
 		if (_vm->_trip->tr[gm].quick)
 			_vm->_trip->tr[gm].done();
 	}
@@ -324,7 +290,7 @@ void Gyro::newgame() {
 	dna.like2drink = "beer";
 
 	dna.pence = 30; // 2/6
-	dna.rw = stopped;
+	dna.rw = kDirectionStopped;
 	dna.wearing = clothes;
 	dna.obj[money - 1] = true;
 	dna.obj[bodkin - 1] = true;
@@ -338,7 +304,7 @@ void Gyro::newgame() {
 	seescroll = false;
 
 	ppos[0][1] = -177; 
-	_vm->_trip->tr[0].appear(300,117,right); // Needed to initialize Avalot.
+	_vm->_trip->tr[0].appear(300,117,kDirectionRight); // Needed to initialize Avalot.
 	//for (gd = 0; gd <= 30; gd++) for (gm = 0; gm <= 1; gm++) also[gd][gm] = nil;
 	// fillchar(previous^,sizeof(previous^),#0); { blank out array }
 	him = 254;
@@ -401,17 +367,17 @@ bool Gyro::pennycheck(uint16 howmuchby) {
 // Keep an eye open!
 Common::String Gyro::getname(byte whose) { 
 	if (whose < 175)
-		return lads[whose - 150];
+		return kLads[whose - 150];
 	else
-		return lasses[whose - 175];
+		return kLasses[whose - 175];
 }
 
 // Keep an eye open! ^
 byte Gyro::getnamechar(byte whose) {
 	if (whose < 175) 
-		return ladchar[whose - 150];
+		return kLadChar[whose - 150];
 	else
-		return lasschar[whose - 175];
+		return kLassChar[whose - 175];
 }
 
 // Keep an eye open! ^^
@@ -570,7 +536,7 @@ void Gyro::load_a_mouse(byte which) {
 
 
 
-	CursorMan.replaceCursor(cursor.pixels, 16, 32, mps[which - 1].horzhotspot, mps[which - 1].verthotspot * 2, 255, false);
+	CursorMan.replaceCursor(cursor.pixels, 16, 32, kMouseHotSpots[which - 1]._horizontal, kMouseHotSpots[which - 1]._vertical * 2, 255, false);
 
 	cursor.free();
 }
diff --git a/engines/avalanche/gyro2.h b/engines/avalanche/gyro2.h
index c11eb389cb..5ae62d2228 100644
--- a/engines/avalanche/gyro2.h
+++ b/engines/avalanche/gyro2.h
@@ -49,14 +49,8 @@ static const int16 maxobjs = 12;  // carry limit
 static const int16 numlockCode = 32;  // Code for Num Lock
 static const int16 mouse_size = 134;
 
-struct postype {
-	uint16 x, y, datapos;
-	byte length;
-};
-
-struct mp { // mouse-void 
-	uint16 mask[2][16];
-	int16 horzhotspot, verthotspot;
+struct MouseHotspotType { // mouse-void 
+	int16 _horizontal, _vertical;
 };
 
 struct dnatype { // here goes... Ux, uy, & ww now all belong to Trip5
@@ -208,7 +202,7 @@ struct demo_type {
 	char key, extd;
 };
 
-struct quasiped_type {
+struct QuasipedType {
 	byte whichped, fgc, room, bgc;
 	uint16 who;
 };
@@ -216,7 +210,7 @@ struct quasiped_type {
 	quasiped "A" is Dogfood. The rooms aren't stored because I'm leaving
 	that to context. */
 
-typedef byte tunetype[31];
+typedef byte TuneType[31];
 
 
 struct PointType {
@@ -334,126 +328,80 @@ public:
 
 	static const int16 margin = 5;
 
-	static const mp mps[9];
+	static const MouseHotspotType kMouseHotSpots[9];
 
-	static const Common::String lads[17];
+	static const Common::String kLads[17];
 
-	static const Common::String lasses[4];
+	static const Common::String kLasses[4];
 
-	static const char ladchar[];
+	static const char kLadChar[];
 
-	static const char lasschar[];
+	static const char kLassChar[];
 
-	static const int16 numtr = 2; // current max no. of sprites
+	static const int16 kMaxSprites = 2; // Current max no. of sprites.
 
-	static const bool a_thing = true;
-	static const bool a_person = false; // for Thinkabout
+	// For Thinkabout:
+	static const bool kThing = true;
+	static const bool kPerson = false; 
 
-	// Magic/portal commands are
+	// Magic/portal constants:
+	enum Magics {
+		kMagicNothing, // Ignore it if this line is touched.
+		kMagicBounce, // Bounce off this line. Not valid for portals.
+		kMagicExclaim, // Put up a chain of scrolls.
+		kMagicTransport, // Enter new room.
+		kMagicUnfinished, // Unfinished connection.
+		kMagicSpecial, // Special function.
+		kMagicOpenDoor // Opening door.
+	};
+	
+	// These following static constants should be included in CFG when it's written.
 
-	/*N*/ static const int16 nix = 0; // ignore it if this line is touched
-	/*B*/ static const int16 bounces = 1; // bounce off this line. Not valid for portals.
-	/*E*/ static const int16 exclaim = 2; // put up a chain of scrolls
-	/*T*/ static const int16 transport = 3; // enter new room
-	/*U*/ static const int16 unfinished = 4; // unfinished connection
-	/*S*/ static const int16 special = 5; // special function.
-	/*O*/ static const int16 mopendoor = 6; // opening door.
+	static const bool kSlowComputer = false; // Stops walking when mouse touches toolbar.
 
-	// These following static constants should be included in CFG when it's written.
+	static const int16 kBorder = 1; // size of border on shadowboxes
 
-	static const bool slow_computer = false; // stops walking when mouse touches toolbar
-
-	/* --- */
-
-	static const int16 border = 1; // size of border on shadowboxes
-
-	static const int32 pagetop = 81920;
-
-	static const int16 up = 0;
-	static const int16 right = 1;
-	static const int16 down = 2;
-	static const int16 left = 3;
-	static const int16 ur = 4;
-	static const int16 dr = 5;
-	static const int16 dl = 6;
-	static const int16 ul = 7;
-	static const int16 stopped = 8;
-
-	static const int16 walk = 3;
-	static const int16 run = 5;
-
-	// Art gallery at 2,1; notice about this at 2,2.
-
-	static const int32 catamap[8][8];
-
-	/* Explanation: $NSEW.
-		Nibble N: North.
-		0     = no connection,
-		2     = (left,) middle(, right) door with left-hand handle,
-		5     = (left,) middle(, right) door with right-hand handle,
-		7     = arch,
-		8     = arch and 1 north of it,
-		9     = arch and 2 north of it,
-		D     = no connection + WINDOW,
-		E     = no connection + TORCH,
-		F     = recessed door (to Geida's room.)
-
-		Nibble S: South.
-		0     = no connection,
-		1,2,3 = left, middle, right door.
-
-		Nibble E: East.
-		0     = no connection (wall),
-		1     = no connection (wall + window),
-		2     = wall with door,
-		3     = wall with door and window,
-		6     = wall with candles,
-		7     = wall with door and candles,
-		F     = straight-through corridor.
-
-		Nibble W: West.
-		0     = no connection (wall),
-		1     = no connection (wall + shield),
-		2     = wall with door,
-		3     = wall with door and shield,
-		4     = no connection (window),
-		5     = wall with door and window,
-		6     = wall with candles,
-		7     = wall with door and candles,
-		F     = straight-through corridor. */
-
-	static const bool demo = false; // If this is true, we're in a demo of the game.
-
-	static const char spludwick_order[3];
-	 
-	static const quasiped_type quasipeds[16];
+	enum Direction {
+		kDirectionUp, kDirectionRight, kDirectionDown, kDirectionLeft,
+		kDirectionUpRight, kDirectionDownRight, kDirectionDownLeft, kDirectionUpLeft,
+		kDirectionStopped
+	};
+
+	static const int16 kWalk = 3;
+	static const int16 kRun = 5;
+
+	static const int32 kCatacombMap[8][8];
 
-	static const int16 lower = 0;
-	static const int16 same = 1;
-	static const int16 higher = 2;
+	static const bool kDemo = false; // If this is true, we're in a demo of the game.
+
+	static const char kSpludwicksOrder[3];
+	 
+	static const QuasipedType kQuasipeds[16];
 
-	static const char keys[];
-	static const uint16 notes[12];
+	enum Pitch {
+		kPitchLower,
+		kPitchSame,
+		kPitchHigher
+	};
 
-	static const tunetype tune;
+	static const char kMusicKeys[];
+	static const uint16 kNotes[12];
 
-	// special run-time errors
+	static const TuneType kTune;
 
-	static const int16 runerr_getset_overflow = 50;
 
 
 
 
 
 
-	byte interrogation;
-	/* If this is greater than zero, the next line you type is stored in
-		the DNA in a position dictated by the value. If a scroll comes up,
-		or you leave the room, it's automatically set to zero. */
+	byte _interrogation;
+	// If this is greater than zero, the next line you type is stored in the DNA in a position dictated by the value.
+	// If a scroll comes up, or you leave the room, it's automatically set to zero.
 
-	static byte whereis[29];
+	static byte _whereIs[29];
 
-	bool oncandopageswap; 
+	bool _onCanDoPageSwap; 
 	// Variable static constant for overriding the ability of On to switch pages.
 	// You may know better than On which page to switch to.
 
diff --git a/engines/avalanche/lucerna2.cpp b/engines/avalanche/lucerna2.cpp
index fe604cc70a..f4c583089f 100644
--- a/engines/avalanche/lucerna2.cpp
+++ b/engines/avalanche/lucerna2.cpp
@@ -274,7 +274,7 @@ void Lucerna::zoomout(int16 x, int16 y) {
 
 void Lucerna::find_people(byte room) {
 	for (byte fv = 1; fv < 29; fv++)
-		if (_vm->_gyro->whereis[fv] == room) {
+		if (_vm->_gyro->_whereIs[fv] == room) {
 			if (fv < 25)
 				_vm->_gyro->him = fv + 150;
 			else
@@ -307,7 +307,7 @@ void Lucerna::exitroom(byte x) {
 		break;
 	}
 
-	_vm->_gyro->interrogation = 0; // Leaving the room cancels all the questions automatically.
+	_vm->_gyro->_interrogation = 0; // Leaving the room cancels all the questions automatically.
 
 	_vm->_gyro->seescroll = false; // Now it can work again!
 
@@ -368,10 +368,10 @@ void Lucerna::enterroom(byte x, byte ped) {
 	if ((_vm->_gyro->dna.rooms[x] == 0) && (! _vm->_gyro->flagset('S')))
 		points(1);
 
-	_vm->_gyro->whereis[_vm->_gyro->pavalot - 150] = _vm->_gyro->dna.room;
+	_vm->_gyro->_whereIs[_vm->_gyro->pavalot - 150] = _vm->_gyro->dna.room;
 
 	if (_vm->_gyro->dna.geida_follows)
-		_vm->_gyro->whereis[_vm->_gyro->pgeida - 150] = x;
+		_vm->_gyro->_whereIs[_vm->_gyro->pgeida - 150] = x;
 
 	_vm->_gyro->roomtime = 0;
 
@@ -393,7 +393,7 @@ void Lucerna::enterroom(byte x, byte ped) {
 		if (ped > 0) {
 			if (! _vm->_gyro->dna.talked_to_crapulus) {
 
-				_vm->_gyro->whereis[_vm->_gyro->pcrapulus - 150] = r__outsideyours;
+				_vm->_gyro->_whereIs[_vm->_gyro->pcrapulus - 150] = r__outsideyours;
 				_vm->_trip->tr[1].init(8, false, _vm->_trip); // load Crapulus
 
 				if (_vm->_gyro->dna.rooms[r__outsideyours] == 1) {
@@ -407,7 +407,7 @@ void Lucerna::enterroom(byte x, byte ped) {
 				_vm->_trip->tr[1].call_eachstep = true;
 				_vm->_trip->tr[1].eachstep = _vm->_trip->procface_avvy; // He always faces Avvy.
 
-			} else _vm->_gyro->whereis[_vm->_gyro->pcrapulus - 150] = r__nowhere;
+			} else _vm->_gyro->_whereIs[_vm->_gyro->pcrapulus - 150] = r__nowhere;
 
 			if (_vm->_gyro->dna.crapulus_will_tell) {
 				_vm->_trip->tr[1].init(8, false, _vm->_trip);
@@ -431,7 +431,7 @@ void Lucerna::enterroom(byte x, byte ped) {
 			if (ped > 0) {
 				_vm->_trip->tr[1].init(2, false, _vm->_trip); // load Spludwick
 				_vm->_trip->apped(2, 2);
-				_vm->_gyro->whereis[1] = r__spludwicks;
+				_vm->_gyro->_whereIs[1] = r__spludwicks;
 			}
 
 			_vm->_gyro->dna.dogfoodpos = 0;  // _vm->_gyro->also Spludwick pos.
@@ -439,21 +439,21 @@ void Lucerna::enterroom(byte x, byte ped) {
 			_vm->_trip->tr[1].call_eachstep = true;
 			_vm->_trip->tr[1].eachstep = _vm->_trip->procgeida_procs;
 		} else
-			_vm->_gyro->whereis[1] = r__nowhere;
+			_vm->_gyro->_whereIs[1] = r__nowhere;
 		break;
 
 	case r__brummieroad: {
 		if (_vm->_gyro->dna.geida_follows)
 			put_geida_at(5, ped);
 		if (_vm->_gyro->dna.cwytalot_gone) {
-			_vm->_gyro->magics[kColorLightred - 1].op = _vm->_gyro->nix;
-			_vm->_gyro->whereis[_vm->_gyro->pcwytalot - 150] = r__nowhere;
+			_vm->_gyro->magics[kColorLightred - 1].op = _vm->_gyro->kMagicNothing;
+			_vm->_gyro->_whereIs[_vm->_gyro->pcwytalot - 150] = r__nowhere;
 		} else {
 			if (ped > 0) {
 				_vm->_trip->tr[1].init(4, false, _vm->_trip); // 4 = Cwytalot
 				_vm->_trip->tr[1].call_eachstep = true;
 				_vm->_trip->tr[1].eachstep = _vm->_trip->procfollow_avvy_y;
-				_vm->_gyro->whereis[_vm->_gyro->pcwytalot - 150] = r__brummieroad;
+				_vm->_gyro->_whereIs[_vm->_gyro->pcwytalot - 150] = r__brummieroad;
 
 				if (_vm->_gyro->dna.rooms[r__brummieroad] == 1) { // First time here...
 					_vm->_trip->apped(2, 2); // He appears on the right of the screen...
@@ -486,7 +486,7 @@ void Lucerna::enterroom(byte x, byte ped) {
 		if (_vm->_gyro->dna.drawbridge_open == 4) { // open
 			_vm->_celer->drawBackgroundSprite(-1, -1, 3); // Position of drawbridge
 			_vm->_graphics->refreshBackground();
-			_vm->_gyro->magics[kColorGreen - 1].op = _vm->_gyro->nix; // You may enter the drawbridge.
+			_vm->_gyro->magics[kColorGreen - 1].op = _vm->_gyro->kMagicNothing; // You may enter the drawbridge.
 		}
 		if (_vm->_gyro->dna.geida_follows)
 			put_geida_at(ped + 3, ped); // load Geida
@@ -505,8 +505,8 @@ void Lucerna::enterroom(byte x, byte ped) {
 		}
 
 		if (_vm->_gyro->dna.been_tied_up) {
-			_vm->_gyro->whereis[_vm->_gyro->probinhood - 150] = 0;
-			_vm->_gyro->whereis[_vm->_gyro->pfriartuck - 150] = 0;
+			_vm->_gyro->_whereIs[_vm->_gyro->probinhood - 150] = 0;
+			_vm->_gyro->_whereIs[_vm->_gyro->pfriartuck - 150] = 0;
 		}
 
 		if (_vm->_gyro->dna.tied_up)
@@ -529,7 +529,7 @@ void Lucerna::enterroom(byte x, byte ped) {
 			}
 			break;
 			case 5 :
-				_vm->_gyro->magics[1].op = _vm->_gyro->nix;
+				_vm->_gyro->magics[1].op = _vm->_gyro->kMagicNothing;
 				break; // You've answered ALL his questions. => nothing happens.
 			default: { // You've answered SOME of his questions.
 				_vm->_trip->tr[1].init(9, false, _vm->_trip);
@@ -539,8 +539,8 @@ void Lucerna::enterroom(byte x, byte ped) {
 			}
 			}
 		if (_vm->_gyro->dna.cardiff_things < 5)
-			_vm->_gyro->interrogation = _vm->_gyro->dna.cardiff_things;
-		else _vm->_gyro->interrogation = 0;
+			_vm->_gyro->_interrogation = _vm->_gyro->dna.cardiff_things;
+		else _vm->_gyro->_interrogation = 0;
 	}
 	break;
 
@@ -628,8 +628,8 @@ void Lucerna::enterroom(byte x, byte ped) {
 			_vm->_celer->drawBackgroundSprite(-1, -1, 2);
 			_vm->_graphics->refreshBackground();
 			_vm->_celer->drawBackgroundSprite(-1, -1, 4);
-			_vm->_gyro->magics[kColorBrown - 1].op = _vm->_gyro->nix;
-			_vm->_gyro->whereis[_vm->_gyro->pjacques - 150] = 0;
+			_vm->_gyro->magics[kColorBrown - 1].op = _vm->_gyro->kMagicNothing;
+			_vm->_gyro->_whereIs[_vm->_gyro->pjacques - 150] = 0;
 		}
 		if (ped != 0) {
 			_vm->_celer->drawBackgroundSprite(-1, -1, 6);
@@ -903,7 +903,7 @@ void Lucerna::showscore() {
 
 	const bytefield scorespace = {33, 177, 39, 200};
 
-	if (_vm->_gyro->demo)
+	if (_vm->_gyro->kDemo)
 		return;
 
 	uint16 score = _vm->_gyro->dna.score;
@@ -1006,7 +1006,7 @@ void Lucerna::fxtoggle() {
 void Lucerna::objectlist() {
 	_vm->_gyro->dna.carrying = 0;
 	if (_vm->_gyro->thinkthing && !_vm->_gyro->dna.obj[_vm->_gyro->thinks - 1])
-		thinkabout(_vm->_gyro->money, _vm->_gyro->a_thing); // you always have money
+		thinkabout(_vm->_gyro->money, _vm->_gyro->kThing); // you always have money
 	for (byte fv = 0; fv < numobjs; fv++)
 		if (_vm->_gyro->dna.obj[fv]) {
 			_vm->_gyro->dna.carrying++;
@@ -1069,7 +1069,7 @@ void Lucerna::verte(Common::Point cursorPos) {
 
 void Lucerna::checkclick() {
 	Common::Point cursorPos = _vm->getMousePos();
-	_vm->_gyro->ontoolbar = _vm->_gyro->slow_computer && ((cursorPos.y >= 169) || (cursorPos.y <= 10));
+	_vm->_gyro->ontoolbar = _vm->_gyro->kSlowComputer && ((cursorPos.y >= 169) || (cursorPos.y <= 10));
 	
 	/*if (_vm->_gyro->mrelease > 0)
 	_vm->_gyro->after_the_scroll = false;*/
@@ -1125,10 +1125,10 @@ void Lucerna::checkclick() {
 
 				callverb(_vm->_acci->kVerbCodeScore);
 			} else if ((320 <= cursorPos.x) && (cursorPos.x <= 357)) { // Change speed.
-				_vm->_trip->tr[0].xs = _vm->_gyro->walk;
+				_vm->_trip->tr[0].xs = _vm->_gyro->kWalk;
 				_vm->_trip->newspeed();
 			} else if ((358 <= cursorPos.x) && (cursorPos.x <= 395)) { // Change speed.
-				_vm->_trip->tr[0].xs = _vm->_gyro->run;
+				_vm->_trip->tr[0].xs = _vm->_gyro->kRun;
 				_vm->_trip->newspeed();
 			} else if ((396 <= cursorPos.x) && (cursorPos.x <= 483))
 				fxtoggle();
diff --git a/engines/avalanche/timeout2.cpp b/engines/avalanche/timeout2.cpp
index 078963aca6..4cab87a7a1 100644
--- a/engines/avalanche/timeout2.cpp
+++ b/engines/avalanche/timeout2.cpp
@@ -227,7 +227,7 @@ void Timeout::open_drawbridge() {
 	_vm->_celer->drawBackgroundSprite(-1, -1, _vm->_gyro->dna.drawbridge_open - 1);
 
 	if (_vm->_gyro->dna.drawbridge_open == 4)
-		_vm->_gyro->magics[1].op = _vm->_gyro->nix; // You may enter the drawbridge.
+		_vm->_gyro->magics[1].op = _vm->_gyro->kMagicNothing; // You may enter the drawbridge.
 	else
 		set_up_timer(7, procopen_drawbridge, reason_drawbridgefalls);
 }
@@ -267,9 +267,9 @@ void Timeout::stairs() {
 	_vm->_trip->tr[0].walkto(4);
 	_vm->_celer->drawBackgroundSprite(-1, -1, 2);
 	_vm->_gyro->dna.brummie_stairs = 2;
-	_vm->_gyro->magics[10].op = _vm->_gyro->special;
+	_vm->_gyro->magics[10].op = _vm->_gyro->kMagicSpecial;
 	_vm->_gyro->magics[10].data = 2; // Reached the bottom of the stairs.
-	_vm->_gyro->magics[3].op = _vm->_gyro->nix; // Stop them hitting the sides (or the game will hang.)
+	_vm->_gyro->magics[3].op = _vm->_gyro->kMagicNothing; // Stop them hitting the sides (or the game will hang.)
 }
 
 void Timeout::cardiff_survey() {
@@ -280,7 +280,7 @@ void Timeout::cardiff_survey() {
 
 	_vm->_visa->dixi('z', _vm->_gyro->dna.cardiff_things);
 
-	_vm->_gyro->interrogation = _vm->_gyro->dna.cardiff_things;
+	_vm->_gyro->_interrogation = _vm->_gyro->dna.cardiff_things;
 
 	set_up_timer(182, proccardiffsurvey, reason_cardiffsurvey);
 }
@@ -309,14 +309,14 @@ void Timeout::get_tied_up() {
 void Timeout::get_tied_up2() {
 	_vm->_trip->tr[0].walkto(4);
 	_vm->_trip->tr[1].walkto(5);
-	_vm->_gyro->magics[3].op = _vm->_gyro->nix; // No effect when you touch the boundaries.
+	_vm->_gyro->magics[3].op = _vm->_gyro->kMagicNothing; // No effect when you touch the boundaries.
 	_vm->_gyro->dna.friar_will_tie_you_up = true;
 }
 
 void Timeout::hang_around() {
 	_vm->_trip->tr[1].check_me = false;
 	_vm->_trip->tr[0].init(7, true, _vm->_trip); // Robin Hood
-	_vm->_gyro->whereis[_vm->_gyro->probinhood - 150] = r__robins;
+	_vm->_gyro->_whereIs[_vm->_gyro->probinhood - 150] = r__robins;
 	_vm->_trip->apped(1, 2);
 	_vm->_visa->dixi('q', 39);
 	_vm->_trip->tr[0].walkto(7);
@@ -327,7 +327,7 @@ void Timeout::hang_around2() {
 	_vm->_visa->dixi('q', 40);
 	_vm->_trip->tr[1].vanishifstill = false;
 	_vm->_trip->tr[1].walkto(4);
-	_vm->_gyro->whereis[_vm->_gyro->pfriartuck - 150] = r__robins;
+	_vm->_gyro->_whereIs[_vm->_gyro->pfriartuck - 150] = r__robins;
 	_vm->_visa->dixi('q', 41);
 	_vm->_trip->tr[0].done();
 	_vm->_trip->tr[1].done(); // Get rid of Robin Hood and Friar Tuck.
@@ -387,12 +387,12 @@ void Timeout::jacques_wakes_up() {
 	case 2 : // Going through the door.
 		_vm->_celer->drawBackgroundSprite(-1, -1, 2); // Not on the floor.
 		_vm->_celer->drawBackgroundSprite(-1, -1, 3); // But going through the door.
-		_vm->_gyro->magics[5].op = _vm->_gyro->nix; // You can't wake him up now.
+		_vm->_gyro->magics[5].op = _vm->_gyro->kMagicNothing; // You can't wake him up now.
 		break;
 	case 3 :  // Gone through the door.
 		_vm->_celer->drawBackgroundSprite(-1, -1, 2); // Not on the floor, either.
 		_vm->_celer->drawBackgroundSprite(-1, -1, 4); // He's gone... so the door's open.
-		_vm->_gyro->whereis[_vm->_gyro->pjacques - 150] = 0; // Gone!
+		_vm->_gyro->_whereIs[_vm->_gyro->pjacques - 150] = 0; // Gone!
 		break;
 	}
 
@@ -529,7 +529,7 @@ void Timeout::greetsmonk() {
 }
 
 void Timeout::fall_down_oubliette() {
-	_vm->_gyro->magics[8].op = _vm->_gyro->nix;
+	_vm->_gyro->magics[8].op = _vm->_gyro->kMagicNothing;
 	_vm->_trip->tr[0].iy++; // Increments dx/dy!
 	_vm->_trip->tr[0].y += _vm->_trip->tr[0].iy;   // Dowwwn we go...
 	set_up_timer(3, procfall_down_oubliette, reason_falling_down_oubliette);
diff --git a/engines/avalanche/trip6.cpp b/engines/avalanche/trip6.cpp
index 6a1aeddf01..0e16c776ce 100644
--- a/engines/avalanche/trip6.cpp
+++ b/engines/avalanche/trip6.cpp
@@ -217,27 +217,27 @@ void triptype::walk() {
 
 		if ((tc != 255) & (!_tr->_vm->_gyro->doing_sprite_run)) {
 			switch (_tr->_vm->_gyro->magics[tc].op) {
-			case Gyro::exclaim: {
+			case Gyro::kMagicExclaim: {
 				bounce();
 				_tr->mustexclaim = true;
 				_tr->saywhat = _tr->_vm->_gyro->magics[tc].data;
 				}
 				break;
-			case Gyro::bounces:
+			case Gyro::kMagicBounce:
 				bounce();
 				break;
-			case Gyro::transport:
+			case Gyro::kMagicTransport:
 				_tr->fliproom(_tr->_vm->_gyro->magics[tc].data >> 8, _tr->_vm->_gyro->magics[tc].data & 0xff);
 				break;
-			case Gyro::unfinished: {
+			case Gyro::kMagicUnfinished: {
 				bounce();
 				_tr->_vm->_scrolls->display("\7Sorry.\3\rThis place is not available yet!");
 				}
 				break;
-			case Gyro::special:
+			case Gyro::kMagicSpecial:
 				_tr->call_special(_tr->_vm->_gyro->magics[tc].data);
 				break;
-			case Gyro::mopendoor:
+			case Gyro::kMagicOpenDoor:
 				_tr->open_the_door(_tr->_vm->_gyro->magics[tc].data >> 8, _tr->_vm->_gyro->magics[tc].data & 0xff, tc);
 				break;
 			}
@@ -262,9 +262,9 @@ void triptype::bounce() {
 		_tr->stopwalking();
 	else
 		stopwalk();
-	_tr->_vm->_gyro->oncandopageswap = false;
+	_tr->_vm->_gyro->_onCanDoPageSwap = false;
 	_tr->_vm->_lucerna->showrw();
-	_tr->_vm->_gyro->oncandopageswap = true;
+	_tr->_vm->_gyro->_onCanDoPageSwap = true;
 }
 
 int8 triptype::sgn(int16 val) {
@@ -566,70 +566,70 @@ void Trip::catamove(byte ped) {
 
 	if (!_vm->_gyro->dna.enter_catacombs_from_lusties_room)
 		_vm->_lucerna->load(29);
-	here = _vm->_gyro->catamap[_vm->_gyro->dna.cat_y - 1][_vm->_gyro->dna.cat_x - 1];
+	here = _vm->_gyro->kCatacombMap[_vm->_gyro->dna.cat_y - 1][_vm->_gyro->dna.cat_x - 1];
 
 	switch (here & 0xf) { // West.
 	case 0: // no connection (wall)
-		_vm->_gyro->magics[1].op = _vm->_gyro->bounces; // Sloping wall.
-		_vm->_gyro->magics[2].op = _vm->_gyro->nix; // Straight wall.
-		_vm->_gyro->portals[4].op = _vm->_gyro->nix; // Door.
+		_vm->_gyro->magics[1].op = _vm->_gyro->kMagicBounce; // Sloping wall.
+		_vm->_gyro->magics[2].op = _vm->_gyro->kMagicNothing; // Straight wall.
+		_vm->_gyro->portals[4].op = _vm->_gyro->kMagicNothing; // Door.
 		_vm->_celer->drawBackgroundSprite(-1, -1, 28);
 		break;
 	case 0x1: // no connection (wall + shield),
-		_vm->_gyro->magics[1].op = _vm->_gyro->bounces; // Sloping wall.
-		_vm->_gyro->magics[2].op = _vm->_gyro->nix; // Straight wall.
-		_vm->_gyro->portals[4].op = _vm->_gyro->nix; // Door.
+		_vm->_gyro->magics[1].op = _vm->_gyro->kMagicBounce; // Sloping wall.
+		_vm->_gyro->magics[2].op = _vm->_gyro->kMagicNothing; // Straight wall.
+		_vm->_gyro->portals[4].op = _vm->_gyro->kMagicNothing; // Door.
 		_vm->_celer->drawBackgroundSprite(-1, -1, 28); // Wall, plus...
 		_vm->_celer->drawBackgroundSprite(-1, -1, 29); // ...shield.
 		break;
 	case 0x2: // wall with door
-		_vm->_gyro->magics[1].op = _vm->_gyro->bounces; // Sloping wall.
-		_vm->_gyro->magics[2].op = _vm->_gyro->nix; // Straight wall.
-		_vm->_gyro->portals[4].op = _vm->_gyro->special; // Door.
+		_vm->_gyro->magics[1].op = _vm->_gyro->kMagicBounce; // Sloping wall.
+		_vm->_gyro->magics[2].op = _vm->_gyro->kMagicNothing; // Straight wall.
+		_vm->_gyro->portals[4].op = _vm->_gyro->kMagicSpecial; // Door.
 		_vm->_celer->drawBackgroundSprite(-1, -1, 28); // Wall, plus...
 		_vm->_celer->drawBackgroundSprite(-1, -1, 30); // ...door.
 		break;
 	case 0x3: // wall with door and shield
-		_vm->_gyro->magics[1].op = _vm->_gyro->bounces; // Sloping wall.
-		_vm->_gyro->magics[2].op = _vm->_gyro->nix; // Straight wall.
-		_vm->_gyro->portals[4].op = _vm->_gyro->special; // Door.
+		_vm->_gyro->magics[1].op = _vm->_gyro->kMagicBounce; // Sloping wall.
+		_vm->_gyro->magics[2].op = _vm->_gyro->kMagicNothing; // Straight wall.
+		_vm->_gyro->portals[4].op = _vm->_gyro->kMagicSpecial; // Door.
 		_vm->_celer->drawBackgroundSprite(-1, -1, 28); // Wall, plus...
 		_vm->_celer->drawBackgroundSprite(-1, -1, 30); // ...door, and...
 		_vm->_celer->drawBackgroundSprite(-1, -1, 29); // ...shield.
 		break;
 	case 0x4: // no connection (wall + window),
-		_vm->_gyro->magics[1].op = _vm->_gyro->bounces; // Sloping wall.
-		_vm->_gyro->magics[2].op = _vm->_gyro->nix; // Straight wall.
-		_vm->_gyro->portals[4].op = _vm->_gyro->nix; // Door.
+		_vm->_gyro->magics[1].op = _vm->_gyro->kMagicBounce; // Sloping wall.
+		_vm->_gyro->magics[2].op = _vm->_gyro->kMagicNothing; // Straight wall.
+		_vm->_gyro->portals[4].op = _vm->_gyro->kMagicNothing; // Door.
 		_vm->_celer->drawBackgroundSprite(-1, -1, 28); // Wall, plus...
 		_vm->_celer->drawBackgroundSprite(-1, -1, 5);  // ...window.
 		break;
 	case 0x5: // wall with door and window
-		_vm->_gyro->magics[1].op = _vm->_gyro->bounces; // Sloping wall.
-		_vm->_gyro->magics[2].op = _vm->_gyro->nix; // Straight wall.
-		_vm->_gyro->portals[4].op = _vm->_gyro->special; // Door.
+		_vm->_gyro->magics[1].op = _vm->_gyro->kMagicBounce; // Sloping wall.
+		_vm->_gyro->magics[2].op = _vm->_gyro->kMagicNothing; // Straight wall.
+		_vm->_gyro->portals[4].op = _vm->_gyro->kMagicSpecial; // Door.
 		_vm->_celer->drawBackgroundSprite(-1, -1, 28); // Wall, plus...
 		_vm->_celer->drawBackgroundSprite(-1, -1, 30); // ...door, and...
 		_vm->_celer->drawBackgroundSprite(-1, -1, 5); // ...window.
 		break;
 	case 0x6: // no connection (wall + torches),
-		_vm->_gyro->magics[1].op = _vm->_gyro->bounces; // Sloping wall.
-		_vm->_gyro->magics[2].op = _vm->_gyro->nix; // Straight wall.
-		_vm->_gyro->portals[4].op = _vm->_gyro->nix; // No door.
+		_vm->_gyro->magics[1].op = _vm->_gyro->kMagicBounce; // Sloping wall.
+		_vm->_gyro->magics[2].op = _vm->_gyro->kMagicNothing; // Straight wall.
+		_vm->_gyro->portals[4].op = _vm->_gyro->kMagicNothing; // No door.
 		_vm->_celer->drawBackgroundSprite(-1, -1, 28); // Wall, plus...
 		_vm->_celer->drawBackgroundSprite(-1, -1, 7); // ...torches.
 		break;
 	case 0x7: // wall with door and torches
-		_vm->_gyro->magics[1].op = _vm->_gyro->bounces; // Sloping wall.
-		_vm->_gyro->magics[2].op = _vm->_gyro->nix; // Straight wall.
-		_vm->_gyro->portals[4].op = _vm->_gyro->special; // Door.
+		_vm->_gyro->magics[1].op = _vm->_gyro->kMagicBounce; // Sloping wall.
+		_vm->_gyro->magics[2].op = _vm->_gyro->kMagicNothing; // Straight wall.
+		_vm->_gyro->portals[4].op = _vm->_gyro->kMagicSpecial; // Door.
 		_vm->_celer->drawBackgroundSprite(-1, -1, 28); // Wall, plus...
 		_vm->_celer->drawBackgroundSprite(-1, -1, 30); // ...door, and...
 		_vm->_celer->drawBackgroundSprite(-1, -1, 7); // ...torches.
 		break;
 	case 0xf: // straight-through corridor.
-		_vm->_gyro->magics[1].op = _vm->_gyro->nix; // Sloping wall.
-		_vm->_gyro->magics[2].op = _vm->_gyro->special; // Straight wall.
+		_vm->_gyro->magics[1].op = _vm->_gyro->kMagicNothing; // Sloping wall.
+		_vm->_gyro->magics[2].op = _vm->_gyro->kMagicSpecial; // Straight wall.
 		break;
 	}
 
@@ -637,52 +637,52 @@ void Trip::catamove(byte ped) {
 
 	switch ((here & 0xf0) >> 4) { // East
 	case 0: // no connection (wall)
-		_vm->_gyro->magics[4].op = _vm->_gyro->bounces; // Sloping wall.
-		_vm->_gyro->magics[5].op = _vm->_gyro->nix; // Straight wall.
-		_vm->_gyro->portals[6].op = _vm->_gyro->nix; // Door.
+		_vm->_gyro->magics[4].op = _vm->_gyro->kMagicBounce; // Sloping wall.
+		_vm->_gyro->magics[5].op = _vm->_gyro->kMagicNothing; // Straight wall.
+		_vm->_gyro->portals[6].op = _vm->_gyro->kMagicNothing; // Door.
 		_vm->_celer->drawBackgroundSprite(-1, -1, 19);
 		break;
 	case 0x1: // no connection (wall + window),
-		_vm->_gyro->magics[4].op = _vm->_gyro->bounces; // Sloping wall.
-		_vm->_gyro->magics[5].op = _vm->_gyro->nix; // Straight wall.
-		_vm->_gyro->portals[6].op = _vm->_gyro->nix; // Door.
+		_vm->_gyro->magics[4].op = _vm->_gyro->kMagicBounce; // Sloping wall.
+		_vm->_gyro->magics[5].op = _vm->_gyro->kMagicNothing; // Straight wall.
+		_vm->_gyro->portals[6].op = _vm->_gyro->kMagicNothing; // Door.
 		_vm->_celer->drawBackgroundSprite(-1, -1, 19); // Wall, plus...
 		_vm->_celer->drawBackgroundSprite(-1, -1, 20); // ...window.
 		break;
 	case 0x2: // wall with door
-		_vm->_gyro->magics[4].op = _vm->_gyro->bounces; // Sloping wall.
-		_vm->_gyro->magics[5].op = _vm->_gyro->nix; // Straight wall.
-		_vm->_gyro->portals[6].op = _vm->_gyro->special; // Door.
+		_vm->_gyro->magics[4].op = _vm->_gyro->kMagicBounce; // Sloping wall.
+		_vm->_gyro->magics[5].op = _vm->_gyro->kMagicNothing; // Straight wall.
+		_vm->_gyro->portals[6].op = _vm->_gyro->kMagicSpecial; // Door.
 		_vm->_celer->drawBackgroundSprite(-1, -1, 19); // Wall, plus...
 		_vm->_celer->drawBackgroundSprite(-1, -1, 21); // ...door.
 		break;
 	case 0x3: // wall with door and window
-		_vm->_gyro->magics[4].op = _vm->_gyro->bounces; // Sloping wall.
-		_vm->_gyro->magics[5].op = _vm->_gyro->nix; // Straight wall.
-		_vm->_gyro->portals[6].op = _vm->_gyro->special; // Door.
+		_vm->_gyro->magics[4].op = _vm->_gyro->kMagicBounce; // Sloping wall.
+		_vm->_gyro->magics[5].op = _vm->_gyro->kMagicNothing; // Straight wall.
+		_vm->_gyro->portals[6].op = _vm->_gyro->kMagicSpecial; // Door.
 		_vm->_celer->drawBackgroundSprite(-1, -1, 19); // Wall, plus...
 		_vm->_celer->drawBackgroundSprite(-1, -1, 20); // ...door, and...
 		_vm->_celer->drawBackgroundSprite(-1, -1, 21); // ...window.
 		break;
 	case 0x6: // no connection (wall + torches),
-		_vm->_gyro->magics[4].op = _vm->_gyro->bounces; // Sloping wall.
-		_vm->_gyro->magics[5].op = _vm->_gyro->nix; // Straight wall.
-		_vm->_gyro->portals[6].op = _vm->_gyro->nix; // No door.
+		_vm->_gyro->magics[4].op = _vm->_gyro->kMagicBounce; // Sloping wall.
+		_vm->_gyro->magics[5].op = _vm->_gyro->kMagicNothing; // Straight wall.
+		_vm->_gyro->portals[6].op = _vm->_gyro->kMagicNothing; // No door.
 		_vm->_celer->drawBackgroundSprite(-1, -1, 19); // Wall, plus...
 		_vm->_celer->drawBackgroundSprite(-1, -1, 18); // ...torches.
 		break;
 	case 0x7: // wall with door and torches
-		_vm->_gyro->magics[4].op = _vm->_gyro->bounces; // Sloping wall.
-		_vm->_gyro->magics[5].op = _vm->_gyro->nix; // Straight wall.
-		_vm->_gyro->portals[6].op = _vm->_gyro->special; // Door.
+		_vm->_gyro->magics[4].op = _vm->_gyro->kMagicBounce; // Sloping wall.
+		_vm->_gyro->magics[5].op = _vm->_gyro->kMagicNothing; // Straight wall.
+		_vm->_gyro->portals[6].op = _vm->_gyro->kMagicSpecial; // Door.
 		_vm->_celer->drawBackgroundSprite(-1, -1, 19); // Wall, plus...
 		_vm->_celer->drawBackgroundSprite(-1, -1, 21); // ...door, and...
 		_vm->_celer->drawBackgroundSprite(-1, -1, 18); // ...torches.
 		break;
 	case 0xf: // straight-through corridor.
-		_vm->_gyro->magics[4].op = _vm->_gyro->nix; // Sloping wall.
-		_vm->_gyro->magics[5].op = _vm->_gyro->special; // Straight wall.
-		_vm->_gyro->portals[6].op = _vm->_gyro->nix; // Door.
+		_vm->_gyro->magics[4].op = _vm->_gyro->kMagicNothing; // Sloping wall.
+		_vm->_gyro->magics[5].op = _vm->_gyro->kMagicSpecial; // Straight wall.
+		_vm->_gyro->portals[6].op = _vm->_gyro->kMagicNothing; // Door.
 		break;
 	}
 
@@ -690,39 +690,39 @@ void Trip::catamove(byte ped) {
 
 	switch ((here & 0xf00) >> 8) { // South
 	case 0: // No connection.
-		_vm->_gyro->magics[6].op = _vm->_gyro->bounces;
-		_vm->_gyro->magics[11].op = _vm->_gyro->bounces;
-		_vm->_gyro->magics[12].op = _vm->_gyro->bounces;
+		_vm->_gyro->magics[6].op = _vm->_gyro->kMagicBounce;
+		_vm->_gyro->magics[11].op = _vm->_gyro->kMagicBounce;
+		_vm->_gyro->magics[12].op = _vm->_gyro->kMagicBounce;
 		break;
 	case 0x1:
 		_vm->_celer->drawBackgroundSprite(-1, -1, 22);
 			
 		if ((xy_uint16 == 2051) && (_vm->_gyro->dna.geida_follows))
-			_vm->_gyro->magics[12].op = _vm->_gyro->exclaim;
+			_vm->_gyro->magics[12].op = _vm->_gyro->kMagicExclaim;
 		else
-			_vm->_gyro->magics[12].op = _vm->_gyro->special; // Right exit south.
+			_vm->_gyro->magics[12].op = _vm->_gyro->kMagicSpecial; // Right exit south.
 
-		_vm->_gyro->magics[6].op = _vm->_gyro->bounces;
-		_vm->_gyro->magics[11].op = _vm->_gyro->bounces;
+		_vm->_gyro->magics[6].op = _vm->_gyro->kMagicBounce;
+		_vm->_gyro->magics[11].op = _vm->_gyro->kMagicBounce;
 		break;
 	case 0x2:
 		_vm->_celer->drawBackgroundSprite(-1, -1, 23);
-		_vm->_gyro->magics[6].op = _vm->_gyro->special; // Middle exit south.
-		_vm->_gyro->magics[11].op = _vm->_gyro->bounces;
-		_vm->_gyro->magics[12].op = _vm->_gyro->bounces;
+		_vm->_gyro->magics[6].op = _vm->_gyro->kMagicSpecial; // Middle exit south.
+		_vm->_gyro->magics[11].op = _vm->_gyro->kMagicBounce;
+		_vm->_gyro->magics[12].op = _vm->_gyro->kMagicBounce;
 		break;
 	case 0x3:
 		_vm->_celer->drawBackgroundSprite(-1, -1, 24);
-		_vm->_gyro->magics[11].op = _vm->_gyro->special; // Left exit south.
-		_vm->_gyro->magics[6].op = _vm->_gyro->bounces;
-		_vm->_gyro->magics[12].op = _vm->_gyro->bounces;
+		_vm->_gyro->magics[11].op = _vm->_gyro->kMagicSpecial; // Left exit south.
+		_vm->_gyro->magics[6].op = _vm->_gyro->kMagicBounce;
+		_vm->_gyro->magics[12].op = _vm->_gyro->kMagicBounce;
 		break;
 	}
 
 	switch ((here & 0xf000) >> 12) { // North
 	case 0: // No connection
-		_vm->_gyro->magics[0].op = _vm->_gyro->bounces;
-		_vm->_gyro->portals[3].op = _vm->_gyro->nix; // Door.
+		_vm->_gyro->magics[0].op = _vm->_gyro->kMagicBounce;
+		_vm->_gyro->portals[3].op = _vm->_gyro->kMagicNothing; // Door.
 		break;
 	// LEFT handles: 
 #if 0
@@ -734,8 +734,8 @@ void Trip::catamove(byte ped) {
 #endif
 	case 0x2:
 		_vm->_celer->drawBackgroundSprite(-1, -1, 4);
-		_vm->_gyro->magics[0].op = _vm->_gyro->bounces; // Middle exit north.
-		_vm->_gyro->portals[3].op = _vm->_gyro->special; // Door.
+		_vm->_gyro->magics[0].op = _vm->_gyro->kMagicBounce; // Middle exit north.
+		_vm->_gyro->portals[3].op = _vm->_gyro->kMagicSpecial; // Door.
 		break;
 #if 0
 	case 0x3:
@@ -752,8 +752,8 @@ void Trip::catamove(byte ped) {
 #endif
 	case 0x5:
 		_vm->_celer->drawBackgroundSprite(-1, -1, 3);
-		_vm->_gyro->magics[0].op = _vm->_gyro->bounces; // Middle exit north.
-		_vm->_gyro->portals[3].op = _vm->_gyro->special; // Door.
+		_vm->_gyro->magics[0].op = _vm->_gyro->kMagicBounce; // Middle exit north.
+		_vm->_gyro->portals[3].op = _vm->_gyro->kMagicSpecial; // Door.
 		break;
 #if 0
 	case 0x6:
@@ -773,26 +773,26 @@ void Trip::catamove(byte ped) {
 		if (((here & 0xf000) >> 12) == 0x9)
 			_vm->_celer->drawBackgroundSprite(-1, -1, 32);
 
-		_vm->_gyro->magics[0].op = _vm->_gyro->special; // Middle arch north.
-		_vm->_gyro->portals[3].op = _vm->_gyro->nix; // Door.
+		_vm->_gyro->magics[0].op = _vm->_gyro->kMagicSpecial; // Middle arch north.
+		_vm->_gyro->portals[3].op = _vm->_gyro->kMagicNothing; // Door.
 	}
 	break;
 	// DECORATIONS:
 	case 0xd: // No connection + WINDOW
-		_vm->_gyro->magics[0].op = _vm->_gyro->bounces;
-		_vm->_gyro->portals[3].op = _vm->_gyro->nix; // Door.
+		_vm->_gyro->magics[0].op = _vm->_gyro->kMagicBounce;
+		_vm->_gyro->portals[3].op = _vm->_gyro->kMagicNothing; // Door.
 		_vm->_celer->drawBackgroundSprite(-1, -1, 14);
 		break;
 	case 0xe: // No connection + TORCH
-		_vm->_gyro->magics[0].op = _vm->_gyro->bounces;
-		_vm->_gyro->portals[3].op = _vm->_gyro->nix; // Door.
+		_vm->_gyro->magics[0].op = _vm->_gyro->kMagicBounce;
+		_vm->_gyro->portals[3].op = _vm->_gyro->kMagicNothing; // Door.
 		_vm->_celer->drawBackgroundSprite(-1, -1, 8);
 		break;
 	// Recessed door:
 	case 0xf:
-		_vm->_gyro->magics[0].op = _vm->_gyro->nix; // Door to Geida's room.
+		_vm->_gyro->magics[0].op = _vm->_gyro->kMagicNothing; // Door to Geida's room.
 		_vm->_celer->drawBackgroundSprite(-1, -1, 1);
-		_vm->_gyro->portals[3].op = _vm->_gyro->special; // Door.
+		_vm->_gyro->portals[3].op = _vm->_gyro->kMagicSpecial; // Door.
 		break;
 	}
 
@@ -849,17 +849,17 @@ void Trip::call_special(uint16 which) {
 	case 1: // _vm->_gyro->special 1: Room 22: top of stairs.
 		_vm->_celer->drawBackgroundSprite(-1, -1, 1);
 		_vm->_gyro->dna.brummie_stairs = 1;
-		_vm->_gyro->magics[9].op = _vm->_gyro->nix;
+		_vm->_gyro->magics[9].op = _vm->_gyro->kMagicNothing;
 		_vm->_timeout->set_up_timer(10, _vm->_timeout->procstairs, _vm->_timeout->reason_brummiestairs);
 		stopwalking();
 		_vm->_gyro->dna.user_moves_avvy = false;
 		break;
 	case 2: // _vm->_gyro->special 2: Room 22: bottom of stairs.
 		_vm->_gyro->dna.brummie_stairs = 3;
-		_vm->_gyro->magics[10].op = _vm->_gyro->nix;
-		_vm->_gyro->magics[11].op = _vm->_gyro->exclaim;
+		_vm->_gyro->magics[10].op = _vm->_gyro->kMagicNothing;
+		_vm->_gyro->magics[11].op = _vm->_gyro->kMagicExclaim;
 		_vm->_gyro->magics[11].data = 5;
-		_vm->_gyro->magics[3].op = _vm->_gyro->bounces; // Now works as planned!
+		_vm->_gyro->magics[3].op = _vm->_gyro->kMagicBounce; // Now works as planned!
 		stopwalking();
 		_vm->_visa->dixi('q', 26);
 		_vm->_gyro->dna.user_moves_avvy = true;
@@ -890,7 +890,7 @@ void Trip::call_special(uint16 which) {
 	case 5:
 		if (_vm->_gyro->dna.friar_will_tie_you_up) {
 			// _vm->_gyro->special 5: Room 42: touched tree, and get tied up.
-			_vm->_gyro->magics[4].op = _vm->_gyro->bounces; // Boundary effect is now working again.
+			_vm->_gyro->magics[4].op = _vm->_gyro->kMagicBounce; // Boundary effect is now working again.
 			_vm->_visa->dixi('q', 35);
 			tr[0].done();
 			//tr[1].vanishifstill:=true;
@@ -901,7 +901,7 @@ void Trip::call_special(uint16 which) {
 			tr[1].walkto(3);
 			tr[1].vanishifstill = true;
 			tr[1].check_me = true; // One of them must have Check_Me switched on.
-			_vm->_gyro->whereis[_vm->_gyro->pfriartuck - 150] = 177; // Not here, then.
+			_vm->_gyro->_whereIs[_vm->_gyro->pfriartuck - 150] = 177; // Not here, then.
 			_vm->_timeout->set_up_timer(364, _vm->_timeout->prochang_around, _vm->_timeout->reason_hanging_around);
 		}
 		break;
@@ -914,7 +914,7 @@ void Trip::call_special(uint16 which) {
 		break;
 	case 7: // _vm->_gyro->special 7: stop falling down oubliette.
 		tr[0].visible = false;
-		_vm->_gyro->magics[9].op = _vm->_gyro->nix;
+		_vm->_gyro->magics[9].op = _vm->_gyro->kMagicNothing;
 		stopwalking();
 		_vm->_timeout->lose_timer(_vm->_timeout->reason_falling_down_oubliette);
 		//_vm->_lucerna->mblit(12, 80, 38, 160, 3, 0);
@@ -956,7 +956,7 @@ void Trip::call_special(uint16 which) {
 		if (_vm->_gyro->dna.room != r__catacombs)
 			return;
 		_vm->_lucerna->delavvy();
-		switch ((_vm->_gyro->catamap[_vm->_gyro->dna.cat_y - 1][_vm->_gyro->dna.cat_x - 1] & 0xf00) >> 8) {
+		switch ((_vm->_gyro->kCatacombMap[_vm->_gyro->dna.cat_y - 1][_vm->_gyro->dna.cat_x - 1] & 0xf00) >> 8) {
 		case 0x1:
 			apped(1, 12);
 			break;
@@ -1073,12 +1073,12 @@ void Trip::newspeed() {
 
 	//setactivepage(3);
 
-	if (tr[0].xs == _vm->_gyro->run)
+	if (tr[0].xs == _vm->_gyro->kRun)
 		_vm->_graphics->_surface.drawLine(371, 199, 373, 199, kColorYellow);
 	else
 		_vm->_graphics->_surface.drawLine(336, 199, 338, 199, kColorYellow);
 
-	if (tr[0].xs == _vm->_gyro->run)
+	if (tr[0].xs == _vm->_gyro->kRun)
 		_vm->_graphics->_surface.drawLine(336, 199, 338, 199, kColorLightblue);
 	else
 		_vm->_graphics->_surface.drawLine(371, 199, 373, 199, kColorLightblue);
-- 
cgit v1.2.3