TSAGE: R2R - Rename inventory enums, fix isInventoryIcon()

7 files changed, 162 insertions, 158 deletions

diff --git a/engines/tsage/events.h b/engines/tsage/events.h
index 2917256382..cf2d1a34ed 100644
--- a/engines/tsage/events.h
+++ b/engines/tsage/events.h
@@ -87,16 +87,20 @@ enum CursorType {
 
 	// Ringworld 2 objects
 	R2_OPTO_DISK = 1, R2_READER = 2, R2_NEGATOR_GUN = 3, R2_STEPPING_DISKS = 4, 
-	R2_ATTRACTOR_UNIT = 5, R2_SENSOR_PROBE = 6, 
-	R2_SONIC_STUNNER = 7, R2_8 = 8, R2_9 = 9, R2_10 = 10, R2_11 = 11, R2_AEROSOL = 12, R2_13 = 13, 
-	R2_OPTICAL_FIBRE = 14, R2_CLAMP = 15, R2_16 = 16, R2_17 = 17, R2_18 = 18, R2_19 = 19, 
-	R2_REBREATHER_TANK = 20, R2_21 = 21, R2_22 = 22, R2_23 = 23, R2_24 = 24, R2_25 = 25, 
-	R2_26 = 26, R2_27 = 27, R2_28 = 28,
-	R2_29 = 29, R2_30 = 30, R2_31 = 31, R2_32 = 32, R2_33 = 33, R2_34 = 34, R2_35 = 35,
-	R2_36 = 36, R2_37 = 37, R2_38 = 38, R2_39 = 39, R2_40 = 40, R2_41 = 41, R2_42 = 42,
-	R2_43 = 43, R2_44 = 44, R2_45 = 45, R2_46 = 46, R2_47 = 47, R2_48 = 48, R2_49 = 49,
-	R2_50 = 50, R2_51 = 51, R2_52 = 52,
-	R2_LAST_INVENT = 53,
+	R2_ATTRACTOR_UNIT = 5, R2_SENSOR_PROBE = 6, R2_SONIC_STUNNER = 7, 
+	R2_CABLE_HARNESS = 8, R2_COM_SCANNER = 9, R2_SPENT_POWER_CAPSULE = 10, 
+	R2_CHARGED_POWER_CAPSULE = 11, R2_AEROSOL = 12, R2_REMOTE_CONTROL = 13, 
+	R2_OPTICAL_FIBRE = 14, R2_CLAMP = 15, R2_ATTRACTOR_CABLE_HARNESS = 16, 
+	R2_FUEL_CELL = 17, R2_GYROSCOPE = 18, R2_AIRBAG = 19, R2_REBREATHER_TANK = 20, 
+	R2_RESERVE_REBREATHER_TANK = 21, R2_GUIDANCE_MODULE = 22, R2_THRUSTER_VALVE = 23,
+	R2_BALLOON_BACKPACK = 24, R2_RADAR_MECHANISM = 25, R2_JOYSTICK = 26, 
+	R2_IGNITOR = 27, R2_DIAGNOSTICS_DISPLAY = 28, R2_GLASS_DOME = 29, R2_WICK_LAMP = 30, 
+	R2_SCRITH_KEY = 31, R2_TANNER_MASK = 32, R2_PURE_GRAIN_ALCOHOL = 33, R2_SAPPHIRE_BLUE = 34, 
+	R2_ANCIENT_SCROLLS = 35, R2_FLUTE = 36, R2_GUNPOWDER = 37, R2_NONAME = 38, 
+	R2_COM_SCANNER_2 = 39, R2_SUPERCONDUCTOR_WIRE = 40, R2_PILLOW = 41, R2_FOOD_TRAY = 42,
+	R2_LASER_HACKSAW = 43, R2_PHOTON_STUNNER = 44, R2_BATTERY = 45, R2_SOAKED_FACEMASK = 46, 
+	R2_LIGHT_BULB = 47, R2_ALCOHOL_LAMP = 48, R2_ALCOHOL_LAMP_2 = 49, R2_ALCOHOL_LAMP_3 = 50, 
+	R2_BROKEN_DISPLAY = 51, R2_TOOLBOX = 52, R2_LAST_INVENT = 53,
 
 	// Ringworld 2 cursors
 	R2CURSORS_START = 0x8000, EXITCURSOR_N  = 0x8007,  EXITCURSOR_S  = 0x8008, EXITCURSOR_W = 0x8009, 
@@ -145,7 +149,7 @@ public:
 	Common::EventType type() { return _event.type; }
 	uint32 getFrameNumber() const { return _frameNumber; }
 	void delay(int numFrames);
-	bool isInventoryIcon() const { return _currentCursor < 256; }
+	bool isInventoryIcon() const { return (_currentCursor >= 0) && (_currentCursor < 256); }
 	void proc1() { warning("TODO: EventsClass::proc1"); }
 
 	virtual void listenerSynchronize(Serializer &s);
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 4f7578b1fa..074a3960cb 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -419,13 +419,13 @@ bool SceneExt::display(CursorType action, Event &event) {
 
 		R2_GLOBALS._sound4.play(45);
 		break;
-	case R2_9:
-	case R2_39:
+	case R2_COM_SCANNER:
+	case R2_COM_SCANNER_2:
 		R2_GLOBALS._sound3.play(44);
 		SceneItem::display2(2, action);
 		R2_GLOBALS._sound3.stop();
 		break;
-	case R2_44:
+	case R2_PHOTON_STUNNER:
 		R2_GLOBALS._sound3.play(99);
 		SceneItem::display2(2, action);
 		break;
@@ -859,51 +859,51 @@ void Ringworld2InvObjectList::reset() {
 	setObjectScene(R2_ATTRACTOR_UNIT, 400);
 	setObjectScene(R2_SENSOR_PROBE, 400);
 	setObjectScene(R2_SONIC_STUNNER, 500);
-	setObjectScene(R2_8, 700);
-	setObjectScene(R2_9, 800);
-	setObjectScene(R2_10, 100);
-	setObjectScene(R2_11, 400);
+	setObjectScene(R2_CABLE_HARNESS, 700);
+	setObjectScene(R2_COM_SCANNER, 800);
+	setObjectScene(R2_SPENT_POWER_CAPSULE, 100);
+	setObjectScene(R2_CHARGED_POWER_CAPSULE, 400);
 	setObjectScene(R2_AEROSOL, 500);
-	setObjectScene(R2_13, 1550);
+	setObjectScene(R2_REMOTE_CONTROL, 1550);
 	setObjectScene(R2_OPTICAL_FIBRE, 850);
 	setObjectScene(R2_CLAMP, 850);
-	setObjectScene(R2_16, 0);
-	setObjectScene(R2_17, 1550);
-	setObjectScene(R2_18, 1550);
-	setObjectScene(R2_19, 1550);
+	setObjectScene(R2_ATTRACTOR_CABLE_HARNESS, 0);
+	setObjectScene(R2_FUEL_CELL, 1550);
+	setObjectScene(R2_GYROSCOPE, 1550);
+	setObjectScene(R2_AIRBAG, 1550);
 	setObjectScene(R2_REBREATHER_TANK, 500);
-	setObjectScene(R2_21, 500);
-	setObjectScene(R2_22, 1550);
-	setObjectScene(R2_23, 1580);
-	setObjectScene(R2_24, 9999);
-	setObjectScene(R2_25, 1550);
-	setObjectScene(R2_26, 1550);
-	setObjectScene(R2_27, 1580);
-	setObjectScene(R2_28, 1550);
-	setObjectScene(R2_29, 2525);
-	setObjectScene(R2_30, 2440);
-	setObjectScene(R2_31, 2455);
-	setObjectScene(R2_32, 2535);
-	setObjectScene(R2_33, 2530);
-	setObjectScene(R2_34, 1950);
-	setObjectScene(R2_35, 1950);
-	setObjectScene(R2_36, 9999);
-	setObjectScene(R2_37, 2430);
-	setObjectScene(R2_38, 9999);
-	setObjectScene(R2_39, 2);
-	setObjectScene(R2_40, 9999);
-	setObjectScene(R2_41, 3150);
-	setObjectScene(R2_42, 0);
-	setObjectScene(R2_43, 3260);
-	setObjectScene(R2_44, 2);
-	setObjectScene(R2_45, 1550);
-	setObjectScene(R2_46, 0);
-	setObjectScene(R2_47, 3150);
-	setObjectScene(R2_48, 2435);
-	setObjectScene(R2_49, 2440);
-	setObjectScene(R2_50, 2435);
-	setObjectScene(R2_51, 1580);
-	setObjectScene(R2_52, 3260);
+	setObjectScene(R2_RESERVE_REBREATHER_TANK, 500);
+	setObjectScene(R2_GUIDANCE_MODULE, 1550);
+	setObjectScene(R2_THRUSTER_VALVE, 1580);
+	setObjectScene(R2_BALLOON_BACKPACK, 9999);
+	setObjectScene(R2_RADAR_MECHANISM, 1550);
+	setObjectScene(R2_JOYSTICK, 1550);
+	setObjectScene(R2_IGNITOR, 1580);
+	setObjectScene(R2_DIAGNOSTICS_DISPLAY, 1550);
+	setObjectScene(R2_GLASS_DOME, 2525);
+	setObjectScene(R2_WICK_LAMP, 2440);
+	setObjectScene(R2_SCRITH_KEY, 2455);
+	setObjectScene(R2_TANNER_MASK, 2535);
+	setObjectScene(R2_PURE_GRAIN_ALCOHOL, 2530);
+	setObjectScene(R2_SAPPHIRE_BLUE, 1950);
+	setObjectScene(R2_ANCIENT_SCROLLS, 1950);
+	setObjectScene(R2_FLUTE, 9999);
+	setObjectScene(R2_GUNPOWDER, 2430);
+	setObjectScene(R2_NONAME, 9999);
+	setObjectScene(R2_COM_SCANNER_2, 2);
+	setObjectScene(R2_SUPERCONDUCTOR_WIRE, 9999);
+	setObjectScene(R2_PILLOW, 3150);
+	setObjectScene(R2_FOOD_TRAY, 0);
+	setObjectScene(R2_LASER_HACKSAW, 3260);
+	setObjectScene(R2_PHOTON_STUNNER, 2);
+	setObjectScene(R2_BATTERY, 1550);
+	setObjectScene(R2_SOAKED_FACEMASK, 0);
+	setObjectScene(R2_LIGHT_BULB, 3150);
+	setObjectScene(R2_ALCOHOL_LAMP, 2435);
+	setObjectScene(R2_ALCOHOL_LAMP_2, 2440);
+	setObjectScene(R2_ALCOHOL_LAMP_3, 2435);
+	setObjectScene(R2_BROKEN_DISPLAY, 1580);
+	setObjectScene(R2_TOOLBOX, 3260);
 }
 
 void Ringworld2InvObjectList::setObjectScene(int objectNum, int sceneNumber) {
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 2b2b5e71ef..c2b00b675e 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -4884,7 +4884,7 @@ bool Scene500::Object3::startAction(CursorType action, Event &event) {
 		}
 		return true;
 
-	case R2_21:
+	case R2_RESERVE_REBREATHER_TANK:
 		SceneItem::display2(500, 53);
 		return true;
 
@@ -5442,7 +5442,7 @@ bool Scene600::Actor5::startAction(CursorType action, Event &event) {
 		return true;
 	}
 	
-	if ((R2_GLOBALS.getFlag(9)) && (R2_INVENTORY.getObjectScene(R2_9) == 600))
+	if ((R2_GLOBALS.getFlag(9)) && (R2_INVENTORY.getObjectScene(R2_COM_SCANNER) == 600))
 		SceneItem::display(600, 31, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
 	else {
 		R2_GLOBALS._player.disableControl();
@@ -5457,7 +5457,7 @@ bool Scene600::Actor6::startAction(CursorType action, Event &event) {
 
 	if ((action < CURSOR_WALK) && (action >= R2CURSORS_START)) {
 		switch (action) {
-		case R2_9:
+		case R2_COM_SCANNER:
 			if (R2_GLOBALS.getFlag(6)) {
 				if (R2_GLOBALS.getFlag(8)) {
 					SceneItem::display(600, 29, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
@@ -5828,7 +5828,7 @@ bool Scene700::Item12::startAction(CursorType action, Event &event) {
 	Scene700 *scene = (Scene700 *)R2_GLOBALS._sceneManager._scene;
 
 	switch (action) {
-	case R2_8:
+	case R2_CABLE_HARNESS:
 		R2_GLOBALS._player.disableControl();
 		scene->_actor5.postInit();
 		scene->_actor5.setup(701, 3, 2);
@@ -5837,7 +5837,7 @@ bool Scene700::Item12::startAction(CursorType action, Event &event) {
 		scene->_actor5.hide();
 		scene->_sceneMode = 20;
 		break;
-	case R2_16:
+	case R2_ATTRACTOR_CABLE_HARNESS:
 		R2_GLOBALS._player.disableControl();
 		scene->_actor5.postInit();
 		scene->_actor5.setup(701, 2, 8);
@@ -5908,7 +5908,7 @@ bool Scene700::Actor5::startAction(CursorType action, Event &event) {
 
 	switch (action) {
 	case CURSOR_USE:
-		switch (R2_INVENTORY.getObjectScene(R2_8)) {
+		switch (R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS)) {
 		case 0:
 			if ((_strip == 2) && (_frame == 1)) {
 				R2_GLOBALS._player.disableControl();
@@ -5937,7 +5937,7 @@ bool Scene700::Actor5::startAction(CursorType action, Event &event) {
 		break;
 	case R2_ATTRACTOR_UNIT:
 		R2_GLOBALS._player.disableControl();
-		if (R2_INVENTORY.getObjectScene(R2_8) == 700) {
+		if (R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS) == 700) {
 			scene->_sceneMode = 706;
 			scene->setAction(&scene->_sequenceManager, scene, 706, &R2_GLOBALS._player, &scene->_actor5, NULL);
 		} else {
@@ -6020,12 +6020,12 @@ void Scene700::postInit(SceneObjectList *OwnerList) {
 	_actor9.setPosition(Common::Point(324, 53));
 	_actor9.setDetails(700, 33, -1, 35, 1, (SceneItem *) NULL);
 
-	if ((R2_INVENTORY.getObjectScene(R2_8) != 1) && (R2_INVENTORY.getObjectScene(R2_16) != 1)) {
+	if ((R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS) != 1) && (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_CABLE_HARNESS) != 1)) {
 		_actor5.postInit();
 		_actor5.fixPriority(10);
-		switch (R2_INVENTORY.getObjectScene(R2_16)) {
+		switch (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_CABLE_HARNESS)) {
 		case 0:
-			switch (R2_INVENTORY.getObjectScene(R2_8)) {
+			switch (R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS)) {
 			case 0:
 				_actor5.setup(701, 3, 2);
 				_actor5.setPosition(Common::Point(243, 98));
@@ -6041,7 +6041,7 @@ void Scene700::postInit(SceneObjectList *OwnerList) {
 			}
 			break;
 		case 700:
-			switch (R2_INVENTORY.getObjectScene(R2_8)) {
+			switch (R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS)) {
 			case 0:
 				if ((R2_GLOBALS._v565E5 != 0) && (R2_GLOBALS._v565E1 == 20) && (R2_GLOBALS._v565E3 == 70))
 					_actor5.setup(701, 2, 1);
@@ -6191,10 +6191,10 @@ void Scene700::signal() {
 		R2_GLOBALS._player.setObjectWrapper(new SceneObjectWrapper());
 		R2_GLOBALS._player._strip = 7;
 		if (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_UNIT) == 0) {
-			R2_INVENTORY.setObjectScene(R2_16, 1);
-			R2_INVENTORY.setObjectScene(R2_8, 0);
+			R2_INVENTORY.setObjectScene(R2_ATTRACTOR_CABLE_HARNESS, 1);
+			R2_INVENTORY.setObjectScene(R2_CABLE_HARNESS, 0);
 		} else {
-			R2_INVENTORY.setObjectScene(R2_8, 1);
+			R2_INVENTORY.setObjectScene(R2_CABLE_HARNESS, 1);
 		}
 		R2_GLOBALS._player.enableControl();
 		break;
@@ -6219,7 +6219,7 @@ void Scene700::signal() {
 		break;
 	case 17:
 		R2_INVENTORY.setObjectScene(R2_ATTRACTOR_UNIT, 0);
-		R2_INVENTORY.setObjectScene(R2_16, 700);
+		R2_INVENTORY.setObjectScene(R2_ATTRACTOR_CABLE_HARNESS, 700);
 		R2_GLOBALS._player.setVisage(11);
 		R2_GLOBALS._player.changeZoom(100);
 		R2_GLOBALS._player.animate(ANIM_MODE_1, NULL);
@@ -6228,7 +6228,7 @@ void Scene700::signal() {
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 20:
-		R2_INVENTORY.setObjectScene(R2_8, 0);
+		R2_INVENTORY.setObjectScene(R2_CABLE_HARNESS, 0);
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 21:
@@ -6236,7 +6236,7 @@ void Scene700::signal() {
 		if ((R2_GLOBALS._v565E5 != 0) && (R2_GLOBALS._v565E1 == 20) && (R2_GLOBALS._v565E3 == 70))
 			_actor5.animate(ANIM_MODE_6, NULL);
 
-		R2_INVENTORY.setObjectScene(R2_16, 700);
+		R2_INVENTORY.setObjectScene(R2_ATTRACTOR_CABLE_HARNESS, 700);
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 701:
@@ -6254,7 +6254,7 @@ void Scene700::signal() {
 		if ((R2_GLOBALS._v565E5 != 0) && (R2_GLOBALS._v565E1 == 20) && (R2_GLOBALS._v565E3 == 70))
 			_actor5.animate(ANIM_MODE_6, NULL);
 		R2_INVENTORY.setObjectScene(R2_ATTRACTOR_UNIT, 0);
-		R2_INVENTORY.setObjectScene(R2_16, 700);
+		R2_INVENTORY.setObjectScene(R2_ATTRACTOR_CABLE_HARNESS, 700);
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 709:
@@ -6462,7 +6462,7 @@ void Scene800::postInit(SceneObjectList *OwnerList) {
 	_cabinet.setPosition(Common::Point(169, 79));
 	_cabinet.setDetails(800, 41, -1, -1, 1, (SceneItem *)NULL);
 
-	if (R2_INVENTORY.getObjectScene(R2_9) == 800) {
+	if (R2_INVENTORY.getObjectScene(R2_COM_SCANNER) == 800) {
 		_comScanner.postInit();
 		_comScanner.setup(801, 2, 1);
 		_comScanner.setPosition(Common::Point(174, 73));
@@ -6548,7 +6548,7 @@ void Scene800::signal() {
 	case 811:
 		R2_GLOBALS._player.enableControl();
 		_comScanner.remove();
-		R2_INVENTORY.setObjectScene(R2_9, 1);
+		R2_INVENTORY.setObjectScene(R2_COM_SCANNER, 1);
 		break;
 	default:
 		R2_GLOBALS._player.enableControl();
@@ -7152,7 +7152,7 @@ bool Scene900::Actor4::startAction(CursorType action, Event &event) {
 					scene->_aSound1.play(30);
 					setup(900, 3, 11);
 					R2_GLOBALS._v565E5 = 1;
-					if ((R2_INVENTORY.getObjectScene(R2_8) == 0) && (R2_INVENTORY.getObjectScene(R2_16 == 700)) && (R2_GLOBALS._v565E1 == 20) && (R2_GLOBALS._v565E3 == 70) && (scene->_actor2._animateMode != ANIM_MODE_6)) {
+					if ((R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS) == 0) && (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_CABLE_HARNESS == 700)) && (R2_GLOBALS._v565E1 == 20) && (R2_GLOBALS._v565E3 == 70) && (scene->_actor2._animateMode != ANIM_MODE_6)) {
 						scene->_actor2.animate(ANIM_MODE_6, NULL);
 					} else {
 						if (((scene->_actor3._percent * 49) / 100) + scene->_actor3._position.x == scene->_actor2._position.x) {
@@ -7172,9 +7172,9 @@ bool Scene900::Actor4::startAction(CursorType action, Event &event) {
 					setup(900, 3, 9);
 					R2_GLOBALS._v565E5 = 0;
 					
-					if ((R2_INVENTORY.getObjectScene(R2_8) == 0) && (R2_INVENTORY.getObjectScene(R2_16) == 700) && (scene->_actor2._frame < 8) && (scene->_actor2._animateMode != ANIM_MODE_5)) {
+					if ((R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS) == 0) && (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_CABLE_HARNESS) == 700) && (scene->_actor2._frame < 8) && (scene->_actor2._animateMode != ANIM_MODE_5)) {
 							scene->_actor2.animate(ANIM_MODE_5, NULL);
-					} else if ((R2_INVENTORY.getObjectScene(R2_8) == 700) && (R2_INVENTORY.getObjectScene(R2_16) == 700) && (scene->_actor2._frame < 8)) {
+					} else if ((R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS) == 700) && (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_CABLE_HARNESS) == 700) && (scene->_actor2._frame < 8)) {
 						R2_GLOBALS._v565E7 = 0;
 						if (scene->_actor2._animateMode != 5) {
 							R2_GLOBALS._player.disableControl();
@@ -7288,13 +7288,13 @@ void Scene900::postInit(SceneObjectList *OwnerList) {
 	_actor3._effect = 1;
 	_actor3.setDetails(900, 6, -1, 8, 1, (SceneItem *) NULL);
 
-	if ((R2_INVENTORY.getObjectScene(R2_8) != 1) && (R2_INVENTORY.getObjectScene(R2_16) != 1)) {
+	if ((R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS) != 1) && (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_CABLE_HARNESS) != 1)) {
 		_actor2.postInit();
 		_actor2.setPosition(Common::Point(0, 0));
 		_actor2.fixPriority(1);
 		
-		if (R2_INVENTORY.getObjectScene(R2_8) == 0) {
-			if (R2_INVENTORY.getObjectScene(R2_16) != 700) {
+		if (R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS) == 0) {
+			if (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_CABLE_HARNESS) != 700) {
 				_actor2.setup(901, 3, 2);
 			} else if ((R2_GLOBALS._v565E5 != 0) && (R2_GLOBALS._v565E1 == 20) && (R2_GLOBALS._v565E3 == 70)) {
 				_actor2.setup(901, 2, 1);
@@ -7446,11 +7446,11 @@ void Scene900::dispatch() {
 	}
 
 	if (R2_GLOBALS._sceneObjects->contains(&_actor2)) {
-		if ((R2_GLOBALS._v565E5 != 0) && (R2_INVENTORY.getObjectScene(R2_8) == 0) && (R2_INVENTORY.getObjectScene(R2_16) == 700) && (R2_GLOBALS._v565E1 == 20) && (R2_GLOBALS._v565E3 == 70)) {
+		if ((R2_GLOBALS._v565E5 != 0) && (R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS) == 0) && (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_CABLE_HARNESS) == 700) && (R2_GLOBALS._v565E1 == 20) && (R2_GLOBALS._v565E3 == 70)) {
 			if ((_actor2._frame > 1) && (_actor2._animateMode != ANIM_MODE_6))
 				_actor2.animate(ANIM_MODE_6, NULL);
 		} else {
-			if ((_actor2._frame < 8) && (_actor2._animateMode != ANIM_MODE_5) && (R2_GLOBALS._v565E7 == 0) && (R2_INVENTORY.getObjectScene(R2_8) == 0) && (R2_INVENTORY.getObjectScene(R2_16) == 700) && (_sceneMode != 4))
+			if ((_actor2._frame < 8) && (_actor2._animateMode != ANIM_MODE_5) && (R2_GLOBALS._v565E7 == 0) && (R2_INVENTORY.getObjectScene(R2_CABLE_HARNESS) == 0) && (R2_INVENTORY.getObjectScene(R2_ATTRACTOR_CABLE_HARNESS) == 700) && (_sceneMode != 4))
 				_actor2.animate(ANIM_MODE_5, NULL);
 		}
 	}
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index cf8d214d6b..713d7dc7d0 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -279,7 +279,7 @@ bool Scene1100::Actor17::startAction(CursorType action, Event &event) {
 		break;
 	case R2_SONIC_STUNNER:
 	// No break on purpose
-	case R2_44:
+	case R2_PHOTON_STUNNER:
 		if (_visage == 1105) {
 			R2_GLOBALS._player.disableControl();
 			if (R2_GLOBALS._player._characterIndex == 1) {
@@ -6690,7 +6690,7 @@ bool Scene1550::UnkObj15502::startAction(CursorType action, Event &event) {
 			SceneItem::display(1550, 71, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
 		return true;
 		break;
-	case R2_17:
+	case R2_FUEL_CELL:
 		scene->_field412 = 1;
 		if (_fieldA4 == 6) {
 			R2_GLOBALS._player.disableControl();
@@ -6704,7 +6704,7 @@ bool Scene1550::UnkObj15502::startAction(CursorType action, Event &event) {
 		}
 		return SceneActor::startAction(action, event);
 		break;
-	case R2_18:
+	case R2_GYROSCOPE:
 		scene->_field412 = 1;
 		if (_fieldA4 == 3) {
 			R2_GLOBALS._player.disableControl();
@@ -6718,7 +6718,7 @@ bool Scene1550::UnkObj15502::startAction(CursorType action, Event &event) {
 		}
 		return SceneActor::startAction(action, event);
 		break;
-	case R2_22:
+	case R2_GUIDANCE_MODULE:
 		scene->_field412 = 1;
 		if (_fieldA4 == 1) {
 			R2_GLOBALS._player.disableControl();
@@ -6732,7 +6732,7 @@ bool Scene1550::UnkObj15502::startAction(CursorType action, Event &event) {
 		}
 		return SceneActor::startAction(action, event);
 		break;
-	case R2_23:
+	case R2_THRUSTER_VALVE:
 		scene->_field412 = 1;
 		if (_fieldA4 == 4) {
 			R2_GLOBALS._player.disableControl();
@@ -6743,7 +6743,7 @@ bool Scene1550::UnkObj15502::startAction(CursorType action, Event &event) {
 		}
 		return SceneActor::startAction(action, event);
 		break;
-	case R2_25:
+	case R2_RADAR_MECHANISM:
 		scene->_field412 = 1;
 		if (_fieldA4 == 2) {
 			R2_GLOBALS._player.disableControl();
@@ -6757,7 +6757,7 @@ bool Scene1550::UnkObj15502::startAction(CursorType action, Event &event) {
 		}
 		return SceneActor::startAction(action, event);
 		break;
-	case R2_27:
+	case R2_IGNITOR:
 		scene->_field412 = 1;
 		if (_fieldA4 == 5) {
 			R2_GLOBALS._player.disableControl();
@@ -6768,7 +6768,7 @@ bool Scene1550::UnkObj15502::startAction(CursorType action, Event &event) {
 		}
 		return SceneActor::startAction(action, event);
 		break;
-	case R2_45:
+	case R2_BATTERY:
 		scene->_field412 = 1;
 		if (_fieldA4 == 7) {
 			R2_GLOBALS._player.disableControl();
@@ -6794,37 +6794,37 @@ void Scene1550::UnkObj15502::subA5CDF(int strip) {
 	setup(1517, _fieldA4, 1);
 	switch (_fieldA4 - 1) {
 	case 0:
-		if (R2_INVENTORY.getObjectScene(R2_22) == 0)
+		if (R2_INVENTORY.getObjectScene(R2_GUIDANCE_MODULE) == 0)
 			setFrame(5);
 		setPosition(Common::Point(287, 85));
 		break;
 	case 1:
-		if (R2_INVENTORY.getObjectScene(R2_25) == 0)
+		if (R2_INVENTORY.getObjectScene(R2_RADAR_MECHANISM) == 0)
 			setFrame(5);
 		setPosition(Common::Point(248, 100));
 		break;
 	case 2:
-		if (R2_INVENTORY.getObjectScene(R2_28) == 0)
+		if (R2_INVENTORY.getObjectScene(R2_DIAGNOSTICS_DISPLAY) == 0)
 			setFrame(5);
 		setPosition(Common::Point(217, 85));
 		break;
 	case 3:
-		if (R2_INVENTORY.getObjectScene(R2_23))
+		if (R2_INVENTORY.getObjectScene(R2_THRUSTER_VALVE))
 			setFrame(5);
 		setPosition(Common::Point(161, 121));
 		break;
 	case 4:
-		if (R2_INVENTORY.getObjectScene(R2_27))
+		if (R2_INVENTORY.getObjectScene(R2_IGNITOR))
 			setFrame(5);
 		setPosition(Common::Point(117, 121));
 		break;
 	case 5:
-		if (R2_INVENTORY.getObjectScene(R2_17))
+		if (R2_INVENTORY.getObjectScene(R2_FUEL_CELL))
 			setFrame(5);
 		setPosition(Common::Point(111, 85));
 		break;
 	case 6:
-		if (R2_INVENTORY.getObjectScene(R2_45))
+		if (R2_INVENTORY.getObjectScene(R2_BATTERY))
 			setFrame(5);
 		setPosition(Common::Point(95, 84));
 		break;
@@ -7129,7 +7129,7 @@ bool Scene1550::Actor13::startAction(CursorType action, Event &event) {
 		if (scene->_field415 != 2)
 			return SceneActor::startAction(action, event);
 		
-		if (R2_INVENTORY.getObjectScene(R2_45) == 1550) {
+		if (R2_INVENTORY.getObjectScene(R2_BATTERY) == 1550) {
 			R2_GLOBALS._player.disableControl();
 			scene->_sceneMode = 1564;
 			scene->setAction(&scene->_sequenceManager1, scene, 1564, &R2_GLOBALS._player, NULL);
@@ -7141,7 +7141,7 @@ bool Scene1550::Actor13::startAction(CursorType action, Event &event) {
 		if (scene->_field415 != 2)
 			return SceneActor::startAction(action, event);
 
-		if (R2_INVENTORY.getObjectScene(R2_45) == 1550) {
+		if (R2_INVENTORY.getObjectScene(R2_BATTERY) == 1550) {
 			SceneItem::display(1550, 74, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
 		} else
 			SceneItem::display(1550, 64, 0, 280, 1, 160, 9, 1, 2, 20, 7, 7, -999);
@@ -7184,7 +7184,7 @@ void Scene1550::postInit(SceneObjectList *OwnerList) {
 	SceneExt::postInit();
 	
 	if (R2_GLOBALS._sceneManager._previousScene == -1)
-		R2_GLOBALS.setFlag(R2_16);
+		R2_GLOBALS.setFlag(R2_ATTRACTOR_CABLE_HARNESS);
 
 	if ((R2_GLOBALS._player._characterScene[1] != 1550) && (R2_GLOBALS._player._characterScene[1] != 1580)) {
 		R2_GLOBALS._player._characterScene[1] = 1550;
@@ -7477,7 +7477,7 @@ void Scene1550::signal() {
 	case 1552:
 	// No break on purpose
 	case 1588:
-		R2_INVENTORY.setObjectScene(R2_19, R2_GLOBALS._player._characterIndex);
+		R2_INVENTORY.setObjectScene(R2_AIRBAG, R2_GLOBALS._player._characterIndex);
 		_actor8.remove();
 		_field412 = 0;
 		R2_GLOBALS._player.enableControl();
@@ -7492,7 +7492,7 @@ void Scene1550::signal() {
 	case 1555:
 	// No break on purpose
 	case 1589:
-		R2_INVENTORY.setObjectScene(R2_18, R2_GLOBALS._player._characterIndex);
+		R2_INVENTORY.setObjectScene(R2_GYROSCOPE, R2_GLOBALS._player._characterIndex);
 		_actor10.remove();
 		R2_GLOBALS._player.enableControl();
 		break;
@@ -7516,7 +7516,7 @@ void Scene1550::signal() {
 		_field415 = 2;
 		break;
 	case 1564:
-		R2_INVENTORY.setObjectScene(R2_45, 1);
+		R2_INVENTORY.setObjectScene(R2_BATTERY, 1);
 		_sceneMode = 1565;
 		setAction(&_sequenceManager1, this, 1565, &R2_GLOBALS._player, NULL);
 		break;
@@ -7529,7 +7529,7 @@ void Scene1550::signal() {
 	case 1579:
 		_field412 = 0;
 		_actor1.remove();
-		R2_INVENTORY.setObjectScene(R2_22, 0);
+		R2_INVENTORY.setObjectScene(R2_GUIDANCE_MODULE, 0);
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 1570:
@@ -7537,7 +7537,7 @@ void Scene1550::signal() {
 	case 1580:
 		_field412 = 0;
 		_actor1.remove();
-		R2_INVENTORY.setObjectScene(R2_25, 0);
+		R2_INVENTORY.setObjectScene(R2_RADAR_MECHANISM, 0);
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 1571:
@@ -7545,19 +7545,19 @@ void Scene1550::signal() {
 	case 1581:
 		_field412 = 0;
 		_actor1.remove();
-		R2_INVENTORY.setObjectScene(R2_18, 0);
+		R2_INVENTORY.setObjectScene(R2_GYROSCOPE, 0);
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 1572:
 		_field412 = 0;
 		_actor1.remove();
-		R2_INVENTORY.setObjectScene(R2_23, 0);
+		R2_INVENTORY.setObjectScene(R2_THRUSTER_VALVE, 0);
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 1573:
 		_field412 = 0;
 		_actor1.remove();
-		R2_INVENTORY.setObjectScene(R2_27, 0);
+		R2_INVENTORY.setObjectScene(R2_IGNITOR, 0);
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 1574:
@@ -7565,7 +7565,7 @@ void Scene1550::signal() {
 	case 1582:
 		_field412 = 0;
 		_actor1.remove();
-		R2_INVENTORY.setObjectScene(R2_17, 0);
+		R2_INVENTORY.setObjectScene(R2_FUEL_CELL, 0);
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 1575:
@@ -7573,7 +7573,7 @@ void Scene1550::signal() {
 	case 1583:
 		_field412 = 0;
 		_actor1.remove();
-		R2_INVENTORY.setObjectScene(R2_45, 0);
+		R2_INVENTORY.setObjectScene(R2_BATTERY, 0);
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 1576:
@@ -7598,14 +7598,14 @@ void Scene1550::signal() {
 	case 1586:
 	// No break on purpose
 	case 1587:
-		R2_INVENTORY.setObjectScene(R2_28, R2_GLOBALS._player._characterIndex);
+		R2_INVENTORY.setObjectScene(R2_DIAGNOSTICS_DISPLAY, R2_GLOBALS._player._characterIndex);
 		_actor1.remove();
 		_field412 = 0;
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 1592:
 		_actor9.remove();
-		R2_INVENTORY.setObjectScene(R2_26, 1);
+		R2_INVENTORY.setObjectScene(R2_JOYSTICK, 1);
 		if (R2_GLOBALS._player._characterIndex == 1) {
 			R2_GLOBALS._v565EC[2] = R2_GLOBALS._v565EC[1];
 			R2_GLOBALS._v565EC[4] = R2_GLOBALS._v565EC[3];
@@ -8393,7 +8393,7 @@ void Scene1550::subA2B2F() {
 				R2_GLOBALS._walkRegions.enableRegion(k5A78D);
 				R2_GLOBALS._walkRegions.enableRegion(k5A790);
 				R2_GLOBALS._walkRegions.enableRegion(k5A791);
-				if (R2_INVENTORY.getObjectScene(R2_26) == 1550) {
+				if (R2_INVENTORY.getObjectScene(R2_JOYSTICK) == 1550) {
 					_actor9.postInit();
 					_actor9.setup(1562, 3, 1);
 					_actor9.setPosition(Common::Point(150, 70));
@@ -8482,7 +8482,7 @@ void Scene1550::subA2B2F() {
 				_actor1.setPosition(Common::Point(259, 133));
 				_actor1.fixPriority(105);
 				_actor1.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
-				if (R2_INVENTORY.getObjectScene(R2_18) == 1550) {
+				if (R2_INVENTORY.getObjectScene(R2_GYROSCOPE) == 1550) {
 					_actor10.postInit();
 					_actor10.setup(1550, 7, 2);
 					_actor10.setPosition(Common::Point(227, 30));
@@ -8501,7 +8501,7 @@ void Scene1550::subA2B2F() {
 				_actor1.setup(1550, 1, 3);
 				_actor1.setPosition(Common::Point(76, 64));
 				_actor1.setDetails(1550, 9, -1, -1, 2, (SceneItem *) NULL);
-				if (R2_INVENTORY.getObjectScene(R2_28) == 1550) {
+				if (R2_INVENTORY.getObjectScene(R2_DIAGNOSTICS_DISPLAY) == 1550) {
 					_actor11.postInit();
 					_actor11.setup(1504, 4, 1);
 					_actor11.setPosition(Common::Point(49, 35));
@@ -8510,7 +8510,7 @@ void Scene1550::subA2B2F() {
 					_actor11.fixPriority(65);
 					_actor11.setDetails(1550, 14, 15, 63, 2, (SceneItem *) NULL);
 				}
-				if (R2_INVENTORY.getObjectScene(R2_19) == 1550) {
+				if (R2_INVENTORY.getObjectScene(R2_AIRBAG) == 1550) {
 					_actor8.postInit();
 					_actor8.setup(1550, 7, 1);
 					_actor8.setPosition(Common::Point(45, 44));
@@ -9050,7 +9050,7 @@ void Scene1580::synchronize(Serializer &s) {
 bool Scene1580::Hotspot1::startAction(CursorType action, Event &event) {
 	Scene1580 *scene = (Scene1580 *)R2_GLOBALS._sceneManager._scene;
 
-	if (action == R2_26) {
+	if (action == R2_JOYSTICK) {
 		R2_INVENTORY.setObjectScene(26, 1580);
 		R2_GLOBALS._sceneItems.remove(&scene->_item1);
 		scene->_actor2.postInit();
@@ -9069,7 +9069,7 @@ bool Scene1580::Hotspot1::startAction(CursorType action, Event &event) {
 bool Scene1580::Hotspot2::startAction(CursorType action, Event &event) {
 	Scene1580 *scene = (Scene1580 *)R2_GLOBALS._sceneManager._scene;
 
-	if (action == R2_28) {
+	if (action == R2_DIAGNOSTICS_DISPLAY) {
 		R2_INVENTORY.setObjectScene(28, 1580);
 		R2_GLOBALS._player.disableControl();
 		R2_GLOBALS._sceneItems.remove(&scene->_item2);
@@ -9171,14 +9171,14 @@ bool Scene1580::Actor6::startAction(CursorType action, Event &event) {
 			return true;
 		}
 		break;
-	case R2_9:
+	case R2_COM_SCANNER:
 		scene->_sceneMode = 30;
 		R2_GLOBALS._player.disableControl();
 		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
 		scene->_stripManager.start(529, scene);
 		return true;
 		break;
-	case R2_39:
+	case R2_COM_SCANNER_2:
 		scene->_sceneMode = 30;
 		R2_GLOBALS._player.disableControl();
 		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
@@ -9203,14 +9203,14 @@ bool Scene1580::Actor7::startAction(CursorType action, Event &event) {
 			return true;
 		}
 		break;
-	case R2_9:
+	case R2_COM_SCANNER:
 		scene->_sceneMode = 30;
 		R2_GLOBALS._player.disableControl();
 		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
 		scene->_stripManager.start(529, scene);
 		return true;
 		break;
-	case R2_39:
+	case R2_COM_SCANNER_2:
 		scene->_sceneMode = 30;
 		R2_GLOBALS._player.disableControl();
 		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
@@ -10442,7 +10442,7 @@ void Scene1800::synchronize(Serializer &s) {
 }
 
 bool Scene1800::Hotspot5::startAction(CursorType action, Event &event) {
-	if ((action != R2_9) && (action != R2_39))
+	if ((action != R2_COM_SCANNER) && (action != R2_COM_SCANNER_2))
 		return false;
 	
 	Scene1800 *scene = (Scene1800 *)R2_GLOBALS._sceneManager._scene;
@@ -11231,10 +11231,10 @@ void Scene1900::postInit(SceneObjectList *OwnerList) {
 	_stripManager.setFontNumber(3);
 	_stripManager.addSpeaker(&_seekerSpeaker);
 	
-	_exit1.setDetails(Rect(0, 105, 14, 145), R2_9, 2000);
+	_exit1.setDetails(Rect(0, 105, 14, 145), R2_COM_SCANNER, 2000);
 	_exit1.setDest(Common::Point(14, 135));
 
-	_exit2.setDetails(Rect(305, 105, 320, 145), R2_10, 2000);
+	_exit2.setDetails(Rect(305, 105, 320, 145), R2_SPENT_POWER_CAPSULE, 2000);
 	_exit2.setDest(Common::Point(315, 135));
 
 	R2_GLOBALS._player.postInit();
@@ -11752,7 +11752,7 @@ bool Scene1945::Hotspot3::startAction(CursorType action, Event &event) {
 	Scene1945 *scene = (Scene1945 *)R2_GLOBALS._sceneManager._scene;
 
 	switch (action) {
-	case R2_37:
+	case R2_GUNPOWDER:
 		R2_GLOBALS._player.disableControl();
 		scene->_sceneMode = 0;
 		if ((R2_GLOBALS._player._position.x == 191) && (R2_GLOBALS._player._position.y == 142))
@@ -11817,7 +11817,7 @@ bool Scene1945::Hotspot4::startAction(CursorType action, Event &event) {
 }
 
 bool Scene1945::Actor3::startAction(CursorType action, Event &event) {
-	if ((action == R2_50) && (action == R2_49)) {
+	if ((action == R2_ALCOHOL_LAMP_3) && (action == R2_ALCOHOL_LAMP_2)) {
 		Scene1945 *scene = (Scene1945 *)R2_GLOBALS._sceneManager._scene;
 
 		scene->_fieldEAE = action;
@@ -11981,7 +11981,7 @@ void Scene1945::signal() {
 		}
 		return;
 	case 1942:
-		R2_INVENTORY.setObjectScene(R2_37, 0);
+		R2_INVENTORY.setObjectScene(R2_GUNPOWDER, 0);
 		_actor3.setDetails(1945, 15, -1, -1, 2, (SceneItem *) NULL);
 		R2_GLOBALS.setFlag(42);
 		break;
@@ -12239,7 +12239,7 @@ bool Scene1950::Hotspot2::startAction(CursorType action, Event &event) {
 }
 
 bool Scene1950::Actor2::startAction(CursorType action, Event &event) {
-	if (action != R2_31)
+	if (action != R2_SCRITH_KEY)
 		return SceneActor::startAction(action, event);
 
 	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
@@ -12416,7 +12416,7 @@ void Scene1950::Actor8::signal() {
 bool Scene1950::Actor8::startAction(CursorType action, Event &event) {
 	Scene1950 *scene = (Scene1950 *)R2_GLOBALS._sceneManager._scene;
 
-	if ((R2_GLOBALS._v56613[(scene->_field41C - 1) * 4] == 0) || (action != R2_44))
+	if ((R2_GLOBALS._v56613[(scene->_field41C - 1) * 4] == 0) || (action != R2_PHOTON_STUNNER))
 		return SceneActor::startAction(action, event);
 	
 	R2_GLOBALS._player.disableControl();
@@ -13826,7 +13826,7 @@ void Scene1950::signal() {
 void Scene1950::process(Event &event) {
 	if ( (event.eventType == EVENT_BUTTON_DOWN)
 		&& (R2_GLOBALS._player._uiEnabled) 
-		&& (R2_GLOBALS._events.getCursor() == R2_47)
+		&& (R2_GLOBALS._events.getCursor() == R2_LIGHT_BULB)
 		&& (R2_GLOBALS._player._bounds.contains(event.mousePos))
 		&& (R2_INVENTORY.getObjectScene(31) == 0)) {
 		event.handled = true;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index 3cc541493d..5567519046 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -1269,13 +1269,13 @@ void Scene2400::signal() {
 bool Scene2425::Item1::startAction(CursorType action, Event &event) {
 	Scene2425 *scene = (Scene2425 *)R2_GLOBALS._sceneManager._scene;
 
-	if ((action == R2_37) && (!R2_GLOBALS.getFlag(84))) {
+	if ((action == R2_GUNPOWDER) && (!R2_GLOBALS.getFlag(84))) {
 		R2_GLOBALS._player.disableControl();
 		scene->_sceneMode = 2426;
 		scene->setAction(&scene->_sequenceManager, scene, 2426, &R2_GLOBALS._player, &scene->_actor1, NULL);
 		R2_GLOBALS.setFlag(84);
 		return true;
-	} else if (action == R2_37) {
+	} else if (action == R2_GUNPOWDER) {
 		R2_GLOBALS._events.setCursor(R2_STEPPING_DISKS);
 		R2_GLOBALS._player.enableControl(R2_STEPPING_DISKS);
 		return NamedHotspot::startAction(R2_STEPPING_DISKS, event);
@@ -1286,13 +1286,13 @@ bool Scene2425::Item1::startAction(CursorType action, Event &event) {
 bool Scene2425::Item2::startAction(CursorType action, Event &event) {
 	Scene2425 *scene = (Scene2425 *)R2_GLOBALS._sceneManager._scene;
 
-	if ((action == R2_37) && (R2_GLOBALS.getFlag(84))) {
+	if ((action == R2_GUNPOWDER) && (R2_GLOBALS.getFlag(84))) {
 		R2_GLOBALS._player.disableControl();
 		scene->_sceneMode = 2427;
 		scene->setAction(&scene->_sequenceManager, scene, 2427, &R2_GLOBALS._player, &scene->_actor1, NULL);
 		R2_GLOBALS.clearFlag(84);
 		return true;
-	} else if (action == R2_37) {
+	} else if (action == R2_GUNPOWDER) {
 		R2_GLOBALS._events.setCursor(R2_STEPPING_DISKS);
 		R2_GLOBALS._player.enableControl(R2_STEPPING_DISKS);
 		return NamedHotspot::startAction(R2_STEPPING_DISKS, event);
@@ -1303,7 +1303,7 @@ bool Scene2425::Item2::startAction(CursorType action, Event &event) {
 bool Scene2425::Item3::startAction(CursorType action, Event &event) {
 	Scene2425 *scene = (Scene2425 *)R2_GLOBALS._sceneManager._scene;
 
-	if (action != R2_37)
+	if (action != R2_GUNPOWDER)
 		return NamedHotspot::startAction(action, event);
 	else {
 		R2_GLOBALS._player.disableControl();
@@ -1320,7 +1320,7 @@ bool Scene2425::Item3::startAction(CursorType action, Event &event) {
 }
 
 bool Scene2425::Item4::startAction(CursorType action, Event &event) {
-	if (action != R2_37)
+	if (action != R2_GUNPOWDER)
 		return NamedHotspot::startAction(action, event);
 	else {
 		R2_GLOBALS._events.setCursor(R2_STEPPING_DISKS);
@@ -1332,19 +1332,19 @@ bool Scene2425::Item4::startAction(CursorType action, Event &event) {
 bool Scene2425::Actor1::startAction(CursorType action, Event &event) {
 	if (action == R2_STEPPING_DISKS) {
 		if (R2_GLOBALS._player._characterIndex == 2) {
-			R2_GLOBALS._events.setCursor(R2_37);
+			R2_GLOBALS._events.setCursor(R2_GUNPOWDER);
 			return true;
 		} else {
 			return SceneActor::startAction(action, event);
 		}
-	} else if (R2_GLOBALS._events.getCursor() == R2_37)
+	} else if (R2_GLOBALS._events.getCursor() == R2_GUNPOWDER)
 		return false;
 	else 
 		return SceneActor::startAction(action, event);
 }
 
 bool Scene2425::Actor2::startAction(CursorType action, Event &event) {
-	if (action != R2_37)
+	if (action != R2_GUNPOWDER)
 		return SceneActor::startAction(action, event);
 	else {
 		R2_GLOBALS._events.setCursor(R2_STEPPING_DISKS);
@@ -1601,12 +1601,12 @@ void Scene2430::signal() {
 		break;
 	case 2430:
 		_actor2.remove();
-		R2_INVENTORY.setObjectScene(R2_37, 2);
+		R2_INVENTORY.setObjectScene(R2_GUNPOWDER, 2);
 		R2_GLOBALS._player.enableControl();
 		break;
 	case 2435:
 		_actor3.remove();
-		R2_INVENTORY.setObjectScene(R2_50, 2);
+		R2_INVENTORY.setObjectScene(R2_ALCOHOL_LAMP_3, 2);
 		R2_GLOBALS._player.enableControl();
 		break;
 	default:
@@ -1627,18 +1627,18 @@ bool Scene2435::Actor2::startAction(CursorType action, Event &event) {
 	Scene2435 *scene = (Scene2435 *)R2_GLOBALS._sceneManager._scene;
 
 	switch (action) {
-	case R2_34:
+	case R2_SAPPHIRE_BLUE:
 		R2_GLOBALS._player.disableControl();
 		R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 		R2_GLOBALS.setFlag(82);
 		scene->_stripManager.start(603, scene);
 		return true;
-	case R2_35:
+	case R2_ANCIENT_SCROLLS:
 		R2_GLOBALS._player.disableControl();
 		R2_GLOBALS._events.setCursor(CURSOR_ARROW);
 		R2_GLOBALS.setFlag(82);
 		scene->_stripManager.start(602, scene);
-		R2_INVENTORY.setObjectScene(R2_35, 2000);
+		R2_INVENTORY.setObjectScene(R2_ANCIENT_SCROLLS, 2000);
 		return true;
 	case CURSOR_TALK:
 		R2_GLOBALS._player.disableControl();
@@ -1647,7 +1647,7 @@ bool Scene2435::Actor2::startAction(CursorType action, Event &event) {
 		if ((R2_GLOBALS._player._characterIndex == 1) || (R2_GLOBALS.getFlag(82))) {
 			scene->_stripManager.start(605, scene);
 			return true;
-		} else if (R2_INVENTORY.getObjectScene(R2_35) == 2) {
+		} else if (R2_INVENTORY.getObjectScene(R2_ANCIENT_SCROLLS) == 2) {
 			scene->_stripManager.start(601, scene);
 			return true;
 		} else {
@@ -2204,7 +2204,7 @@ void Scene2450::signal() {
 bool Scene2455::Actor1::startAction(CursorType action, Event &event) {
 	Scene2455 *scene = (Scene2455 *)R2_GLOBALS._sceneManager._scene;
 
-	if (action == R2_29) {
+	if (action == R2_GLASS_DOME) {
 		if ((R2_INVENTORY.getObjectScene(49) == 2455) || (R2_INVENTORY.getObjectScene(50) == 2455)) {
 			R2_GLOBALS._player.disableControl();
 			scene->_sceneMode = 2458;
@@ -2224,7 +2224,7 @@ bool Scene2455::Actor2::startAction(CursorType action, Event &event) {
 	Scene2455 *scene = (Scene2455 *)R2_GLOBALS._sceneManager._scene;
 
 	switch (action) {
-	case R2_49:
+	case R2_ALCOHOL_LAMP_2:
 		if (R2_INVENTORY.getObjectScene(50) != 2455) {
 			R2_GLOBALS._player.disableControl();
 			scene->_actor1.postInit();
@@ -2236,7 +2236,7 @@ bool Scene2455::Actor2::startAction(CursorType action, Event &event) {
 			return true;
 		}
 		break;
-	case R2_50:
+	case R2_ALCOHOL_LAMP_3:
 		if (R2_INVENTORY.getObjectScene(49) != 2455) {
 			R2_GLOBALS._player.disableControl();
 			scene->_actor1.postInit();
@@ -3513,7 +3513,7 @@ void Scene2700::signal() {
 }
 void Scene2700::process(Event &event) {
 	if ((R2_GLOBALS._player._canWalk) && (event.eventType == EVENT_BUTTON_DOWN)) {
-		if (R2_GLOBALS._events.getCursor() == R2_36) {
+		if (R2_GLOBALS._events.getCursor() == R2_FLUTE) {
 			if (R2_GLOBALS._player._bounds.contains(event.mousePos)) {
 				_sceneMode = 10;
 				_field414 = 2710;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 99bcf3df44..2b97cba8e9 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -385,7 +385,7 @@ bool Scene3150::Item5::startAction(CursorType action, Event &event) {
 		scene->_sceneMode = 3154;
 		scene->setAction(&scene->_sequenceManager, scene, 3154, &R2_GLOBALS._player, &scene->_actor3, NULL);
 		return true;
-	case R2_40:
+	case R2_SUPERCONDUCTOR_WIRE:
 		if ((R2_INVENTORY.getObjectScene(47) != 3150) && (R2_GLOBALS.getFlag(75))) {
 			R2_GLOBALS._player.disableControl();
 			scene->_actor3.postInit();
@@ -407,7 +407,7 @@ bool Scene3150::Item6::startAction(CursorType action, Event &event) {
 	Scene3150 *scene = (Scene3150 *)R2_GLOBALS._sceneManager._scene;
 
 	switch (action) {
-	case R2_41:
+	case R2_PILLOW:
 		R2_GLOBALS._player.disableControl();
 		scene->_actor4.postInit();
 		scene->_actor4._effect = 6;
@@ -416,7 +416,7 @@ bool Scene3150::Item6::startAction(CursorType action, Event &event) {
 		scene->_sceneMode = 3158;
 		scene->setAction(&scene->_sequenceManager, scene, 3158, &R2_GLOBALS._player, &scene->_actor4, NULL);
 		return true;
-	case R2_42:
+	case R2_FOOD_TRAY:
 		if ((R2_INVENTORY.getObjectScene(47) != 3150) && (R2_INVENTORY.getObjectScene(40) == 3150) && (R2_GLOBALS.getFlag(75))) {
 			scene->_actor5.postInit();
 			scene->_actor5._effect = 6;
@@ -447,7 +447,7 @@ bool Scene3150::Actor4::startAction(CursorType action, Event &event) {
 		scene->_sceneMode = 3151;
 		scene->setAction(&scene->_sequenceManager, scene, 3151, &R2_GLOBALS._player, &scene->_actor4, NULL);
 		return true;
-	case R2_42:
+	case R2_FOOD_TRAY:
 		return false;
 	default:
 		return SceneActor::startAction(action, event);
@@ -498,7 +498,7 @@ bool Scene3150::Actor6::startAction(CursorType action, Event &event) {
 bool Scene3150::Actor7::startAction(CursorType action, Event &event) {
 	Scene3150 *scene = (Scene3150 *)R2_GLOBALS._sceneManager._scene;
 
-	if ((action == R2_43) && (!R2_GLOBALS.getFlag(80))) {
+	if ((action == R2_LASER_HACKSAW) && (!R2_GLOBALS.getFlag(80))) {
 		R2_GLOBALS._player.disableControl();
 		scene->_sceneMode = 3160;
 		scene->setAction(&scene->_sequenceManager, scene, 3160, &R2_GLOBALS._player, &scene->_actor7, NULL);
@@ -4325,7 +4325,7 @@ bool Scene3600::Actor13::startAction(CursorType action, Event &event) {
 		return true;
 	case R2_SONIC_STUNNER:
 	// No break on purpose
-	case R2_44:
+	case R2_PHOTON_STUNNER:
 		if (action == R2_SONIC_STUNNER)
 			R2_GLOBALS._sound3.play(43);
 		else
diff --git a/engines/tsage/user_interface.cpp b/engines/tsage/user_interface.cpp
index 428bf8c038..ca9fddc6ce 100644
--- a/engines/tsage/user_interface.cpp
+++ b/engines/tsage/user_interface.cpp
@@ -82,7 +82,7 @@ void UIQuestion::showDescription(CursorType cursor) {
 		}
 		break;
 	case GType_Ringworld2:
-		if ((cursor == R2_9) || (cursor == R2_39)) {
+		if ((cursor == R2_COM_SCANNER) || (cursor == R2_COM_SCANNER_2)) {
 			// Show communicator
 			warning("TODO: Communicator");
 		} else {