TSAGE: Minor renaming for R2R

Rename the R2R character indexes to the corresponding character enum
(i.e. R2_NONE, R2_QUINN, R2_SEEKER, R2_MIRANDA)

7 files changed, 145 insertions, 145 deletions

diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index 0964db5497..9bd7249902 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -503,7 +503,7 @@ void Ringworld2Globals::reset() {
 	_player._characterIndex = R2_QUINN;
 	_player._characterScene[R2_QUINN] = 100;
 	_player._characterScene[R2_SEEKER] = 300;
-	_player._characterScene[3] = 300;
+	_player._characterScene[R2_MIRANDA] = 300;
 }
 
 void Ringworld2Globals::synchronize(Serializer &s) {
diff --git a/engines/tsage/ringworld2/ringworld2_dialogs.cpp b/engines/tsage/ringworld2/ringworld2_dialogs.cpp
index 663697d94d..057d91a46e 100644
--- a/engines/tsage/ringworld2/ringworld2_dialogs.cpp
+++ b/engines/tsage/ringworld2/ringworld2_dialogs.cpp
@@ -235,7 +235,7 @@ void CharacterDialog::show() {
 		scene->saveCharacter(oldCharacter);
 
 		// Play the correctfrequency, if any, of the character being switched to's scanner device 
-		if (R2_GLOBALS._player._characterScene[0] != 300) {
+		if (R2_GLOBALS._player._characterScene[R2_NONE] != 300) {
 			switch (R2_GLOBALS._scannerFrequencies[R2_GLOBALS._player._characterIndex] - 1) {
 			case 0:
 				R2_GLOBALS._sound4.stop();
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index de6e0aaf38..4eefa11de9 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -2805,12 +2805,12 @@ void Scene300::Action1::signal() {
 
 	switch (_actionIndex) {
 	case 0:
-		setAction(&scene->_sequenceManager2, this, 311, (R2_GLOBALS._player._characterIndex == 1) ?
+		setAction(&scene->_sequenceManager2, this, 311, (R2_GLOBALS._player._characterIndex == R2_QUINN) ?
 			(SceneObject *)&R2_GLOBALS._player : (SceneObject *)&scene->_quinn);
 		_actionIndex = 2;
 		break;
 	case 1:
-		setAction(&scene->_sequenceManager2, this, 312, (R2_GLOBALS._player._characterIndex == 1) ?
+		setAction(&scene->_sequenceManager2, this, 312, (R2_GLOBALS._player._characterIndex == R2_QUINN) ?
 			(SceneObject *)&R2_GLOBALS._player : (SceneObject *)&scene->_quinn);
 		_actionIndex = 0;
 		break;
@@ -2904,7 +2904,7 @@ bool Scene300::QuinnWorkstation::startAction(CursorType action, Event &event) {
 		return true;
 
 	case CURSOR_LOOK:
-		if (R2_GLOBALS._player._characterIndex == 1) {
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
 			SceneItem::display2(300, 47);
 			return true;
 		}
@@ -2927,7 +2927,7 @@ bool Scene300::MirandaWorkstation::startAction(CursorType action, Event &event)
 		return true;
 
 	case CURSOR_LOOK:
-		if (R2_GLOBALS._player._characterIndex == 3) {
+		if (R2_GLOBALS._player._characterIndex == R2_MIRANDA) {
 			SceneItem::display2(300, 47);
 			return true;
 		}
@@ -2943,7 +2943,7 @@ bool Scene300::MirandaWorkstation::startAction(CursorType action, Event &event)
 bool Scene300::SeekerWorkstation::startAction(CursorType action, Event &event) {
 	switch (action) {
 	case CURSOR_LOOK:
-		if (R2_GLOBALS._player._characterIndex == 2) {
+		if (R2_GLOBALS._player._characterIndex == R2_SEEKER) {
 			SceneItem::display2(300, 47);
 			return true;
 		}
@@ -3452,8 +3452,8 @@ void Scene300::postInit(SceneObjectList *OwnerList) {
 
 	case 3:
 		if (R2_GLOBALS._sceneManager._previousScene == 1500) {
-			R2_GLOBALS._player._oldCharacterScene[3] = 3150;
-			R2_GLOBALS._player._characterScene[3] = 3150;
+			R2_GLOBALS._player._oldCharacterScene[R2_MIRANDA] = 3150;
+			R2_GLOBALS._player._characterScene[R2_MIRANDA] = 3150;
 			R2_GLOBALS._player._effect = 0;
 			R2_GLOBALS._player.setAction(NULL);
 			R2_GLOBALS._player.disableControl();
@@ -4281,7 +4281,7 @@ void Scene325::consoleAction(int id) {
 		break;
 
 	case 11:
-		if (R2_GLOBALS.getFlag(57) && (R2_GLOBALS._player._characterIndex == 1) && !R2_GLOBALS.getFlag(25)) {
+		if (R2_GLOBALS.getFlag(57) && (R2_GLOBALS._player._characterIndex == R2_QUINN) && !R2_GLOBALS.getFlag(25)) {
 			R2_GLOBALS._player.disableControl();
 			R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 			_sceneMode = 13;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 8f1905eeac..29bef2ccb2 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -1520,7 +1520,7 @@ void Scene1200::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._player.setup(3156, 1, 6);
 	R2_GLOBALS._player.setPosition(Common::Point(160, 70));
 	R2_GLOBALS._player._numFrames = 10;
-	R2_GLOBALS._player._oldCharacterScene[3] = 1200;
+	R2_GLOBALS._player._oldCharacterScene[R2_MIRANDA] = 1200;
 
 	_actor1.postInit();
 	_actor1.hide();
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index 01c5ae3fd6..a8e534d5cb 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -51,77 +51,77 @@ void Scene2000::initPlayer() {
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 1:
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			_sceneMode = 2001;
 		else
 			_sceneMode = 2021;
 		setAction(&_sequenceManager, this, _sceneMode, &R2_GLOBALS._player, NULL);
 		break;
 	case 2:
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			_sceneMode = 2002;
 		else
 			_sceneMode = 2022;
 		setAction(&_sequenceManager, this, _sceneMode, &R2_GLOBALS._player, NULL);
 		break;
 	case 3:
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			_sceneMode = 2000;
 		else
 			_sceneMode = 2020;
 		setAction(&_sequenceManager, this, _sceneMode, &R2_GLOBALS._player, NULL);
 		break;
 	case 4:
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			_sceneMode = 2005;
 		else
 			_sceneMode = 2025;
 		setAction(&_sequenceManager, this, _sceneMode, &R2_GLOBALS._player, NULL);
 		break;
 	case 5:
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			_sceneMode = 2004;
 		else
 			_sceneMode = 2024;
 		setAction(&_sequenceManager, this, _sceneMode, &R2_GLOBALS._player, NULL);
 		break;
 	case 6:
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			_sceneMode = 2009;
 		else
 			_sceneMode = 2029;
 		setAction(&_sequenceManager, this, _sceneMode, &R2_GLOBALS._player, NULL);
 		break;
 	case 7:
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			_sceneMode = 2008;
 		else
 			_sceneMode = 2028;
 		setAction(&_sequenceManager, this, _sceneMode, &R2_GLOBALS._player, NULL);
 		break;
 	case 8:
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			_sceneMode = 2013;
 		else
 			_sceneMode = 2033;
 		setAction(&_sequenceManager, this, _sceneMode, &R2_GLOBALS._player, NULL);
 		break;
 	case 9:
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			_sceneMode = 2012;
 		else
 			_sceneMode = 2032;
 		setAction(&_sequenceManager, this, _sceneMode, &R2_GLOBALS._player, NULL);
 		break;
 	case 10:
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			_sceneMode = 2016;
 		else
 			_sceneMode = 2036;
 		setAction(&_sequenceManager, this, _sceneMode, &R2_GLOBALS._player, NULL);
 		break;
 	case 11:
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			_sceneMode = 2038;
 		else
 			_sceneMode = 2040;
@@ -137,7 +137,7 @@ void Scene2000::initPlayer() {
 
 	if ((R2_GLOBALS._player._characterScene[R2_QUINN] == R2_GLOBALS._player._characterScene[R2_SEEKER]) && (R2_GLOBALS._spillLocation[R2_QUINN] == R2_GLOBALS._spillLocation[R2_SEEKER])) {
 		_object1.postInit();
-		if (R2_GLOBALS._player._characterIndex == 1) {
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
 			_object1.setup(20, 5, 1);
 			_object1.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL);
 		} else {
@@ -601,25 +601,25 @@ void Scene2000::SouthExit::changeScene() {
 
 	switch (scene->_mazePlayerMode) {
 	case 4:
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			scene->setAction(&scene->_sequenceManager, scene, 2003, &R2_GLOBALS._player, NULL);
 		else
 			scene->setAction(&scene->_sequenceManager, scene, 2023, &R2_GLOBALS._player, NULL);
 		break;
 	case 6:
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			scene->setAction(&scene->_sequenceManager, scene, 2007, &R2_GLOBALS._player, NULL);
 		else
 			scene->setAction(&scene->_sequenceManager, scene, 2027, &R2_GLOBALS._player, NULL);
 		break;
 	case 8:
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			scene->setAction(&scene->_sequenceManager, scene, 2011, &R2_GLOBALS._player, NULL);
 		else
 			scene->setAction(&scene->_sequenceManager, scene, 2031, &R2_GLOBALS._player, NULL);
 		break;
 	case 11:
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			scene->_sceneMode = 2039;
 		else
 			scene->_sceneMode = 2041;
@@ -666,19 +666,19 @@ void Scene2000::NorthExit::changeScene() {
 
 	switch (scene->_mazePlayerMode) {
 	case 5:
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			scene->setAction(&scene->_sequenceManager, scene, 2006, &R2_GLOBALS._player, NULL);
 		else
 			scene->setAction(&scene->_sequenceManager, scene, 2026, &R2_GLOBALS._player, NULL);
 		break;
 	case 7:
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			scene->setAction(&scene->_sequenceManager, scene, 2010, &R2_GLOBALS._player, NULL);
 		else
 			scene->setAction(&scene->_sequenceManager, scene, 2030, &R2_GLOBALS._player, NULL);
 		break;
 	case 9:
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			scene->setAction(&scene->_sequenceManager, scene, 2014, &R2_GLOBALS._player, NULL);
 		else
 			scene->setAction(&scene->_sequenceManager, scene, 2034, &R2_GLOBALS._player, NULL);
@@ -698,56 +698,56 @@ void Scene2000::DoorExit::changeScene() {
 	switch (R2_GLOBALS._spillLocation[R2_GLOBALS._player._characterIndex]) {
 	case 3:
 		scene->_mazePlayerMode = 1;
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			scene->setAction(&scene->_sequenceManager, scene, 2015, &R2_GLOBALS._player, NULL);
 		else
 			scene->setAction(&scene->_sequenceManager, scene, 2035, &R2_GLOBALS._player, NULL);
 		break;
 	case 4:
 		scene->_mazePlayerMode = 7;
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			scene->setAction(&scene->_sequenceManager, scene, 2017, &R2_GLOBALS._player, NULL);
 		else
 			scene->setAction(&scene->_sequenceManager, scene, 2037, &R2_GLOBALS._player, NULL);
 		break;
 	case 10:
 		scene->_mazePlayerMode = 8;
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			scene->setAction(&scene->_sequenceManager, scene, 2015, &R2_GLOBALS._player, NULL);
 		else
 			scene->setAction(&scene->_sequenceManager, scene, 2035, &R2_GLOBALS._player, NULL);
 		break;
 	case 12:
 		scene->_mazePlayerMode = 3;
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			scene->setAction(&scene->_sequenceManager, scene, 2017, &R2_GLOBALS._player, NULL);
 		else
 			scene->setAction(&scene->_sequenceManager, scene, 2037, &R2_GLOBALS._player, NULL);
 		break;
 	case 16:
 		scene->_mazePlayerMode = 4;
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			scene->setAction(&scene->_sequenceManager, scene, 2015, &R2_GLOBALS._player, NULL);
 		else
 			scene->setAction(&scene->_sequenceManager, scene, 2035, &R2_GLOBALS._player, NULL);
 		break;
 	case 21:
 		scene->_mazePlayerMode = 5;
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			scene->setAction(&scene->_sequenceManager, scene, 2015, &R2_GLOBALS._player, NULL);
 		else
 			scene->setAction(&scene->_sequenceManager, scene, 2035, &R2_GLOBALS._player, NULL);
 		break;
 	case 25:
 		scene->_mazePlayerMode = 2;
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			scene->setAction(&scene->_sequenceManager, scene, 2017, &R2_GLOBALS._player, NULL);
 		else
 			scene->setAction(&scene->_sequenceManager, scene, 2037, &R2_GLOBALS._player, NULL);
 		break;
 	case 34:
 		scene->_mazePlayerMode = 6;
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			scene->setAction(&scene->_sequenceManager, scene, 2017, &R2_GLOBALS._player, NULL);
 		else
 			scene->setAction(&scene->_sequenceManager, scene, 2037, &R2_GLOBALS._player, NULL);
@@ -791,7 +791,7 @@ void Scene2000::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._player.postInit();
 	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
 
-	if (R2_GLOBALS._player._characterIndex == 1) {
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
 		R2_GLOBALS._player.setup(2008, 3, 1);
 		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
 	} else {
@@ -1063,7 +1063,7 @@ void Scene2350::ExitUp::changeScene() {
 
 	R2_GLOBALS._player.disableControl(CURSOR_CROSSHAIRS);
 	scene->_sceneMode = 12;
-	if (R2_GLOBALS._player._characterIndex == 1)
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 		scene->setAction(&scene->_sequenceManager, scene, 2350, &R2_GLOBALS._player, NULL);
 	else
 		scene->setAction(&scene->_sequenceManager, scene, 2352, &R2_GLOBALS._player, NULL);
@@ -1099,7 +1099,7 @@ void Scene2350::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._player.postInit();
 	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
 
-	if (R2_GLOBALS._player._characterIndex == 1) {
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
 		R2_GLOBALS._player.setup(2008, 3, 1);
 		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
 	} else {
@@ -1109,7 +1109,7 @@ void Scene2350::postInit(SceneObjectList *OwnerList) {
 
 	if (R2_GLOBALS._player._characterScene[R2_QUINN] == R2_GLOBALS._player._characterScene[R2_SEEKER]) {
 		_actor2.postInit();
-		if (R2_GLOBALS._player._characterIndex == 1) {
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
 			_actor2.setup(20, 5, 1);
 			_actor2.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL);
 		} else {
@@ -1139,7 +1139,7 @@ void Scene2350::postInit(SceneObjectList *OwnerList) {
 
 	if (R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] == 2000) {
 		if (R2_GLOBALS._spillLocation[R2_GLOBALS._player._characterIndex] == 34) {
-			if (R2_GLOBALS._player._characterIndex == 1)
+			if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 				_sceneMode = 2351;
 			else
 				_sceneMode = 2353;
@@ -1392,7 +1392,7 @@ void Scene2425::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._player.postInit();
 	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
 
-	if (R2_GLOBALS._player._characterIndex == 1) {
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
 		R2_GLOBALS._player.setVisage(2008);
 		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
 	} else {
@@ -1402,7 +1402,7 @@ void Scene2425::postInit(SceneObjectList *OwnerList) {
 
 	if (R2_GLOBALS._player._characterScene[R2_QUINN] == R2_GLOBALS._player._characterScene[R2_SEEKER]) {
 		_pictographs1.postInit();
-		if (R2_GLOBALS._player._characterIndex == 1) {
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
 			_pictographs1.setup(20, 5, 1);
 			_pictographs1.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL);
 		} else {
@@ -1556,7 +1556,7 @@ void Scene2430::postInit(SceneObjectList *OwnerList) {
 
 	R2_GLOBALS._player.postInit();
 	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
-	if (R2_GLOBALS._player._characterIndex == 1) {
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
 		R2_GLOBALS._player.setVisage(2008);
 		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
 	} else {
@@ -1567,7 +1567,7 @@ void Scene2430::postInit(SceneObjectList *OwnerList) {
 
 	if (R2_GLOBALS._player._characterScene[R2_QUINN] == R2_GLOBALS._player._characterScene[R2_SEEKER]) {
 		_actor1.postInit();
-		if (R2_GLOBALS._player._characterIndex == 1) {
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
 			_actor1.setup(20, 5, 1);
 			_actor1.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL);
 		} else {
@@ -1657,7 +1657,7 @@ bool Scene2435::Astor::startAction(CursorType action, Event &event) {
 		R2_GLOBALS._player.disableControl();
 		scene->_sceneMode = 20;
 		R2_GLOBALS._events.setCursor(CURSOR_ARROW);
-		if ((R2_GLOBALS._player._characterIndex == 1) || (R2_GLOBALS.getFlag(82))) {
+		if ((R2_GLOBALS._player._characterIndex == R2_QUINN) || (R2_GLOBALS.getFlag(82))) {
 			scene->_stripManager.start(605, scene);
 			return true;
 		} else if (R2_INVENTORY.getObjectScene(R2_ANCIENT_SCROLLS) == 2) {
@@ -1771,7 +1771,7 @@ void Scene2435::signal() {
 		_sceneMode = 2436;
 		R2_GLOBALS._player.setStrip(7);
 		_companion.postInit();
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			_companion.setVisage(20);
 		else
 			_companion.setVisage(2008);
@@ -1839,7 +1839,7 @@ void Scene2440::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._player.enableControl();
 	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
 
-	if (R2_GLOBALS._player._characterIndex == 1) {
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
 		R2_GLOBALS._player.setVisage(2008);
 		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
 	} else {
@@ -1849,7 +1849,7 @@ void Scene2440::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._player.setPosition(Common::Point(210, 200));
 	if (R2_GLOBALS._player._characterScene[R2_QUINN] == R2_GLOBALS._player._characterScene[R2_SEEKER]) {
 		_actor1.postInit();
-		if (R2_GLOBALS._player._characterIndex == 1) {
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
 			_actor1.setup(20, 5, 1);
 			_actor1.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL);
 		} else {
@@ -1927,7 +1927,7 @@ void Scene2445::signal() {
 bool Scene2450::Parker::startAction(CursorType action, Event &event) {
 	Scene2450 *scene = (Scene2450 *)R2_GLOBALS._sceneManager._scene;
 
-	if ((action == CURSOR_USE) && (R2_GLOBALS._player._characterIndex == 1)) {
+	if ((action == CURSOR_USE) && (R2_GLOBALS._player._characterIndex == R2_QUINN)) {
 		R2_GLOBALS._player.disableControl();
 		scene->_sceneMode = 2452;
 		scene->setAction(&scene->_sequenceManager, scene, 2452, &R2_GLOBALS._player, &scene->_parker, NULL);
@@ -1945,7 +1945,7 @@ bool Scene2450::CareTaker::startAction(CursorType action, Event &event) {
 			++R2_GLOBALS._v565AE;
 			scene->_sceneMode = 20;
 			R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
-			if (R2_GLOBALS._player._characterIndex == 1)
+			if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 				scene->_stripManager.start(699 + (R2_GLOBALS._v565AE * 2), scene);
 			else
 				scene->_stripManager.start(700 + (R2_GLOBALS._v565AE * 2), scene);
@@ -2017,7 +2017,7 @@ void Scene2450::postInit(SceneObjectList *OwnerList) {
 		break;
 	case 2000:
 		_sceneMode = 2451;
-		if (R2_GLOBALS._player._characterIndex == 1) {
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
 			if (R2_GLOBALS._player._characterScene[R2_SEEKER] == 2450) {
 				_companion.postInit();
 				_companion.setup(20, 6, 1);
@@ -2041,7 +2041,7 @@ void Scene2450::postInit(SceneObjectList *OwnerList) {
 		}
 		break;
 	case 2450:
-		if (R2_GLOBALS._player._characterIndex == 1) {
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
 			R2_GLOBALS._player.postInit();
 			if (R2_GLOBALS.getFlag(61)) {
 				R2_GLOBALS._player.setup(2008, 6, 1);
@@ -2111,7 +2111,7 @@ void Scene2450::postInit(SceneObjectList *OwnerList) {
 		break;
 	default:
 		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
-		if (R2_GLOBALS._player._characterIndex == 1) {
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
 			if (R2_GLOBALS.getFlag(61)) {
 				R2_GLOBALS._player.setup(2008, 3, 1);
 			} else {
@@ -2429,7 +2429,7 @@ void Scene2500::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._player.postInit();
 	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
 
-	if (R2_GLOBALS._player._characterIndex == 1) {
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
 		R2_GLOBALS._player.setVisage(11);
 		R2_GLOBALS._player._moveDiff = Common::Point(2, 1);
 	} else {
@@ -2439,7 +2439,7 @@ void Scene2500::postInit(SceneObjectList *OwnerList) {
 
 	if (R2_GLOBALS._player._characterScene[R2_QUINN] == R2_GLOBALS._player._characterScene[R2_SEEKER]) {
 		_actor1.postInit();
-		if (R2_GLOBALS._player._characterIndex == 1) {
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
 			_actor1.setup(21, 3, 1);
 			_actor1.setDetails(9002, 1, -1, -1, 1, (SceneItem *)NULL);
 		} else {
@@ -2568,7 +2568,7 @@ void Scene2525::postInit(SceneObjectList *OwnerList) {
 
 	R2_GLOBALS._player.postInit();
 	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
-	if (R2_GLOBALS._player._characterIndex == 1) {
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
 		R2_GLOBALS._player.setup(2008, 3, 1);
 		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
 	} else {
@@ -2578,7 +2578,7 @@ void Scene2525::postInit(SceneObjectList *OwnerList) {
 
 	if (R2_GLOBALS._player._characterScene[R2_QUINN] == R2_GLOBALS._player._characterScene[R2_SEEKER]) {
 		_actor1.postInit();
-		if (R2_GLOBALS._player._characterIndex == 1) {
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
 			_actor1.setup(20, 5, 1);
 			_actor1.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL);
 		} else {
@@ -2729,7 +2729,7 @@ void Scene2530::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._player.postInit();
 	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
 
-	if (R2_GLOBALS._player._characterIndex == 1) {
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
 		R2_GLOBALS._player.setVisage(2008);
 		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
 	} else {
@@ -2740,7 +2740,7 @@ void Scene2530::postInit(SceneObjectList *OwnerList) {
 
 	if (R2_GLOBALS._player._characterScene[R2_QUINN] == R2_GLOBALS._player._characterScene[R2_SEEKER]) {
 		_actor1.postInit();
-		if (R2_GLOBALS._player._characterIndex == 1) {
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
 			_actor1.setup(20, 5, 1);
 			_actor1.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL);
 		} else {
@@ -2892,7 +2892,7 @@ void Scene2535::postInit(SceneObjectList *OwnerList) {
 
 	R2_GLOBALS._player.postInit();
 	R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
-	if (R2_GLOBALS._player._characterIndex == 1) {
+	if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
 		R2_GLOBALS._player.setVisage(2008);
 		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
 	} else {
@@ -2903,7 +2903,7 @@ void Scene2535::postInit(SceneObjectList *OwnerList) {
 
 	if (R2_GLOBALS._player._characterScene[R2_QUINN] == R2_GLOBALS._player._characterScene[R2_SEEKER]) {
 		_companion.postInit();
-		if (R2_GLOBALS._player._characterIndex == 1) {
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
 			_companion.setup(20, 5, 1);
 			_companion.setDetails(9002, 0, 4, 3, 1, (SceneItem *)NULL);
 		} else {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index d60b286f79..6898ede304 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -334,7 +334,7 @@ void Scene3125::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._sound1.play(262);
 	R2_GLOBALS._player.postInit();
 
-	if (R2_GLOBALS._player._oldCharacterScene[3] == 3250) {
+	if (R2_GLOBALS._player._oldCharacterScene[R2_MIRANDA] == 3250) {
 		_sceneMode = 3175;
 		setAction(&_sequenceManager1, this, 3175, &R2_GLOBALS._player, &_door, NULL);
 	} else {
@@ -343,7 +343,7 @@ void Scene3125::postInit(SceneObjectList *OwnerList) {
 		R2_GLOBALS._player.setPosition(Common::Point(89, 76));
 		R2_GLOBALS._player.enableControl();
 	}
-	R2_GLOBALS._player._oldCharacterScene[3] = 3125;
+	R2_GLOBALS._player._oldCharacterScene[R2_MIRANDA] = 3125;
 }
 
 void Scene3125::signal() {
@@ -545,7 +545,7 @@ void Scene3150::postInit(SceneObjectList *OwnerList) {
 	if (R2_GLOBALS._sceneManager._previousScene == -1) {
 		R2_INVENTORY.setObjectScene(R2_ANCIENT_SCROLLS, 2000);
 		R2_GLOBALS._player._oldCharacterScene[R2_QUINN] = 3100;
-		R2_GLOBALS._player._oldCharacterScene[3] = 0;
+		R2_GLOBALS._player._oldCharacterScene[R2_MIRANDA] = 0;
 		R2_GLOBALS._player._characterIndex = R2_MIRANDA;
 	}
 	SceneExt::postInit();
@@ -708,7 +708,7 @@ void Scene3150::postInit(SceneObjectList *OwnerList) {
 		}
 	}
 
-	R2_GLOBALS._player._oldCharacterScene[3] = 3150;
+	R2_GLOBALS._player._oldCharacterScene[R2_MIRANDA] = 3150;
 }
 
 void Scene3150::signal() {
@@ -910,7 +910,7 @@ void Scene3175::postInit(SceneObjectList *OwnerList) {
 
 	R2_GLOBALS._player.postInit();
 
-	if (R2_GLOBALS._player._oldCharacterScene[3] == 3250) {
+	if (R2_GLOBALS._player._oldCharacterScene[R2_MIRANDA] == 3250) {
 		R2_GLOBALS._player.setup(30, 5, 1);
 		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
 		R2_GLOBALS._player.setPosition(Common::Point(126, 77));
@@ -920,7 +920,7 @@ void Scene3175::postInit(SceneObjectList *OwnerList) {
 		setAction(&_sequenceManager, this, 3175, &R2_GLOBALS._player, &_door, NULL);
 	}
 
-	R2_GLOBALS._player._oldCharacterScene[3] = 3175;
+	R2_GLOBALS._player._oldCharacterScene[R2_MIRANDA] = 3175;
 }
 
 void Scene3175::signal() {
@@ -1165,7 +1165,7 @@ void Scene3250::postInit(SceneObjectList *OwnerList) {
 	loadScene(3250);
 
 	if (R2_GLOBALS._sceneManager._previousScene == -1) {
-		R2_GLOBALS._player._oldCharacterScene[3] = 1200;
+		R2_GLOBALS._player._oldCharacterScene[R2_MIRANDA] = 1200;
 		R2_GLOBALS._player._characterIndex = R2_MIRANDA;
 	}
 
@@ -1195,7 +1195,7 @@ void Scene3250::postInit(SceneObjectList *OwnerList) {
 
 	R2_GLOBALS._player.postInit();
 
-	switch (R2_GLOBALS._player._oldCharacterScene[3]) {
+	switch (R2_GLOBALS._player._oldCharacterScene[R2_MIRANDA]) {
 	case 1200:
 		_sceneMode = 3250;
 		_actor4.postInit();
@@ -1234,7 +1234,7 @@ void Scene3250::postInit(SceneObjectList *OwnerList) {
 		break;
 	}
 
-	R2_GLOBALS._player._oldCharacterScene[3] = 3250;
+	R2_GLOBALS._player._oldCharacterScene[R2_MIRANDA] = 3250;
 }
 
 void Scene3250::signal() {
@@ -1305,7 +1305,7 @@ void Scene3255::postInit(SceneObjectList *OwnerList) {
 		_sceneMode = 3255;
 		setAction(&_sequenceManager, this, 3255, &R2_GLOBALS._player, NULL);
 	}
-	R2_GLOBALS._player._oldCharacterScene[3] = 3255;
+	R2_GLOBALS._player._oldCharacterScene[R2_MIRANDA] = 3255;
 }
 
 void Scene3255::signal() {
@@ -1512,7 +1512,7 @@ void Scene3260::postInit(SceneObjectList *OwnerList) {
 	_item1.setDetails(Rect(0, 0, 320, 200), 3260, 0, 1, 2, 1, NULL);
 	R2_GLOBALS._player.postInit();
 
-	if (R2_GLOBALS._player._oldCharacterScene[3] == 3275) {
+	if (R2_GLOBALS._player._oldCharacterScene[R2_MIRANDA] == 3275) {
 		_sceneMode = 3270;
 		setAction(&_sequenceManager, this, 3270, &R2_GLOBALS._player, &_door, NULL);
 	} else {
@@ -1522,7 +1522,7 @@ void Scene3260::postInit(SceneObjectList *OwnerList) {
 		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
 		R2_GLOBALS._player.enableControl();
 	}
-	R2_GLOBALS._player._oldCharacterScene[3] = 3260;
+	R2_GLOBALS._player._oldCharacterScene[R2_MIRANDA] = 3260;
 }
 
 void Scene3260::remove() {
@@ -1614,7 +1614,7 @@ void Scene3275::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._scrollFollower = &R2_GLOBALS._player;
 	R2_GLOBALS._player.postInit();
 	R2_GLOBALS._player.disableControl();
-	if (R2_GLOBALS._player._oldCharacterScene[3] == 3150) {
+	if (R2_GLOBALS._player._oldCharacterScene[R2_MIRANDA] == 3150) {
 		_sceneMode = 11;
 		R2_GLOBALS._player.setup(30, 3, 1);
 		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
@@ -1623,7 +1623,7 @@ void Scene3275::postInit(SceneObjectList *OwnerList) {
 		Common::Point pt(418, 128);
 		NpcMover *mover = new NpcMover();
 		R2_GLOBALS._player.addMover(mover, &pt, this);
-	} else if (R2_GLOBALS._player._oldCharacterScene[3] == 3260) {
+	} else if (R2_GLOBALS._player._oldCharacterScene[R2_MIRANDA] == 3260) {
 		_sceneMode = 3276;
 		setAction(&_sequenceManager, this, 3276, &R2_GLOBALS._player, &_door, NULL);
 	} else {
@@ -1633,7 +1633,7 @@ void Scene3275::postInit(SceneObjectList *OwnerList) {
 		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
 		R2_GLOBALS._player.enableControl();
 	}
-	R2_GLOBALS._player._oldCharacterScene[3] = 3275;
+	R2_GLOBALS._player._oldCharacterScene[R2_MIRANDA] = 3275;
 }
 
 void Scene3275::signal() {
@@ -1813,7 +1813,7 @@ bool Scene3375::Companion2::startAction(CursorType action, Event &event) {
 		return SceneActor::startAction(action, event);
 
 	scene->_sceneMode = 9999;
-	if (R2_GLOBALS._player._characterIndex == 2)
+	if (R2_GLOBALS._player._characterIndex == R2_SEEKER)
 		scene->_stripManager.start(3302, scene);
 	else
 		scene->_stripManager.start(3304, scene);
@@ -1828,7 +1828,7 @@ bool Scene3375::Companion1::startAction(CursorType action, Event &event) {
 		return SceneActor::startAction(action, event);
 
 	scene->_sceneMode = 9999;
-	if (R2_GLOBALS._player._characterIndex == 3)
+	if (R2_GLOBALS._player._characterIndex == R2_MIRANDA)
 		scene->_stripManager.start(3302, scene);
 	else
 		scene->_stripManager.start(3301, scene);
@@ -2241,7 +2241,7 @@ bool Scene3385::Companion1::startAction(CursorType action, Event &event) {
 		return SceneActor::startAction(action, event);
 
 	scene->_sceneMode = 9999;
-	if (R2_GLOBALS._player._characterIndex == 2)
+	if (R2_GLOBALS._player._characterIndex == R2_SEEKER)
 		scene->_stripManager.start(3302, scene);
 	else
 		scene->_stripManager.start(3304, scene);
@@ -2256,7 +2256,7 @@ bool Scene3385::Companion2::startAction(CursorType action, Event &event) {
 		return SceneActor::startAction(action, event);
 
 	scene->_sceneMode = 9999;
-	if (R2_GLOBALS._player._characterIndex == 3)
+	if (R2_GLOBALS._player._characterIndex == R2_MIRANDA)
 		scene->_stripManager.start(3302, scene);
 	else
 		scene->_stripManager.start(3301, scene);
@@ -2333,7 +2333,7 @@ void Scene3385::postInit(SceneObjectList *OwnerList) {
 
 	R2_GLOBALS._player._characterScene[R2_QUINN] = 3385;
 	R2_GLOBALS._player._characterScene[R2_SEEKER] = 3385;
-	R2_GLOBALS._player._characterScene[3] = 3385;
+	R2_GLOBALS._player._characterScene[R2_MIRANDA] = 3385;
 
 	if (R2_GLOBALS._sceneManager._previousScene == 3375)
 		_field11B2 = 3;
@@ -2343,16 +2343,16 @@ void Scene3385::postInit(SceneObjectList *OwnerList) {
 	setZoomPercents(102, 40, 200, 160);
 	R2_GLOBALS._player.postInit();
 
-	if (R2_GLOBALS._player._characterIndex == 2)
+	if (R2_GLOBALS._player._characterIndex == R2_SEEKER)
 		R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
 	else
 		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
 
 	R2_GLOBALS._player.changeZoom(-1);
 
-	if (R2_GLOBALS._player._characterIndex == 2)
+	if (R2_GLOBALS._player._characterIndex == R2_SEEKER)
 		R2_GLOBALS._player.setup(20, _field11B2, 1);
-	else if (R2_GLOBALS._player._characterIndex == 3)
+	else if (R2_GLOBALS._player._characterIndex == R2_MIRANDA)
 		R2_GLOBALS._player.setup(30, _field11B2, 1);
 	else
 		R2_GLOBALS._player.setup(10, _field11B2, 1);
@@ -2361,7 +2361,7 @@ void Scene3385::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._player.disableControl();
 
 	_companion1.postInit();
-	if (R2_GLOBALS._player._characterIndex == 2) {
+	if (R2_GLOBALS._player._characterIndex == R2_SEEKER) {
 		_companion1._moveRate = 10;
 		_companion1._moveDiff = Common::Point(3, 2);
 	} else {
@@ -2370,7 +2370,7 @@ void Scene3385::postInit(SceneObjectList *OwnerList) {
 	}
 	_companion1.changeZoom(-1);
 	_companion1._effect = 1;
-	if (R2_GLOBALS._player._characterIndex == 2)
+	if (R2_GLOBALS._player._characterIndex == R2_SEEKER)
 		_companion1.setup(10, _field11B2, 1);
 	else
 		_companion1.setup(20, _field11B2, 1);
@@ -2381,7 +2381,7 @@ void Scene3385::postInit(SceneObjectList *OwnerList) {
 	_companion2._moveDiff = Common::Point(3, 2);
 	_companion2.changeZoom(-1);
 	_companion2._effect = 1;
-	if (R2_GLOBALS._player._characterIndex == 3)
+	if (R2_GLOBALS._player._characterIndex == R2_MIRANDA)
 		_companion2.setup(10, _field11B2, 1);
 	else
 		_companion2.setup(30, _field11B2, 1);
@@ -2478,7 +2478,7 @@ bool Scene3395::Companion1::startAction(CursorType action, Event &event) {
 		return SceneActor::startAction(action, event);
 
 	scene->_sceneMode = 9999;
-	if (R2_GLOBALS._player._characterIndex == 2)
+	if (R2_GLOBALS._player._characterIndex == R2_SEEKER)
 		scene->_stripManager.start(3302, scene);
 	else
 		scene->_stripManager.start(3304, scene);
@@ -2493,7 +2493,7 @@ bool Scene3395::Companion2::startAction(CursorType action, Event &event) {
 		return SceneActor::startAction(action, event);
 
 	scene->_sceneMode = 9999;
-	if (R2_GLOBALS._player._characterIndex == 3)
+	if (R2_GLOBALS._player._characterIndex == R2_MIRANDA)
 		scene->_stripManager.start(3302, scene);
 	else
 		scene->_stripManager.start(3301, scene);
@@ -2556,7 +2556,7 @@ void Scene3395::postInit(SceneObjectList *OwnerList) {
 
 	R2_GLOBALS._player._characterScene[R2_QUINN] = 3395;
 	R2_GLOBALS._player._characterScene[R2_SEEKER] = 3395;
-	R2_GLOBALS._player._characterScene[3] = 3395;
+	R2_GLOBALS._player._characterScene[R2_MIRANDA] = 3395;
 
 	if (R2_GLOBALS._sceneManager._previousScene == 3385)
 		_field142E = 3;
@@ -2566,16 +2566,16 @@ void Scene3395::postInit(SceneObjectList *OwnerList) {
 	setZoomPercents(51, 40, 200, 137);
 	R2_GLOBALS._player.postInit();
 
-	if (R2_GLOBALS._player._characterIndex == 2)
+	if (R2_GLOBALS._player._characterIndex == R2_SEEKER)
 		R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
 	else
 		R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
 
 	R2_GLOBALS._player.changeZoom(-1);
 
-	if (R2_GLOBALS._player._characterIndex == 2)
+	if (R2_GLOBALS._player._characterIndex == R2_SEEKER)
 		R2_GLOBALS._player.setup(20, _field142E, 1);
-	else if (R2_GLOBALS._player._characterIndex == 3)
+	else if (R2_GLOBALS._player._characterIndex == R2_MIRANDA)
 		R2_GLOBALS._player.setup(30, _field142E, 1);
 	else
 		R2_GLOBALS._player.setup(10, _field142E, 1);
@@ -2584,7 +2584,7 @@ void Scene3395::postInit(SceneObjectList *OwnerList) {
 	R2_GLOBALS._player.disableControl();
 
 	_companion1.postInit();
-	if (R2_GLOBALS._player._characterIndex == 2) {
+	if (R2_GLOBALS._player._characterIndex == R2_SEEKER) {
 		_companion1._moveRate = 10;
 		_companion1._moveDiff = Common::Point(3, 2);
 	} else {
@@ -2593,7 +2593,7 @@ void Scene3395::postInit(SceneObjectList *OwnerList) {
 	}
 	_companion1.changeZoom(-1);
 	_companion1._effect = 1;
-	if (R2_GLOBALS._player._characterIndex == 2)
+	if (R2_GLOBALS._player._characterIndex == R2_SEEKER)
 		_companion1.setup(10, _field142E, 1);
 	else
 		_companion1.setup(20, _field142E, 1);
@@ -2715,7 +2715,7 @@ void Scene3400::postInit(SceneObjectList *OwnerList) {
 	setZoomPercents(51, 46, 180, 200);
 	R2_GLOBALS._player._characterScene[R2_QUINN] = 3400;
 	R2_GLOBALS._player._characterScene[R2_SEEKER] = 3400;
-	R2_GLOBALS._player._characterScene[3] = 3400;
+	R2_GLOBALS._player._characterScene[R2_MIRANDA] = 3400;
 
 	_actor7.postInit();
 	_actor7.setup(3403, 1, 1);
@@ -2751,7 +2751,7 @@ void Scene3400::postInit(SceneObjectList *OwnerList) {
 	_companion1.changeZoom(-1);
 	_companion1._effect = 1;
 	_companion1.setPosition(Common::Point(247, 63));
-	if (R2_GLOBALS._player._characterIndex == 2)
+	if (R2_GLOBALS._player._characterIndex == R2_SEEKER)
 		_companion1.setup(10, 5, 1);
 	else
 		_companion1.setup(20, 5, 1);
@@ -2762,7 +2762,7 @@ void Scene3400::postInit(SceneObjectList *OwnerList) {
 	_companion2.changeZoom(-1);
 	_companion2._effect = 1;
 	_companion2.setPosition(Common::Point(225, 63));
-	if (R2_GLOBALS._player._characterIndex == 3)
+	if (R2_GLOBALS._player._characterIndex == R2_MIRANDA)
 		_companion2.setup(10, 5, 1);
 	else
 		_companion2.setup(30, 5, 1);
@@ -2817,7 +2817,7 @@ void Scene3400::signal() {
 		_teal.setStrip(1);
 		R2_INVENTORY.setObjectScene(R2_SAPPHIRE_BLUE, 0);
 		_stripManager.start(3307, this);
-		if (R2_GLOBALS._player._characterIndex == 2) {
+		if (R2_GLOBALS._player._characterIndex == R2_SEEKER) {
 			_sceneMode = 3400;
 			R2_GLOBALS._player.setAction(&_sequenceManager, this, 3400, &R2_GLOBALS._player, &_teal, &_actor8, NULL);
 		} else {
@@ -2844,7 +2844,7 @@ void Scene3400::signal() {
 		_webbster.setStrip(3);
 		_teal.setStrip(1);
 		_sceneMode = 3403;
-		if (R2_GLOBALS._player._characterIndex == 2)
+		if (R2_GLOBALS._player._characterIndex == R2_SEEKER)
 			setAction(&_sequenceManager, this, 3403, &R2_GLOBALS._player, &_webbster, &_actor7, NULL);
 		else
 			setAction(&_sequenceManager, this, 3403, &_companion1, &_webbster, &_actor7, NULL);
@@ -2853,7 +2853,7 @@ void Scene3400::signal() {
 		warning("STUB: sub_1D227()");
 		_teal.setStrip(1);
 		_sceneMode = 3405;
-		if (R2_GLOBALS._player._characterIndex == 3)
+		if (R2_GLOBALS._player._characterIndex == R2_MIRANDA)
 			setAction(&_sequenceManager, this, 3405, &R2_GLOBALS._player, &_actor7, NULL);
 		else
 			setAction(&_sequenceManager, this, 3405, &_companion2, &_actor7, NULL);
@@ -2862,11 +2862,11 @@ void Scene3400::signal() {
 		warning("STUB: sub_1D227()");
 		_teal.setStrip(1);
 		_sceneMode = 3406;
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			setAction(&_sequenceManager, this, 3406, &R2_GLOBALS._player, &_actor7, NULL);
-		else if (R2_GLOBALS._player._characterIndex == 2)
+		else if (R2_GLOBALS._player._characterIndex == R2_SEEKER)
 			setAction(&_sequenceManager, this, 3406, &_companion1, &_actor7, NULL);
-		else if (R2_GLOBALS._player._characterIndex == 3)
+		else if (R2_GLOBALS._player._characterIndex == R2_MIRANDA)
 			setAction(&_sequenceManager, this, 3406, &_companion2, &_actor7, NULL);
 		break;
 	case 3311:
@@ -4338,9 +4338,9 @@ bool Scene3600::Item5::startAction(CursorType action, Event &event) {
 	scene->_actor12.setStrip2(-1);
 	scene->_actor4.setStrip2(-1);
 
-	if (R2_GLOBALS._player._characterIndex == 2)
+	if (R2_GLOBALS._player._characterIndex == R2_SEEKER)
 		R2_GLOBALS._player.setAction(&scene->_sequenceManager3, scene, 3611, &R2_GLOBALS._player, NULL);
-	else if (R2_GLOBALS._player._characterIndex == 3)
+	else if (R2_GLOBALS._player._characterIndex == R2_MIRANDA)
 		R2_GLOBALS._player.setAction(&scene->_sequenceManager4, scene, 3612, &R2_GLOBALS._player, NULL);
 	else
 		R2_GLOBALS._player.setAction(&scene->_sequenceManager2, scene, 3610, &R2_GLOBALS._player, NULL);
@@ -4425,7 +4425,7 @@ void Scene3600::postInit(SceneObjectList *OwnerList) {
 	setZoomPercents(142, 80, 167, 105);
 	R2_GLOBALS._player._characterScene[R2_QUINN] = 3600;
 	R2_GLOBALS._player._characterScene[R2_SEEKER] = 3600;
-	R2_GLOBALS._player._characterScene[3] = 3600;
+	R2_GLOBALS._player._characterScene[R2_MIRANDA] = 3600;
 
 	_item2.setDetails(33, 3600, 6, -1, -1);
 	_item3.setDetails(Rect(3, 3, 22, 45), 3600, 9, -1, -1, 1, NULL);
@@ -4499,7 +4499,7 @@ void Scene3600::postInit(SceneObjectList *OwnerList) {
 		_actor12.setup(30, 5, 11);
 		_actor12.animate(ANIM_MODE_1, NULL);
 
-		if (R2_GLOBALS._player._characterIndex == 2) {
+		if (R2_GLOBALS._player._characterIndex == R2_SEEKER) {
 			_actor10.setPosition(Common::Point(76, 148));
 			_actor11.setPosition(Common::Point(134, 148));
 			_actor12.setPosition(Common::Point(100, 148));
@@ -4507,7 +4507,7 @@ void Scene3600::postInit(SceneObjectList *OwnerList) {
 			R2_GLOBALS._player.setup(20, _actor11._strip, 1);
 			R2_GLOBALS._player.setPosition(_actor11._position);
 			_actor11.hide();
-		} else if (R2_GLOBALS._player._characterIndex == 3) {
+		} else if (R2_GLOBALS._player._characterIndex == R2_MIRANDA) {
 			_actor10.setPosition(Common::Point(110, 148));
 			_actor11.setPosition(Common::Point(76, 148));
 			_actor12.setPosition(Common::Point(134, 148));
@@ -4618,9 +4618,9 @@ void Scene3600::signal() {
 		_tealSpeaker._object1.hide();
 		_actor5.show();
 		_actor5.setStrip(2);
-		if (R2_GLOBALS._player._characterIndex == 2)
+		if (R2_GLOBALS._player._characterIndex == R2_SEEKER)
 			_sceneMode = 3602;
-		else if (R2_GLOBALS._player._characterIndex == 3)
+		else if (R2_GLOBALS._player._characterIndex == R2_MIRANDA)
 			_sceneMode = 3603;
 		else
 			_sceneMode = 3601;
@@ -4727,12 +4727,12 @@ void Scene3600::signal() {
 		_quinnSpeaker._displayMode = 2;
 		_tealSpeaker._displayMode = 2;
 
-		if (R2_GLOBALS._player._characterIndex == 2) {
+		if (R2_GLOBALS._player._characterIndex == R2_SEEKER) {
 			R2_GLOBALS._player._moveDiff = Common::Point(5, 3);
 			R2_GLOBALS._player.setup(20, _actor11._strip, 1);
 			R2_GLOBALS._player.setPosition(_actor11._position);
 			_actor11.hide();
-		} else if (R2_GLOBALS._player._characterIndex == 3) {
+		} else if (R2_GLOBALS._player._characterIndex == R2_MIRANDA) {
 			R2_GLOBALS._player._moveDiff = Common::Point(3, 2);
 			R2_GLOBALS._player.setup(30, _actor12._strip, 1);
 			R2_GLOBALS._player.setPosition(_actor12._position);
@@ -4884,10 +4884,10 @@ void Scene3600::dispatch() {
 
 		R2_GLOBALS._player.hide();
 
-		if (R2_GLOBALS._player._characterIndex == 2) {
+		if (R2_GLOBALS._player._characterIndex == R2_SEEKER) {
 			_actor11.setPosition(R2_GLOBALS._player._position);
 			_actor11.show();
-		} else if (R2_GLOBALS._player._characterIndex == 3) {
+		} else if (R2_GLOBALS._player._characterIndex == R2_MIRANDA) {
 			_actor12.setPosition(R2_GLOBALS._player._position);
 			_actor12.show();
 		} else {
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index 2cf5201c43..93f428547e 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -541,7 +541,7 @@ void SpeakerMiranda300::proc15() {
 	int v = _speakerMode;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 3) {
+		if (R2_GLOBALS._player._characterIndex == R2_MIRANDA) {
 			_object2 = &R2_GLOBALS._player;
 		} else {
 			Scene300 *scene = (Scene300 *)R2_GLOBALS._sceneManager._scene;
@@ -627,7 +627,7 @@ void SpeakerMiranda3375::proc15() {
 	int v = _speakerMode;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 3)
+		if (R2_GLOBALS._player._characterIndex == R2_MIRANDA)
 			_object2 = &R2_GLOBALS._player;
 		else
 			_object2 = &scene->_companion2;
@@ -677,7 +677,7 @@ void SpeakerMiranda3385::proc15() {
 	int v = _speakerMode;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 3)
+		if (R2_GLOBALS._player._characterIndex == R2_MIRANDA)
 			_object2 = &R2_GLOBALS._player;
 		else
 			_object2 = &scene->_companion2;
@@ -726,7 +726,7 @@ void SpeakerMiranda3395::proc15() {
 	int v = _speakerMode;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 3)
+		if (R2_GLOBALS._player._characterIndex == R2_MIRANDA)
 			_object2 = &R2_GLOBALS._player;
 		else
 			_object2 = &scene->_companion2;
@@ -776,7 +776,7 @@ void SpeakerMiranda3400::proc15() {
 	int v = _speakerMode;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 3)
+		if (R2_GLOBALS._player._characterIndex == R2_MIRANDA)
 			_object2 = &R2_GLOBALS._player;
 		else
 			_object2 = &scene->_companion2;
@@ -820,7 +820,7 @@ void SpeakerMiranda3600::proc15() {
 	int v = _speakerMode;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 3)
+		if (R2_GLOBALS._player._characterIndex == R2_MIRANDA)
 			_object2 = &R2_GLOBALS._player;
 		else
 			_object2 = &scene->_actor12;
@@ -1176,7 +1176,7 @@ void SpeakerQuinn300::proc15() {
 	int v = _speakerMode;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 3) {
+		if (R2_GLOBALS._player._characterIndex == R2_MIRANDA) {
 			_object2 = &R2_GLOBALS._player;
 		} else {
 			assert(R2_GLOBALS._sceneManager._sceneNumber == 300);
@@ -1272,7 +1272,7 @@ void SpeakerQuinn1100::proc15() {
 		if (v == 0)
 			return;
 
-		if (R2_GLOBALS._player._characterIndex == 1) {
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
 			_object2 = &R2_GLOBALS._player;
 		} else {
 			assert(R2_GLOBALS._sceneManager._sceneNumber == 1100);
@@ -1318,7 +1318,7 @@ void SpeakerQuinn2435::proc15() {
 	int v = _speakerMode;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 1) {
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
 			_object2 = &R2_GLOBALS._player;
 		} else {
 			assert(R2_GLOBALS._sceneManager._sceneNumber == 2435);
@@ -1345,7 +1345,7 @@ void SpeakerQuinn2450::proc15() {
 	int v = _speakerMode;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 1) {
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN) {
 			_object2 = &R2_GLOBALS._player;
 		} else {
 			assert(R2_GLOBALS._sceneManager._sceneNumber == 2435);
@@ -1500,9 +1500,9 @@ void SpeakerQuinn3375::proc15() {
 	int v = _speakerMode;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			_object2 = &R2_GLOBALS._player;
-		else if (R2_GLOBALS._player._characterIndex == 2)
+		else if (R2_GLOBALS._player._characterIndex == R2_SEEKER)
 			_object2 = &scene->_companion1;
 		else
 			_object2 = &scene->_companion2;
@@ -1551,9 +1551,9 @@ void SpeakerQuinn3385::proc15() {
 	int v = _speakerMode;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			_object2 = &R2_GLOBALS._player;
-		else if (R2_GLOBALS._player._characterIndex == 2)
+		else if (R2_GLOBALS._player._characterIndex == R2_SEEKER)
 			_object2 = &scene->_companion1;
 		else
 			_object2 = &scene->_companion2;
@@ -1587,7 +1587,7 @@ void SpeakerQuinn3385::proc15() {
 		break;
 	case 1:
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		if (R2_GLOBALS._player._characterIndex == 2)
+		if (R2_GLOBALS._player._characterIndex == R2_SEEKER)
 			_object1.setup(4010, 3, 1);
 		else
 			_object1.setup(4010, 5, 1);
@@ -1606,9 +1606,9 @@ void SpeakerQuinn3395::proc15() {
 	int v = _speakerMode;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			_object2 = &R2_GLOBALS._player;
-		else if (R2_GLOBALS._player._characterIndex == 2)
+		else if (R2_GLOBALS._player._characterIndex == R2_SEEKER)
 			_object2 = &scene->_companion1;
 		else
 			_object2 = &scene->_companion2;
@@ -1642,7 +1642,7 @@ void SpeakerQuinn3395::proc15() {
 		break;
 	case 1:
 		((SceneItem *)_action)->_sceneRegionId = 0;
-		if (R2_GLOBALS._player._characterIndex == 2)
+		if (R2_GLOBALS._player._characterIndex == R2_SEEKER)
 			_object1.setup(4010, 3, 1);
 		else
 			_object1.setup(4010, 5, 1);
@@ -1661,9 +1661,9 @@ void SpeakerQuinn3400::proc15() {
 	int v = _speakerMode;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			_object2 = &R2_GLOBALS._player;
-		else if (R2_GLOBALS._player._characterIndex == 2)
+		else if (R2_GLOBALS._player._characterIndex == R2_SEEKER)
 			_object2 = &scene->_companion1;
 		else
 			_object2 = &scene->_companion2;
@@ -1710,7 +1710,7 @@ void SpeakerQuinn3600::proc15() {
 	int v = _speakerMode;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 1)
+		if (R2_GLOBALS._player._characterIndex == R2_QUINN)
 			_object2 = &R2_GLOBALS._player;
 		else
 			_object2 = &scene->_actor10;
@@ -2072,7 +2072,7 @@ void SpeakerSeeker1100::proc15() {
 		if (v == 0)
 			return;
 
-		if (R2_GLOBALS._player._characterIndex == 2) {
+		if (R2_GLOBALS._player._characterIndex == R2_SEEKER) {
 			_object2 = &R2_GLOBALS._player;
 		} else {
 			assert(R2_GLOBALS._sceneManager._sceneNumber == 1100);
@@ -2129,7 +2129,7 @@ void SpeakerSeeker1900::proc15() {
 	int v = _speakerMode;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 2) {
+		if (R2_GLOBALS._player._characterIndex == R2_SEEKER) {
 			_object2 = &R2_GLOBALS._player;
 		} else {
 			assert(R2_GLOBALS._sceneManager._sceneNumber == 1900);
@@ -2160,7 +2160,7 @@ void SpeakerSeeker2435::proc15() {
 	int v = _speakerMode;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 2) {
+		if (R2_GLOBALS._player._characterIndex == R2_SEEKER) {
 			_object2 = &R2_GLOBALS._player;
 		} else {
 			assert(R2_GLOBALS._sceneManager._sceneNumber == 2435);
@@ -2187,7 +2187,7 @@ void SpeakerSeeker2450::proc15() {
 	int v = _speakerMode;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 2) {
+		if (R2_GLOBALS._player._characterIndex == R2_SEEKER) {
 			_object2 = &R2_GLOBALS._player;
 		} else {
 			assert(R2_GLOBALS._sceneManager._sceneNumber == 2450);
@@ -2362,7 +2362,7 @@ void SpeakerSeeker3400::proc15() {
 	int v = _speakerMode;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 2)
+		if (R2_GLOBALS._player._characterIndex == R2_SEEKER)
 			_object2 = &R2_GLOBALS._player;
 		else
 			_object2 = &scene->_companion1;
@@ -2421,7 +2421,7 @@ void SpeakerSeeker3600::proc15() {
 	int v = _speakerMode;
 
 	if (!_object2) {
-		if (R2_GLOBALS._player._characterIndex == 2)
+		if (R2_GLOBALS._player._characterIndex == R2_SEEKER)
 			_object2 = &R2_GLOBALS._player;
 		else
 			_object2 = &scene->_actor11;