[Scummvm-git-logs] scummvm master -> 3956dc48455aa9a2b68e05fc5b37310ad2d6c67e

dreammaster dreammaster at scummvm.org
Wed Jan 10 02:00:18 CET 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:
3956dc4845 XEEN: Fix opening of World of Xeen menu


Commit: 3956dc48455aa9a2b68e05fc5b37310ad2d6c67e
    https://github.com/scummvm/scummvm/commit/3956dc48455aa9a2b68e05fc5b37310ad2d6c67e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-01-09T20:00:03-05:00

Commit Message:
XEEN: Fix opening of World of Xeen menu

Changed paths:
    engines/xeen/sprites.cpp
    engines/xeen/sprites.h
    engines/xeen/worldofxeen/worldofxeen_menu.cpp


diff --git a/engines/xeen/sprites.cpp b/engines/xeen/sprites.cpp
index 8ea18f0..fd699f6 100644
--- a/engines/xeen/sprites.cpp
+++ b/engines/xeen/sprites.cpp
@@ -45,6 +45,12 @@ SpriteResource::SpriteResource(const Common::String &filename) {
 	load(filename);
 }
 
+SpriteResource::SpriteResource(const Common::String &filename, int ccMode) {
+	_data = nullptr;
+	_scaledWidth = _scaledHeight = 0;
+	load(filename, ccMode);
+}
+
 SpriteResource::~SpriteResource() {
 	clear();
 }
diff --git a/engines/xeen/sprites.h b/engines/xeen/sprites.h
index 342fa3f..4c4a230 100644
--- a/engines/xeen/sprites.h
+++ b/engines/xeen/sprites.h
@@ -85,6 +85,7 @@ private:
 public:
 	SpriteResource();
 	SpriteResource(const Common::String &filename);
+	SpriteResource(const Common::String &filename, int ccMode);
 
 	virtual ~SpriteResource();
 
diff --git a/engines/xeen/worldofxeen/worldofxeen_menu.cpp b/engines/xeen/worldofxeen/worldofxeen_menu.cpp
index b58bf64..5b08c1a 100644
--- a/engines/xeen/worldofxeen/worldofxeen_menu.cpp
+++ b/engines/xeen/worldofxeen/worldofxeen_menu.cpp
@@ -51,6 +51,7 @@ void WorldOfXeenMenu::show(XeenEngine *vm) {
 }
 
 void WorldOfXeenMenu::execute() {
+	_vm->_files->setGameCc(1);
 	SpriteResource special("special.icn");
 	Windows &windows = *_vm->_windows;
 	EventsManager &events = *_vm->_events;





More information about the Scummvm-git-logs mailing list