[Scummvm-git-logs] scummvm master -> 16a1d637b511f2c9e0029f274e6b81fc14a64bca

dreammaster dreammaster at scummvm.org
Sun Mar 18 02:13:05 CET 2018


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

Summary:
7f76795af6 XEEN: Fix using pyramid to travel to the Dark Side
16a1d637b5 XEEN: Fix Guild membership check


Commit: 7f76795af693490e2b2faf1679dade7491e6d358
    https://github.com/scummvm/scummvm/commit/7f76795af693490e2b2faf1679dade7491e6d358
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-03-17T21:01:08-04:00

Commit Message:
XEEN: Fix using pyramid to travel to the Dark Side

Changed paths:
    engines/xeen/locations.h


diff --git a/engines/xeen/locations.h b/engines/xeen/locations.h
index 2257395..81f2fe1 100644
--- a/engines/xeen/locations.h
+++ b/engines/xeen/locations.h
@@ -47,7 +47,7 @@ protected:
 	Common::Array<SpriteResource> _townSprites;
 	SpriteResource _icons1, _icons2;
 	int _townMaxId;
-	const bool &_ccNum;
+	const int &_ccNum;
 	int _animFrame;
 	Common::String _vocName, _songName;
 	Common::Point _animPos;


Commit: 16a1d637b511f2c9e0029f274e6b81fc14a64bca
    https://github.com/scummvm/scummvm/commit/16a1d637b511f2c9e0029f274e6b81fc14a64bca
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-03-17T21:09:21-04:00

Commit Message:
XEEN: Fix Guild membership check

Changed paths:
    engines/xeen/character.cpp


diff --git a/engines/xeen/character.cpp b/engines/xeen/character.cpp
index 12c0385..77c01fe 100644
--- a/engines/xeen/character.cpp
+++ b/engines/xeen/character.cpp
@@ -800,21 +800,23 @@ bool Character::guildMember() const {
 	FileManager &files = *g_vm->_files;
 	Party &party = *g_vm->_party;
 
-	if (party._mazeId == 49 && !files._ccNum) {
+	if (files._ccNum) {
+		switch (party._mazeId) {
+		case 29:
+			return hasAward(CASTLEVIEW_GUILD_MEMBER);
+		case 31:
+			return hasAward(SANDCASTER_GUILD_MEMBER);
+		case 33:
+			return hasAward(LAKESIDE_GUILD_MEMBER);
+		case 35:
+			return hasAward(NECROPOLIS_GUILD_MEMBER);
+		default:
+			return hasAward(OLYMPUS_GUILD_MEMBER);
+		}
+	} else if (party._mazeId == 49) {
 		return hasAward(SHANGRILA_GUILD_MEMBER);
-	}
-
-	switch (party._mazeId) {
-	case 29:
-		return hasAward(CASTLEVIEW_GUILD_MEMBER);
-	case 31:
-		return hasAward(SANDCASTER_GUILD_MEMBER);
-	case 33:
-		return hasAward(LAKESIDE_GUILD_MEMBER);
-	case 35:
-		return hasAward(NECROPOLIS_GUILD_MEMBER);
-	default:
-		return hasAward(OLYMPUS_GUILD_MEMBER);
+	} else {
+		return hasAward(party._mazeId - 28);
 	}
 }
 





More information about the Scummvm-git-logs mailing list