[Scummvm-git-logs] scummvm master -> 0f82830778c0d45b851b260f3acfcd8f87b5cb3f

dreammaster dreammaster at scummvm.org
Wed Apr 4 01:57:13 CEST 2018


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:
0f82830778 XEEN: Simplify original's code for monsters picking targets


Commit: 0f82830778c0d45b851b260f3acfcd8f87b5cb3f
    https://github.com/scummvm/scummvm/commit/0f82830778c0d45b851b260f3acfcd8f87b5cb3f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-03T19:57:03-04:00

Commit Message:
XEEN: Simplify original's code for monsters picking targets

Changed paths:
    engines/xeen/combat.cpp


diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp
index 5f9d761..2bd0187 100644
--- a/engines/xeen/combat.cpp
+++ b/engines/xeen/combat.cpp
@@ -861,23 +861,9 @@ void Combat::doMonsterTurn(int monsterId) {
 
 		if (!isHated) {
 			// No particularly hated foe, so decide which character to start with
-			switch (_combatParty.size()) {
-			case 1:
-				charNum = 0;
-				break;
-			case 2:
-			case 3:
-			case 4:
-			case 5:
-				charNum = _vm->getRandomNumber(0, _combatParty.size() - 1);
-				break;
-			case 6:
-				if (_vm->getRandomNumber(1, 6) == 6)
-					charNum = 5;
-				else
-					charNum = _vm->getRandomNumber(0, 4);
-				break;
-			}
+			// Note: Original had a whole switch statement depending on party size, that boiled down to
+			// picking a random character in all cases anyway
+			charNum = _vm->getRandomNumber(0, _combatParty.size() - 1);
 		}
 
 		// Attacking loop





More information about the Scummvm-git-logs mailing list