AVALANCHE: More renaming in Gyro.

6 files changed, 20 insertions, 20 deletions

diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp
index 06ac30e449..100f468de9 100644
--- a/engines/avalanche/avalanche.cpp
+++ b/engines/avalanche/avalanche.cpp
@@ -464,7 +464,7 @@ bool AvalancheEngine::loadGame(const int16 slot) {
 
 	_dropdown->setupMenu();
 
-	_gyro->whereis[0] = _gyro->dna.room;
+	_gyro->_whereIs[0] = _gyro->dna.room;
 	
 	_gyro->alive = true;
 
diff --git a/engines/avalanche/celer2.cpp b/engines/avalanche/celer2.cpp
index 05065d5c65..c9ad3cf809 100644
--- a/engines/avalanche/celer2.cpp
+++ b/engines/avalanche/celer2.cpp
@@ -254,7 +254,7 @@ void Celer::updateBackgroundSprites() {
 			if (_vm->_gyro->dna.nextbell < 5)
 				_vm->_gyro->dna.nextbell = 12;
 			_vm->_gyro->dna.nextbell--;
-			_vm->_gyro->note(_vm->_gyro->notes[_vm->_gyro->dna.nextbell]);
+			_vm->_gyro->note(_vm->_gyro->kNotes[_vm->_gyro->dna.nextbell]);
 			break;
 		case 2:
 			//nosound();
diff --git a/engines/avalanche/enid2.cpp b/engines/avalanche/enid2.cpp
index ef5a90d46f..56420180aa 100644
--- a/engines/avalanche/enid2.cpp
+++ b/engines/avalanche/enid2.cpp
@@ -277,7 +277,7 @@ void Enid::ednaReload() {
 
 	_vm->_lucerna->major_redraw();
 
-	_vm->_gyro->whereis[_vm->_gyro->pavalot - 150] = _vm->_gyro->dna.room;
+	_vm->_gyro->_whereIs[_vm->_gyro->pavalot - 150] = _vm->_gyro->dna.room;
 
 	_vm->_gyro->alive = true;
 
diff --git a/engines/avalanche/scrolls2.cpp b/engines/avalanche/scrolls2.cpp
index 147bc21fe7..350e9f7bfe 100644
--- a/engines/avalanche/scrolls2.cpp
+++ b/engines/avalanche/scrolls2.cpp
@@ -199,18 +199,18 @@ void Scrolls::dialogue() {
 
 
 
-void Scrolls::store_(byte what, tunetype &played) {
+void Scrolls::store_(byte what, TuneType &played) {
 	memcpy(played + 1, played + 2, sizeof(played) - 1);
 	played[30] = what;
 }
 
-bool Scrolls::they_match(tunetype &played) {
+bool Scrolls::they_match(TuneType &played) {
 	byte fv, mistakes;
 
 	mistakes = 0;
 
 	for (fv = 1; fv <= sizeof(played); fv++) {
-		if (played[fv] != _vm->_gyro->tune[fv]) {
+		if (played[fv] != _vm->_gyro->kTune[fv]) {
 			mistakes += 1;
 		}
 	}
@@ -253,7 +253,7 @@ void Scrolls::resetscrolldriver() {   // phew
 	_vm->_gyro->scrollbells = 0;
 	cfont = roman;
 	use_icon = 0;
-	_vm->_gyro->interrogation = 0; // always reset after a scroll comes up.
+	_vm->_gyro->_interrogation = 0; // always reset after a scroll comes up.
 }
 
 void Scrolls::dingdongbell() {   // Pussy's in the well. Who put her in? Little...
@@ -331,7 +331,7 @@ void Scrolls::drawscroll(func2 gotoit) { // This is one of the oldest procs in t
 
 	//setvisualpage(cp);
 	//setactivepage(1 - cp);
-	_vm->_gyro->oncandopageswap = false;  // On can now no longer swap pages. So we can do what we want without its interference!
+	_vm->_gyro->_onCanDoPageSwap = false;  // On can now no longer swap pages. So we can do what we want without its interference!
 
 	lx = 0;
 	ly = (_vm->_gyro->scrolln) * 6;
@@ -457,7 +457,7 @@ void Scrolls::drawscroll(func2 gotoit) { // This is one of the oldest procs in t
 	// mblit(ex-46,ey-6,ex+lx*2+15,ey+ly*2+6,3,0);
 	//mblit((ex - 46) / 8, ey - 6, 1 + (ex + lx * 2 + 15) / 8, ey + ly * 2 + 6, cp, 1 - cp);
 	//blitfix();
-	_vm->_gyro->oncandopageswap = true; // Normality again.
+	_vm->_gyro->_onCanDoPageSwap = true; // Normality again.
 	CursorMan.showMouse(true);
 	//settextjustify(0, 0); // sink
 	resetscrolldriver();
@@ -475,7 +475,7 @@ void Scrolls::bubble(func2 gotoit) {
 
 	//setvisualpage(cp);
 	//setactivepage(1 - cp);
-	_vm->_gyro->oncandopageswap = false;  // On can now no longer swap pages. So we can do what we want without its interference!
+	_vm->_gyro->_onCanDoPageSwap = false;  // On can now no longer swap pages. So we can do what we want without its interference!
 	//mousepage(1 - cp); // Mousepage
 
 	CursorMan.showMouse(false);
@@ -539,7 +539,7 @@ void Scrolls::bubble(func2 gotoit) {
 
 	//setvisualpage(1 - cp);
 	dingdongbell();
-	_vm->_gyro->oncandopageswap = false;
+	_vm->_gyro->_onCanDoPageSwap = false;
 	CursorMan.showMouse(true);
 	_vm->_gyro->dropsok = false;
 
@@ -551,7 +551,7 @@ void Scrolls::bubble(func2 gotoit) {
 
 	//setvisualpage(cp);
 	CursorMan.showMouse(true); // sink;
-	_vm->_gyro->oncandopageswap = true;
+	_vm->_gyro->_onCanDoPageSwap = true;
 	resetscrolldriver();
 	if (_vm->_gyro->mpress > 0)
 		_vm->_gyro->after_the_scroll = true;
@@ -700,11 +700,11 @@ void Scrolls::calldrivers() {
 					// Quasi-peds. (This routine performs the same
 					// thing with QPs as triptype.chatter does with the
 					// sprites.)
-					_vm->_gyro->talkx = _vm->_gyro->peds[_vm->_gyro->quasipeds[param - 10].whichped - 1].x;
-					_vm->_gyro->talky = _vm->_gyro->peds[_vm->_gyro->quasipeds[param - 10].whichped - 1].y; // Position.
+					_vm->_gyro->talkx = _vm->_gyro->peds[_vm->_gyro->kQuasipeds[param - 10].whichped - 1].x;
+					_vm->_gyro->talky = _vm->_gyro->peds[_vm->_gyro->kQuasipeds[param - 10].whichped - 1].y; // Position.
 		
-					_vm->_gyro->talkf = _vm->_gyro->quasipeds[param - 10].fgc;
-					_vm->_gyro->talkb = _vm->_gyro->quasipeds[param - 10].bgc; // Colors.
+					_vm->_gyro->talkf = _vm->_gyro->kQuasipeds[param - 10].fgc;
+					_vm->_gyro->talkb = _vm->_gyro->kQuasipeds[param - 10].bgc; // Colors.
 				} else {
 					_vm->_lucerna->errorled(); // Not valid.
 					natural();
diff --git a/engines/avalanche/scrolls2.h b/engines/avalanche/scrolls2.h
index 0238d33b16..362000b153 100644
--- a/engines/avalanche/scrolls2.h
+++ b/engines/avalanche/scrolls2.h
@@ -123,9 +123,9 @@ private:
 
 	void dialogue();
 
-	void store_(byte what, tunetype &played);
+	void store_(byte what, TuneType &played);
 
-	bool they_match(tunetype &played);
+	bool they_match(TuneType &played);
 
 	void music_scroll();
 
diff --git a/engines/avalanche/visa2.cpp b/engines/avalanche/visa2.cpp
index 1de48fd388..fe31cc28da 100644
--- a/engines/avalanche/visa2.cpp
+++ b/engines/avalanche/visa2.cpp
@@ -185,7 +185,7 @@ void Visa::talkto(byte whom) {
 					switch (_vm->_gyro->dna.given2spludwick) { 
 					case 1: // Falltrough is intended.
 					case 2:{
-						_vm->_scrolls->display(Common::String("Can you get me ") + _vm->_gyro->get_better(_vm->_gyro->spludwick_order[_vm->_gyro->dna.given2spludwick]) + ", please?" + _vm->_scrolls->kControlRegister + '2' + _vm->_scrolls->kControlSpeechBubble);
+						_vm->_scrolls->display(Common::String("Can you get me ") + _vm->_gyro->get_better(_vm->_gyro->kSpludwicksOrder[_vm->_gyro->dna.given2spludwick]) + ", please?" + _vm->_scrolls->kControlRegister + '2' + _vm->_scrolls->kControlSpeechBubble);
 						return;
 						}
 						break;
@@ -281,7 +281,7 @@ void Visa::talkto(byte whom) {
 		dixi('q', 1); // Circular from Cardiff.
 		_vm->_gyro->dna.talked_to_crapulus = true;
 
-		_vm->_gyro->whereis[_vm->_gyro->pcrapulus - 150] = 177; // Crapulus walks off.
+		_vm->_gyro->_whereIs[_vm->_gyro->pcrapulus - 150] = 177; // Crapulus walks off.
 
 		_vm->_trip->tr[1].vanishifstill = true;
 		_vm->_trip->tr[1].walkto(3); // Walks away.