[Scummvm-cvs-logs] scummvm master -> 9e6f3c5964962ca15f4663e75174ca87852334de

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9e6f3c5964 TSAGE: R2R - some renaming in scene 1337


Commit: 9e6f3c5964962ca15f4663e75174ca87852334de
    https://github.com/scummvm/scummvm/commit/9e6f3c5964962ca15f4663e75174ca87852334de
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-10-07T01:55:31+02:00

Commit Message:
TSAGE: R2R - some renaming in scene 1337

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes1.cpp
    engines/tsage/ringworld2/ringworld2_scenes1.h



diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 393e3d1..1de1d3d 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -3884,11 +3884,11 @@ void Scene1337::Action10::signal() {
 		if (found) {
 			switch (scene->_actionPlayerIdx) {
 			case 0:
-				scene->subC51A0(&scene->_gameBoardSide[0]._handCard[indexFound], scene->_actionCard3);
+				scene->playInterceptorCard(&scene->_gameBoardSide[0]._handCard[indexFound], scene->_actionCard3);
 				found2 = true;
 				break;
 			case 1:
-				scene->subC51A0(&scene->_gameBoardSide[1]._handCard[indexFound], scene->_actionCard3);
+				scene->playInterceptorCard(&scene->_gameBoardSide[1]._handCard[indexFound], scene->_actionCard3);
 				found2 = true;
 				break;
 			case 2:
@@ -3896,12 +3896,12 @@ void Scene1337::Action10::signal() {
 				if (MessageDialog::show(USE_INTERCEPTOR, NO_MSG, YES_MSG) == 0)
 					scene->subC4CEC();
 				else {
-					scene->subC51A0(&scene->_gameBoardSide[2]._handCard[indexFound], scene->_actionCard3);
+					scene->playInterceptorCard(&scene->_gameBoardSide[2]._handCard[indexFound], scene->_actionCard3);
 					found2 = true;
 				}
 				break;
 			case 3:
-				scene->subC51A0(&scene->_gameBoardSide[3]._handCard[indexFound], scene->_actionCard3);
+				scene->playInterceptorCard(&scene->_gameBoardSide[3]._handCard[indexFound], scene->_actionCard3);
 				found2 = true;
 				break;
 			default:
@@ -3976,7 +3976,7 @@ void Scene1337::Action10::signal() {
 	}
 }
 
-// Use Thieft card (#25) and pick a card from the opponent
+// Use Thief card (#25) and pick a card from the opponent
 void Scene1337::Action11::signal() {
 	Scene1337 *scene = (Scene1337 *)R2_GLOBALS._sceneManager._scene;
 
@@ -4380,6 +4380,7 @@ void Scene1337::Action12::signal() {
 	}
 }
 
+// Handle the animations of the interceptor card
 void Scene1337::Action13::signal() {
 	Scene1337 *scene = (Scene1337 *)R2_GLOBALS._sceneManager._scene;
 
@@ -5136,7 +5137,8 @@ void Scene1337::subC4CEC() {
 	}
 }
 
-void Scene1337::subC51A0(Card *subObj1, Card *subObj2) {
+// Play Interceptor card
+void Scene1337::playInterceptorCard(Card *subObj1, Card *subObj2) {
 	_actionCard1 = subObj1;
 	_actionCard2 = subObj2;
 
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.h b/engines/tsage/ringworld2/ringworld2_scenes1.h
index 0b86809..6c24a4e 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.h
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.h
@@ -372,7 +372,7 @@ public:
 	void discardCard(Card *card);
 	void subC4CD2();
 	void subC4CEC();
-	void subC51A0(Card *subObj1, Card *subObj2);
+	void playInterceptorCard(Card *subObj1, Card *subObj2);
 	void displayDialog(int dialogNumb);
 	void subPostInit();
 	void displayInstructions();