[Scummvm-git-logs] scummvm master -> 93e7bc4fff2bbee755a90ba65d84b7bc564e0d0f

[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:
93e7bc4fff XEEN: Don't reload map when exiting character creation


Commit: 93e7bc4fff2bbee755a90ba65d84b7bc564e0d0f
    https://github.com/scummvm/scummvm/commit/93e7bc4fff2bbee755a90ba65d84b7bc564e0d0f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-01-16T18:35:55-08:00

Commit Message:
XEEN: Don't reload map when exiting character creation

Changed paths:
    engines/xeen/locations.cpp


diff --git a/engines/xeen/locations.cpp b/engines/xeen/locations.cpp
index f7b6f8ab861..e96c26bc875 100644
--- a/engines/xeen/locations.cpp
+++ b/engines/xeen/locations.cpp
@@ -735,6 +735,7 @@ Character *TavernLocation::doOptions(Character *c) {
 
 		g_vm->_mode = MODE_INTERACTIVE7;
 		party.addTime(1440);
+		int partyId = party._mazeId;
 		party._mazeId = 0;
 
 		// Say farewell
@@ -749,7 +750,7 @@ Character *TavernLocation::doOptions(Character *c) {
 		// Show the party dialog
 		PartyDialog::show(g_vm);
 
-		if (party._mazeId != 0)
+		if (party._mazeId != partyId)
 			map.load(party._mazeId);
 		_exitToUi = true;
 	} else if (Res.KeyConstants.Locations.KEY_TIP == _buttonValue) {