[Scummvm-git-logs] scummvm master -> 828da1fc206fdc1049f85ff45d3024a47fdee330

dreammaster dreammaster at scummvm.org
Sat Apr 21 13:54:06 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:
828da1fc20 XEEN: Add Swords guild membership checks


Commit: 828da1fc206fdc1049f85ff45d3024a47fdee330
    https://github.com/scummvm/scummvm/commit/828da1fc206fdc1049f85ff45d3024a47fdee330
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-21T07:54:00-04:00

Commit Message:
XEEN: Add Swords guild membership checks

Changed paths:
    engines/xeen/character.cpp


diff --git a/engines/xeen/character.cpp b/engines/xeen/character.cpp
index 6f78e6e..736d0db 100644
--- a/engines/xeen/character.cpp
+++ b/engines/xeen/character.cpp
@@ -872,7 +872,20 @@ bool Character::guildMember() const {
 	FileManager &files = *g_vm->_files;
 	Party &party = *g_vm->_party;
 
-	if (files._ccNum) {
+	if (g_vm->getGameID() == GType_Swords) {
+		switch (party._mazeId) {
+		case 49:
+			return true;
+		case 53:
+			return hasAward(83);
+		case 63:
+			return hasAward(85);
+		case 92:
+			return hasAward(84);
+		default:
+			return hasAward(87);
+		}
+	} else if (files._ccNum) {
 		switch (party._mazeId) {
 		case 29:
 			return hasAward(CASTLEVIEW_GUILD_MEMBER);





More information about the Scummvm-git-logs mailing list