[Scummvm-git-logs] scummvm master -> 479fce5a02610b1857c23495857eaa2e5000cfda

yuv422 noreply at scummvm.org
Fri Dec 13 12:01:05 UTC 2024 

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

Summary:
9f2ce7a2e4 DARKSEED: Add missing logic to stairs down animation. PVS-Studio V1037
3971edf20a DARKSEED: DRY up animation setup logic. PVS-Studio V1037
4b9dcdb4cb DARKSEED: DRY up cutscene update logic. PVS-Studio V1037
7c9a022ae4 DARKSEED: Remove unnecessary if statement. PVS-Studio V547
fbeb6001e2 DARKSEED: Remove unnecessary condition in if statement. PVS-Studio V560
057fb4b354 DARKSEED: DRY duplicate switch cases. PVS-Studio V1037
a2d8b952fd DARKSEED: Remove duplicate assignment. PVS-Studio V1048
647adf914d DARKSEED: DRY switch cases. PVS-Studio V1037
c6917b0dfe DARKSEED: Remove unnecessary condition from if statement. PVS-Studio V560
d08ac6ed93 DARKSEED: Add copy assignment operator. PVS-Studio V690
b3efdf2570 DARKSEED: Remove duplicate condition in if expression. PVS-Studio V560
419a0c7200 DARKSEED: Remove duplicate variable assignment. PVS-Studio V1048
0fbbbd3db7 DARKSEED: Remove unnecessary conditions from if statement. PVS-Studio V560
64257abb30 DARKSEED: Remove unnecessary if statement. PVS-Studio V560
62f1a369e0 DARKSEED: Remove unnecessary conditions from if statement. PVS-Studio V560
479fce5a02 DARKSEED: DRY case statements in switch block. PVS-Studio V1037


Commit: 9f2ce7a2e4501616edfdfb9467489f7bba62ba57
    https://github.com/scummvm/scummvm/commit/9f2ce7a2e4501616edfdfb9467489f7bba62ba57
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2024-12-13T22:59:42+11:00

Commit Message:
DARKSEED: Add missing logic to stairs down animation. PVS-Studio V1037

Changed paths:
    engines/darkseed/animation.cpp


diff --git a/engines/darkseed/animation.cpp b/engines/darkseed/animation.cpp
index 168b54e9255..dfd8fc0d00a 100644
--- a/engines/darkseed/animation.cpp
+++ b/engines/darkseed/animation.cpp
@@ -79,6 +79,7 @@ void Animation::setupOtherNspAnimation(int nspAnimIdx, int animId) {
 	case 7: // stairs down
 		_nsp_sprite_scaling_y_position = 0xbe;
 		_scaleSequence = true;
+		_player->_walkTarget.x -= 60;
 		break;
 	case 8:
 		_player->_position.x = 249;


Commit: 3971edf20aa5208aa2ac9af652880f227452c2ff
    https://github.com/scummvm/scummvm/commit/3971edf20aa5208aa2ac9af652880f227452c2ff
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2024-12-13T22:59:42+11:00

Commit Message:
DARKSEED: DRY up animation setup logic. PVS-Studio V1037

Changed paths:
    engines/darkseed/animation.cpp


diff --git a/engines/darkseed/animation.cpp b/engines/darkseed/animation.cpp
index dfd8fc0d00a..1b971c6f896 100644
--- a/engines/darkseed/animation.cpp
+++ b/engines/darkseed/animation.cpp
@@ -110,6 +110,7 @@ void Animation::setupOtherNspAnimation(int nspAnimIdx, int animId) {
 		_player->_position.y = 77;
 		break;
 	case 39:
+	case 47:
 		_scaleSequence = true;
 		_player->_frameIdx = g_engine->_room->_locationSprites.getAnimAt(nspAnimIdx)._frameNo[0];
 		break;
@@ -122,10 +123,6 @@ void Animation::setupOtherNspAnimation(int nspAnimIdx, int animId) {
 	case 46:
 		g_engine->playSound(30, 5, -1);
 		break;
-	case 47:
-		_scaleSequence = true;
-		_player->_frameIdx = g_engine->_room->_locationSprites.getAnimAt(nspAnimIdx)._frameNo[0];
-		break;
 	case 53 :
 	case 54 :
 		_player->_position.x = 308;


Commit: 4b9dcdb4cbe0d7eb9008722f9f9b315fcc18933c
    https://github.com/scummvm/scummvm/commit/4b9dcdb4cbe0d7eb9008722f9f9b315fcc18933c
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2024-12-13T22:59:42+11:00

Commit Message:
DARKSEED: DRY up cutscene update logic. PVS-Studio V1037

Changed paths:
    engines/darkseed/cutscene.cpp


diff --git a/engines/darkseed/cutscene.cpp b/engines/darkseed/cutscene.cpp
index e51500e08e6..fe112888e99 100644
--- a/engines/darkseed/cutscene.cpp
+++ b/engines/darkseed/cutscene.cpp
@@ -54,9 +54,6 @@ void Cutscene::update() {
 	case 'G' :
 		bookScene();
 		break;
-	case 'H' :
-		_movieStep = 9999;
-		break;
 	case 'I' :
 		introScene();
 		break;
@@ -66,6 +63,7 @@ void Cutscene::update() {
 	case 'Y' :
 		alienBornScene();
 		break;
+	case 'H' :
 	case 'Z' :
 		_movieStep = 9999;
 		break;


Commit: 7c9a022ae4d281910a8ad21ad58717b1a014e8f4
    https://github.com/scummvm/scummvm/commit/7c9a022ae4d281910a8ad21ad58717b1a014e8f4
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2024-12-13T22:59:42+11:00

Commit Message:
DARKSEED: Remove unnecessary if statement. PVS-Studio V547

Changed paths:
    engines/darkseed/darkseed.cpp


diff --git a/engines/darkseed/darkseed.cpp b/engines/darkseed/darkseed.cpp
index 8f11fc7664b..663ecf171bf 100644
--- a/engines/darkseed/darkseed.cpp
+++ b/engines/darkseed/darkseed.cpp
@@ -2371,17 +2371,16 @@ void DarkseedEngine::runObjects() {
 				if (_animation->_isPlayingAnimation_maybe && _animation->_otherNspAnimationType_maybe == 53) {
 					_animation->_isPlayingAnimation_maybe = false;
 				}
-				if (!_player->_heroMoving) {
-					Common::Point oldCursor = g_engine->_cursor.getPosition();
-					Common::Point newTarget = {322, 226};
-					g_engine->_cursor.setPosition(newTarget);
-					_player->calculateWalkTarget();
-					g_engine->_cursor.setPosition(oldCursor);
-					_player->playerFaceWalkTarget();
-					if (!_printedcomeheredawson) {
-						_console->printTosText(934);
-						_printedcomeheredawson = true;
-					}
+
+				Common::Point oldCursor = g_engine->_cursor.getPosition();
+				Common::Point newTarget = {322, 226};
+				g_engine->_cursor.setPosition(newTarget);
+				_player->calculateWalkTarget();
+				g_engine->_cursor.setPosition(oldCursor);
+				_player->playerFaceWalkTarget();
+				if (!_printedcomeheredawson) {
+					_console->printTosText(934);
+					_printedcomeheredawson = true;
 				}
 			}
 		}


Commit: fbeb6001e2d4b6dedbf642d3bb7f27d9baf4f6c7
    https://github.com/scummvm/scummvm/commit/fbeb6001e2d4b6dedbf642d3bb7f27d9baf4f6c7
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2024-12-13T22:59:42+11:00

Commit Message:
DARKSEED: Remove unnecessary condition in if statement. PVS-Studio V560

Changed paths:
    engines/darkseed/darkseed.cpp


diff --git a/engines/darkseed/darkseed.cpp b/engines/darkseed/darkseed.cpp
index 663ecf171bf..b231d0856f1 100644
--- a/engines/darkseed/darkseed.cpp
+++ b/engines/darkseed/darkseed.cpp
@@ -666,7 +666,7 @@ void DarkseedEngine::handleInput() {
 			return;
 		}
 		_player->_heroMoving = false;
-		if (_useDoorTarget || _doorEnabled) {
+		if (_doorEnabled) {
 			for (unsigned int i = 0; i < _room->_room1.size(); i++) {
 				RoomExit &roomExit = _room->_room1[i];
 				if (roomExit.roomNumber != 0xff


Commit: 057fb4b35476ea806adda80ffa2b48b67acea22e
    https://github.com/scummvm/scummvm/commit/057fb4b35476ea806adda80ffa2b48b67acea22e
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2024-12-13T22:59:42+11:00

Commit Message:
DARKSEED: DRY duplicate switch cases. PVS-Studio V1037

Changed paths:
    engines/darkseed/darkseed.cpp


diff --git a/engines/darkseed/darkseed.cpp b/engines/darkseed/darkseed.cpp
index b231d0856f1..a95dfb8b650 100644
--- a/engines/darkseed/darkseed.cpp
+++ b/engines/darkseed/darkseed.cpp
@@ -1675,6 +1675,7 @@ void DarkseedEngine::lookCode(int objNum) {
 	if (objNum == 42) {
 		switch (_objectVar[42]) {
 		case 0:
+		case 4:
 			_console->printTosText(652);
 			break;
 		case 1:
@@ -1687,9 +1688,6 @@ void DarkseedEngine::lookCode(int objNum) {
 		case 3:
 			_console->printTosText(658);
 			break;
-		case 4:
-			_console->printTosText(652);
-			break;
 		default:
 			break;
 		}


Commit: a2d8b952fdba75630c48607b9b683faabbb32a92
    https://github.com/scummvm/scummvm/commit/a2d8b952fdba75630c48607b9b683faabbb32a92
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2024-12-13T22:59:42+11:00

Commit Message:
DARKSEED: Remove duplicate assignment. PVS-Studio V1048

Changed paths:
    engines/darkseed/darkseed.cpp


diff --git a/engines/darkseed/darkseed.cpp b/engines/darkseed/darkseed.cpp
index a95dfb8b650..16cfbae4851 100644
--- a/engines/darkseed/darkseed.cpp
+++ b/engines/darkseed/darkseed.cpp
@@ -1283,9 +1283,7 @@ void DarkseedEngine::updateDisplay() { // AKA ServiceRoom
 							y = 0x71;
 						} else if (_player->_frameIdx == 4) {
 							x = 0x75;
-							y = 0x69;
 						} else if (_player->_frameIdx == 7) {
-							x = 0xa6;
 							y = 0x5b;
 						}
 


Commit: 647adf914d73c534c209ecef7d0e1eab1d83262c
    https://github.com/scummvm/scummvm/commit/647adf914d73c534c209ecef7d0e1eab1d83262c
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2024-12-13T22:59:42+11:00

Commit Message:
DARKSEED: DRY switch cases. PVS-Studio V1037

Changed paths:
    engines/darkseed/gamefont.cpp


diff --git a/engines/darkseed/gamefont.cpp b/engines/darkseed/gamefont.cpp
index a43975c7f56..3876f18f5b7 100644
--- a/engines/darkseed/gamefont.cpp
+++ b/engines/darkseed/gamefont.cpp
@@ -40,12 +40,14 @@ const Sprite *GameFont::getCharacterSprite(char c) const {
 	int letterIdx = 1000;
 	switch (c) {
 	case 0x20 :
+	case 0x2d :
 		letterIdx = 0x46;
 		break;
 	case 0x21 :
 		letterIdx = 0x36;
 		break;
 	case 0x22 :
+	case 0x5e :
 		letterIdx = 0x3a;
 		break;
 	case 0x27 :
@@ -63,9 +65,6 @@ const Sprite *GameFont::getCharacterSprite(char c) const {
 	case 0x2c :
 		letterIdx = 0x34;
 		break;
-	case 0x2d :
-		letterIdx = 0x46;
-		break;
 	case 0x2e :
 		letterIdx = 0x35;
 		break;
@@ -75,9 +74,6 @@ const Sprite *GameFont::getCharacterSprite(char c) const {
 	case 0x3f :
 		letterIdx = 0x39;
 		break;
-	case 0x5e :
-		letterIdx = 0x3a;
-		break;
 
 	default: {
 		if (c < 0x41 || c > 0x5a) {


Commit: c6917b0dfeb042208ecffb80a9c812cf095fe218
    https://github.com/scummvm/scummvm/commit/c6917b0dfeb042208ecffb80a9c812cf095fe218
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2024-12-13T22:59:42+11:00

Commit Message:
DARKSEED: Remove unnecessary condition from if statement. PVS-Studio V560

Changed paths:
    engines/darkseed/menu.cpp


diff --git a/engines/darkseed/menu.cpp b/engines/darkseed/menu.cpp
index 7380eac57e1..4b91dbb0e0f 100644
--- a/engines/darkseed/menu.cpp
+++ b/engines/darkseed/menu.cpp
@@ -83,7 +83,7 @@ void Menu::loadMenu() {
 			g_engine->_lastKeyPressed = Common::KeyCode::KEYCODE_INVALID;
 		}
 
-		if (menuItemIdx > -1 && menuItemIdx < 5) {
+		if (menuItemIdx > -1) {
 			g_engine->_sound->playSfx(5, 0, -1);
 			g_engine->waitForSpeechOrSfx();
 		}


Commit: d08ac6ed932f5eadf478f027af06a0926543f22c
    https://github.com/scummvm/scummvm/commit/d08ac6ed932f5eadf478f027af06a0926543f22c
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2024-12-13T22:59:42+11:00

Commit Message:
DARKSEED: Add copy assignment operator. PVS-Studio V690

Changed paths:
    engines/darkseed/pal.cpp
    engines/darkseed/pal.h


diff --git a/engines/darkseed/pal.cpp b/engines/darkseed/pal.cpp
index a83c8a71fea..312161e4200 100644
--- a/engines/darkseed/pal.cpp
+++ b/engines/darkseed/pal.cpp
@@ -32,6 +32,13 @@ Pal::Pal(const Pal &pal) {
 	load(pal);
 }
 
+Pal &Pal::operator=(const Pal &pal) {
+	if (this != &pal) {
+		load(pal);
+	}
+	return *this;
+}
+
 void Pal::load(const Pal &pal) {
 	memcpy(_palData, pal._palData, DARKSEED_PAL_SIZE);
 }
diff --git a/engines/darkseed/pal.h b/engines/darkseed/pal.h
index 670eac5a661..1d50de751ca 100644
--- a/engines/darkseed/pal.h
+++ b/engines/darkseed/pal.h
@@ -36,6 +36,7 @@ public:
 
 	Pal() {};
 	Pal(const Pal &pal);
+	Pal & operator=(const Pal &pal);
 	void loadFromScreen();
 	void load(const Pal &pal);
 	bool load(const Common::Path &filename, bool shouldInstallPalette = true);


Commit: b3efdf2570509893f5f52fe621946c544a59b47d
    https://github.com/scummvm/scummvm/commit/b3efdf2570509893f5f52fe621946c544a59b47d
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2024-12-13T22:59:42+11:00

Commit Message:
DARKSEED: Remove duplicate condition in if expression. PVS-Studio V560

Changed paths:
    engines/darkseed/room.cpp


diff --git a/engines/darkseed/room.cpp b/engines/darkseed/room.cpp
index b25c7dde583..080257de3a3 100644
--- a/engines/darkseed/room.cpp
+++ b/engines/darkseed/room.cpp
@@ -1010,7 +1010,7 @@ void Room::runRoomObjects() {
 					   _roomNumber == 64 || _roomNumber == 65 || _roomNumber == 63 ||
 					   _roomNumber == 66 ||
 					   _roomNumber == 67 || _roomNumber == 28 || _roomNumber == 37 ||
-					   _roomNumber == 39 || _roomNumber == 32 || _roomNumber == 57 ||
+					   _roomNumber == 39 || _roomNumber == 57 ||
 					   _roomNumber == 60 || _roomNumber == 44 ||
 					   _roomNumber == 38 || _roomNumber == 25) {
 				const Sprite &sprite = _locationSprites.getSpriteAt(spriteNum);


Commit: 419a0c7200dab8c8fcc6782500262514d291d066
    https://github.com/scummvm/scummvm/commit/419a0c7200dab8c8fcc6782500262514d291d066
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2024-12-13T22:59:42+11:00

Commit Message:
DARKSEED: Remove duplicate variable assignment. PVS-Studio V1048

Changed paths:
    engines/darkseed/room.cpp


diff --git a/engines/darkseed/room.cpp b/engines/darkseed/room.cpp
index 080257de3a3..491ae83b816 100644
--- a/engines/darkseed/room.cpp
+++ b/engines/darkseed/room.cpp
@@ -334,8 +334,6 @@ int Room::checkCursorAndMoveableObjects() {
 			if (_roomObj[i].objNum == 25) {
 				if (g_engine->_objectVar.getVar(80) < 3) {
 					hasObject = false;
-				} else {
-					hasObject = true;
 				}
 			}
 
@@ -381,11 +379,9 @@ int Room::checkCursorAndStaticObjects(int x, int y) {
 				}
 			}
 
-			if (_roomObj[i].objNum == 0x19 && hasObject) {
+			if (_roomObj[i].objNum == 25 && hasObject) {
 				if (g_engine->_objectVar.getVar(80) < 2) {
 					hasObject = false;
-				} else {
-					hasObject = true;
 				}
 			}
 


Commit: 0fbbbd3db7347db1ba04845cd1dd31ce24f46228
    https://github.com/scummvm/scummvm/commit/0fbbbd3db7347db1ba04845cd1dd31ce24f46228
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2024-12-13T22:59:42+11:00

Commit Message:
DARKSEED: Remove unnecessary conditions from if statement. PVS-Studio V560

Changed paths:
    engines/darkseed/usecode.cpp


diff --git a/engines/darkseed/usecode.cpp b/engines/darkseed/usecode.cpp
index 3ae8f7d26f4..538f9bddebb 100644
--- a/engines/darkseed/usecode.cpp
+++ b/engines/darkseed/usecode.cpp
@@ -464,13 +464,12 @@ void Darkseed::UseCode::useCode(int objNum) {
 			}
 			return;
 		}
-		if (objNum < 42 && objNum != 22 && (objNum != 7 || _objectVar[7] == 1) &&
-			objNum != 31 && objNum != 33 && objNum != 32 && objNum != 86) {
+		if (objNum < 42 && objNum != 22 && (objNum != 7 || _objectVar[7] == 1)) {
 			_console->printTosText(955); // "You pick up the "
 			_console->addToCurrentLine(Common::String::format("%s.", _objectVar.getObjectName(objNum)));
 			_inventory.addItem(objNum);
 			g_engine->_room->_collisionType = 0;
-			if (((objNum != 25) || (_objectVar[25] == 1)) || (_objectVar[25] == 101)) {
+			if (objNum != 25 || _objectVar[25] == 1 || _objectVar[25] == 101) {
 				g_engine->_room->removeObjectFromRoom(objNum);
 			}
 			_objectVar.setMoveObjectRoom(objNum, 254);


Commit: 64257abb307b4e15a883f533a4b72bdd35dca608
    https://github.com/scummvm/scummvm/commit/64257abb307b4e15a883f533a4b72bdd35dca608
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2024-12-13T22:59:42+11:00

Commit Message:
DARKSEED: Remove unnecessary if statement. PVS-Studio V560

Changed paths:
    engines/darkseed/usecode.cpp


diff --git a/engines/darkseed/usecode.cpp b/engines/darkseed/usecode.cpp
index 538f9bddebb..2b46c65fc7a 100644
--- a/engines/darkseed/usecode.cpp
+++ b/engines/darkseed/usecode.cpp
@@ -469,9 +469,8 @@ void Darkseed::UseCode::useCode(int objNum) {
 			_console->addToCurrentLine(Common::String::format("%s.", _objectVar.getObjectName(objNum)));
 			_inventory.addItem(objNum);
 			g_engine->_room->_collisionType = 0;
-			if (objNum != 25 || _objectVar[25] == 1 || _objectVar[25] == 101) {
-				g_engine->_room->removeObjectFromRoom(objNum);
-			}
+			g_engine->_room->removeObjectFromRoom(objNum);
+
 			_objectVar.setMoveObjectRoom(objNum, 254);
 			if (objNum == 28) {
 				_objectVar[28] = 1;


Commit: 62f1a369e0478785d8cbe3191927f55e04c3a162
    https://github.com/scummvm/scummvm/commit/62f1a369e0478785d8cbe3191927f55e04c3a162
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2024-12-13T22:59:42+11:00

Commit Message:
DARKSEED: Remove unnecessary conditions from if statement. PVS-Studio V560

Changed paths:
    engines/darkseed/usecode.cpp


diff --git a/engines/darkseed/usecode.cpp b/engines/darkseed/usecode.cpp
index 2b46c65fc7a..86eee845289 100644
--- a/engines/darkseed/usecode.cpp
+++ b/engines/darkseed/usecode.cpp
@@ -877,7 +877,7 @@ void Darkseed::UseCode::useCodeShopItems(int16 actionObjNum, int16 targetObjNum)
 		genericResponse(actionObjNum, 112, 996);
 	} else if ((actionObjNum == 38) && (targetObjNum == 49)) {
 		_console->printTosText(251);
-	} else if ((targetObjNum == 147) && (actionObjNum != 7)) {
+	} else if (targetObjNum == 147) {
 		_console->printTosText(319);
 	} else if (targetObjNum == 197) {
 		genericResponse(actionObjNum, 197, 993);
@@ -895,7 +895,7 @@ void Darkseed::UseCode::useCodeShopItems(int16 actionObjNum, int16 targetObjNum)
 		_console->printTosText(386);
 	} else if (targetObjNum == 110) {
 		_console->printTosText(392);
-	} else if ((targetObjNum == 131) && (actionObjNum != 7)) {
+	} else if (targetObjNum == 131) {
 		_console->printTosText(405);
 	} else if (targetObjNum == 85) {
 		_console->printTosText(434);
@@ -973,7 +973,7 @@ void Darkseed::UseCode::useCodeShopItems(int16 actionObjNum, int16 targetObjNum)
 				genericResponse(actionObjNum, 185, 982);
 			} else if ((actionObjNum == 38) && (targetObjNum == 79)) {
 				_console->printTosText(833);
-			} else if ((targetObjNum == 79) && (actionObjNum != 7)) {
+			} else if (targetObjNum == 79) {
 				_console->printTosText(836);
 			} else if ((actionObjNum == 38) && (targetObjNum == 58)) {
 				_console->printTosText(849);


Commit: 479fce5a02610b1857c23495857eaa2e5000cfda
    https://github.com/scummvm/scummvm/commit/479fce5a02610b1857c23495857eaa2e5000cfda
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2024-12-13T22:59:43+11:00

Commit Message:
DARKSEED: DRY case statements in switch block. PVS-Studio V1037

Changed paths:
    engines/darkseed/usecode.cpp


diff --git a/engines/darkseed/usecode.cpp b/engines/darkseed/usecode.cpp
index 86eee845289..46f03708a76 100644
--- a/engines/darkseed/usecode.cpp
+++ b/engines/darkseed/usecode.cpp
@@ -169,6 +169,7 @@ void Darkseed::UseCode::useCode(int objNum) {
 	if (objNum == 42) {
 		switch (_objectVar[42]) {
 		case 0:
+		case 4:
 			_console->printTosText(653);
 			break;
 		case 1:
@@ -184,9 +185,6 @@ void Darkseed::UseCode::useCode(int objNum) {
 			_console->printTosText(655);
 			_objectVar[42] = 4;
 			break;
-		case 4:
-			_console->printTosText(653);
-			break;
 		default:
 			break;
 		}

More information about the Scummvm-git-logs mailing list