diff options
| author | Strangerke | 2014-02-16 18:32:36 +0100 | 
|---|---|---|
| committer | Strangerke | 2014-02-16 18:32:36 +0100 | 
| commit | 0261045ead709702b92b22530b59e8267b8da5db (patch) | |
| tree | 236c0a91b0c54290799412f348ee6657185bbcb4 | |
| parent | 2bc174a3d05e39b415cdae951afff03b2ef3654b (diff) | |
| download | scummvm-rg350-0261045ead709702b92b22530b59e8267b8da5db.tar.gz scummvm-rg350-0261045ead709702b92b22530b59e8267b8da5db.tar.bz2 scummvm-rg350-0261045ead709702b92b22530b59e8267b8da5db.zip  | |
TSAGE: Janitorial - Remove trailing spaces
| -rw-r--r-- | engines/tsage/blue_force/blueforce_scenes4.cpp | 2 | ||||
| -rw-r--r-- | engines/tsage/core.cpp | 2 | ||||
| -rw-r--r-- | engines/tsage/graphics.cpp | 4 | ||||
| -rw-r--r-- | engines/tsage/ringworld/ringworld_scenes1.cpp | 2 | ||||
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_logic.cpp | 2 | ||||
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes0.cpp | 8 | ||||
| -rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes1.cpp | 38 | 
7 files changed, 29 insertions, 29 deletions
diff --git a/engines/tsage/blue_force/blueforce_scenes4.cpp b/engines/tsage/blue_force/blueforce_scenes4.cpp index 2b4c0ff348..4eb848cfa4 100644 --- a/engines/tsage/blue_force/blueforce_scenes4.cpp +++ b/engines/tsage/blue_force/blueforce_scenes4.cpp @@ -140,7 +140,7 @@ void Scene410::Action5::signal() {  			ADD_PLAYER_MOVER(114, 133);  		} else {  			ADD_PLAYER_MOVER(195, 139); -		}  +		}  		break;  	case 1:  		BF_GLOBALS._player.updateAngle(scene->_passenger._position); diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp index ba14830add..25570b3272 100644 --- a/engines/tsage/core.cpp +++ b/engines/tsage/core.cpp @@ -2721,7 +2721,7 @@ GfxSurface SceneObject::getFrame() {  	_visageImages.setVisage(_visage, _strip);  	GfxSurface frame = _visageImages.getFrame(_frame); -	// Reset any centroid adjustment flags, in  +	// Reset any centroid adjustment flags, in  	frame._flags &= ~(FRAME_FLIP_CENTROID_X | FRAME_FLIP_CENTROID_Y);  	// For later games, check whether the appropriate object flags are set for flipping diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp index eb7adbe53a..622a979dac 100644 --- a/engines/tsage/graphics.cpp +++ b/engines/tsage/graphics.cpp @@ -199,9 +199,9 @@ void Rect::resize(const GfxSurface &surface, int xp, int yp, int percent) {  	this->moveTo(xp, yp); -	int xa = (surface._flags & FRAME_FLIP_CENTROID_X) == 0 ? surface._centroid.x :  +	int xa = (surface._flags & FRAME_FLIP_CENTROID_X) == 0 ? surface._centroid.x :  		bounds.width() - (surface._centroid.x + 1); -	int ya = (surface._flags & FRAME_FLIP_CENTROID_Y) == 0 ? surface._centroid.y :  +	int ya = (surface._flags & FRAME_FLIP_CENTROID_Y) == 0 ? surface._centroid.y :  		bounds.height() - (surface._centroid.y + 1);  	int xd = xa * percent / 100; diff --git a/engines/tsage/ringworld/ringworld_scenes1.cpp b/engines/tsage/ringworld/ringworld_scenes1.cpp index df456f9ced..c2dcebd438 100644 --- a/engines/tsage/ringworld/ringworld_scenes1.cpp +++ b/engines/tsage/ringworld/ringworld_scenes1.cpp @@ -1789,7 +1789,7 @@ Scene50::Scene50() :  		_background(0, CURSOR_LOOK, 50, 3, LIST_END),  		_item1(0, OBJECT_SCANNER, 50, 15, CURSOR_USE, 50, 16, CURSOR_LOOK, 50, 3, LIST_END),  		_entrance(0, CURSOR_LOOK, 50, 7, LIST_END), -		// The original was using dialog 50/3 for CURSOR_LOOK, which is too generic.  +		// The original was using dialog 50/3 for CURSOR_LOOK, which is too generic.  		_bulwark(8, OBJECT_STUNNER, 50, 14, OBJECT_SCANNER, 50, 13, CURSOR_LOOK, 30, 0, LIST_END),  		_tree(9, OBJECT_SCANNER, 40, 39, OBJECT_STUNNER, 40, 40, CURSOR_USE, 40, 41, CURSOR_LOOK, 50, 5, LIST_END),  		_flagstones(10, OBJECT_SCANNER, 50, 17, OBJECT_STUNNER, 50, 18, CURSOR_LOOK, 50, 6, CURSOR_USE, 30, 8, LIST_END) { diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp index c67e5c18c2..1f958d5d6f 100644 --- a/engines/tsage/ringworld2/ringworld2_logic.cpp +++ b/engines/tsage/ringworld2/ringworld2_logic.cpp @@ -294,7 +294,7 @@ Scene *Ringworld2Game::createScene(int sceneNumber) {  		// Confrontation  		return new Scene3400();  	case 3500: -		// Flub tube maze  +		// Flub tube maze  		return new Scene3500();  	case 3600:  		// Cutscene - walking at gunpoint diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp index fc7e34bc16..d33ad9eb68 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp @@ -2561,7 +2561,7 @@ void Scene205Demo::postInit(SceneObjectList *OwnerList) {  	loadScene(1000);  	R2_GLOBALS._uiElements._active = false;  	R2_GLOBALS._player.enableControl(); -	 +  	SceneExt::postInit();  	_sound1.play(337); @@ -4158,8 +4158,8 @@ void Scene325::signal() {  			if (R2_GLOBALS.getFlag(44) && !R2_GLOBALS.getFlag(51)) {  				if (v != 13) {  					if (_priorConsoleAction == 6) { -					// Fix for original game bug.  -					// The passive short scan geographical and astronomical sentences  +					// Fix for original game bug. +					// The passive short scan geographical and astronomical sentences  					// are inverted in the original game.  						if (v == 6)  							v = 8; @@ -5784,7 +5784,7 @@ void Scene600::Smoke::draw() {  	Graphics::Surface screen = g_globals->gfxManager().getSurface().lockSurface();  	byte *pixelMap = static_cast<Scene600 *>(R2_GLOBALS._sceneManager._scene)->_pixelMap; -	// Loop through every pixel of the frame. Any pixel of the frame that's not a  +	// Loop through every pixel of the frame. Any pixel of the frame that's not a  	// tranparency, get the same pixel from the screen background, and shade it using  	// the scene's pixel translation map  	for (int yp = 0; yp < s.h; ++yp) { diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp index 486c88e65d..058a1cb8be 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp @@ -2277,11 +2277,11 @@ void Scene1337::Action1337::waitFrames(int32 frameCount) {  		g_globals->_events.getEvent(event);  		curFrame = g_globals->_events.getFrameNumber();  	} -	 +  	// CHECKME: The original is calling _eventManager.waitEvent();  } -/**  +/**   * Display instructions   */  void Scene1337::Action1::signal() { @@ -3366,7 +3366,7 @@ void Scene1337::Action3::signal() {  	}  } -/**  +/**   * Action used to handle the other players' turn   */  void Scene1337::Action4::signal() { @@ -3542,7 +3542,7 @@ void Scene1337::Action4::signal() {  	}  } -/**  +/**   * Animations for discarding a card   */  void Scene1337::Action5::signal() { @@ -3587,7 +3587,7 @@ void Scene1337::Action5::signal() {  	}  } -/**  +/**   * Animations for playing a platform card   */  void Scene1337::Action6::signal() { @@ -4529,9 +4529,9 @@ void Scene1337::actionDisplay(int resNum, int lineNum, int x, int y, int keepOnS  	// TODO: Check if it's normal that arg5 is unused and replaced by an hardcoded 0 value  	// May hide an original bug -	SceneItem::display(resNum, lineNum, SET_X, x, SET_Y, y, SET_KEEP_ONSCREEN, 0,  -		               SET_WIDTH, width, SET_POS_MODE, -1, SET_TEXT_MODE, textMode,  -					   SET_FONT, fontNum, SET_FG_COLOR, colFG, SET_EXT_BGCOLOR, colBGExt,  +	SceneItem::display(resNum, lineNum, SET_X, x, SET_Y, y, SET_KEEP_ONSCREEN, 0, +		               SET_WIDTH, width, SET_POS_MODE, -1, SET_TEXT_MODE, textMode, +					   SET_FONT, fontNum, SET_FG_COLOR, colFG, SET_EXT_BGCOLOR, colBGExt,  					   SET_EXT_FGCOLOR, colFGExt, LIST_END);  } @@ -5956,7 +5956,7 @@ void Scene1337::handlePlayer1() {  						break;  				}  			} -			// The original was only updating in the rndVal block,  +			// The original was only updating in the rndVal block,  			// which was a bug as the checks were stopping at this point  			rndVal--;  			if (rndVal < 0) @@ -6261,7 +6261,7 @@ void Scene1337::handlePlayer2() {  		return;  	} else {  		// The original code is calling a function full of dead code. -		// Only this message remains after a cleanup.  +		// Only this message remains after a cleanup.  		MessageDialog::show(WRONG_ANSWER_MSG, OK_BTN_STRING);  		//  		handleAutoplayPlayer2(); @@ -6635,11 +6635,11 @@ void Scene1337::setCursorData(int resNum, int rlbNum, int frameNum) {  	_cursorCurFrame = frameNum;  	if (!frameNum) { -		// Should be a hardcoded cursor displaying only a dot.  +		// Should be a hardcoded cursor displaying only a dot.  		// FIXME: Use another cursor when possible  		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);  	} else { -		// TODO: The original was using some ressource caching, which was useless and complex  +		// TODO: The original was using some ressource caching, which was useless and complex  		// and which has been removed. This cursor behavior clearly made intensive use of this caching...  		// We now have to find a way to cache these cursor pointers and avoid loading them multiple times per seconds  		uint size; @@ -6697,7 +6697,7 @@ void Scene1337::OptionsDialog::show() {  		R2_GLOBALS._sceneManager.changeScene(125);  	else if (btn == &dlg->_restartGame)  		R2_GLOBALS._sceneManager.changeScene(1330); -	 +  	// Remove the dialog  	dlg->remove();  	delete dlg; @@ -8560,7 +8560,7 @@ void Scene1550::enterArea() {  	int varA = 0; -	// This section handles checks if the ARM spacecraft have not yet seized  +	// This section handles checks if the ARM spacecraft have not yet seized  	// control of Lance of Truth.  	if (!R2_GLOBALS.getFlag(16)) {  		switch (R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y - 2) { @@ -8654,9 +8654,9 @@ void Scene1550::enterArea() {  		default:  			break;  		} -		if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y > 0) &&  -				(R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x <= 29) &&  -				((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x < 20) ||  +		if ((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y > 0) && +				(R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x <= 29) && +				((R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].x < 20) ||  				(R2_GLOBALS._s1550PlayerArea[R2_GLOBALS._player._characterIndex].y > 7))) {  			// In an area where the cutscene can be triggered, so start it  			R2_GLOBALS.setFlag(16); @@ -11095,7 +11095,7 @@ bool Scene1800::Doors::startAction(CursorType action, Event &event) {  		} else {  			// Seeker failing to force open doors  			scene->_sceneMode = 1813; -			// Original was using 1813 in setAction too, but it somewhat broken.  +			// Original was using 1813 in setAction too, but it somewhat broken.  			// Seeker goes 2 pixels to high, hiding behind the door  			scene->setAction(&scene->_sequenceManager, scene, 1808, &R2_GLOBALS._player, &scene->_doors, NULL);  		} @@ -13182,7 +13182,7 @@ bool Scene1945::Ladder::startAction(CursorType action, Event &event) {  	} else if (  ((R2_GLOBALS._player._position.x == 197) && (R2_GLOBALS._player._position.y == 158))  		      || ((R2_GLOBALS._player._position.x == 191) && (R2_GLOBALS._player._position.y == 142)) ) {  		scene->_sceneMode = 1947; -	} else if ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 50)  +	} else if ((R2_GLOBALS._player._position.x == 154) && (R2_GLOBALS._player._position.y == 50)  			&& (event.mousePos.y >= 30)) {  		scene->_sceneMode = 1940;  	} else {  | 
