[Scummvm-git-logs] scummvm master -> c3d6dcfae0cf39812fef3959e7f276b27868bcb5

[dreammaster]

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:
c3d6dcfae0 XEEN: Remove duplicated party dead flag


Commit: c3d6dcfae0cf39812fef3959e7f276b27868bcb5
    https://github.com/scummvm/scummvm/commit/c3d6dcfae0cf39812fef3959e7f276b27868bcb5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-03-23T22:29:55-04:00

Commit Message:
XEEN: Remove duplicated party dead flag

Changed paths:
    engines/xeen/interface.cpp
    engines/xeen/party.cpp
    engines/xeen/party.h
    engines/xeen/scripts.cpp


diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index 16497ec..2574e4a 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -267,7 +267,7 @@ void Interface::perform() {
 		_buttonValue = 0;
 		do {
 			events.pollEventsAndWait();
-			if (g_vm->shouldExit() || g_vm->isLoadPending() || party._partyDead)
+			if (g_vm->shouldExit() || g_vm->isLoadPending() || party._dead)
 				return;
 
 			if (events._leftButton && WAIT_BOUNDS.contains(events._mousePos))
@@ -585,7 +585,7 @@ void Interface::perform() {
 }
 
 void Interface::chargeStep() {
-	if (!_vm->_party->_partyDead) {
+	if (!_vm->_party->_dead) {
 		_vm->_party->changeTime(_vm->_map->_isOutdoors ? 10 : 1);
 		if (_tillMove) {
 			_vm->_combat->moveMonsters();
@@ -628,7 +628,7 @@ void Interface::doStepCode() {
 	switch (surfaceId) {
 	case SURFTYPE_SPACE:
 		// Wheeze.. can't breathe in space! Explosive decompression, here we come
-		party._partyDead = true;
+		party._dead = true;
 		break;
 	case SURFTYPE_LAVA:
 		// It burns, it burns!
@@ -678,7 +678,7 @@ void Interface::doStepCode() {
 
 			combat._combatTarget = oldTarget;
 			_flipGround = !_flipGround;
-		} else if (party._partyDead) {
+		} else if (party._dead) {
 			draw3d(true);
 		}
 	}
diff --git a/engines/xeen/party.cpp b/engines/xeen/party.cpp
index 3aa7287..e7d39ed 100644
--- a/engines/xeen/party.cpp
+++ b/engines/xeen/party.cpp
@@ -241,7 +241,6 @@ Party::Party(XeenEngine *vm) {
 	for (int i = 0; i < TOTAL_CHARACTERS; ++i)
 		Common::fill(&_characterFlags[i][0], &_characterFlags[i][24], false);
 
-	_partyDead = false;
 	_newDay = false;
 	_isNight = false;
 	_stepped = false;
diff --git a/engines/xeen/party.h b/engines/xeen/party.h
index 881b150..23a9407 100644
--- a/engines/xeen/party.h
+++ b/engines/xeen/party.h
@@ -216,7 +216,6 @@ public:
 	// Other party related runtime data
 	Roster _roster;
 	Common::Array<Character> _activeParty;
-	bool _partyDead;
 	bool _newDay;
 	bool _isNight;
 	bool _stepped;
diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
index d91f790..1425f03 100644
--- a/engines/xeen/scripts.cpp
+++ b/engines/xeen/scripts.cpp
@@ -376,7 +376,7 @@ bool Scripts::doOpcode(MazeEvent &event) {
 	bool result = (this->*COMMAND_LIST[event._opcode])(params);
 	if (result)
 		// Move to next line
-		_lineNum = _vm->_party->_partyDead ? -1 : _lineNum + 1;
+		_lineNum = _vm->_party->_dead ? SCRIPT_ABORT : _lineNum + 1;
 
 	return result;
 }