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

[dreammaster]

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:
d8e4f35cc0 XEEN: Remove unused GameEvent class
aa168e079f XEEN: Fix single pixel difference for post-deposit message


Commit: d8e4f35cc07f7d29794df0a494e7ff550982b4f1
    https://github.com/scummvm/scummvm/commit/d8e4f35cc07f7d29794df0a494e7ff550982b4f1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-07T11:07:54-04:00

Commit Message:
XEEN: Remove unused GameEvent class

Changed paths:
    engines/xeen/events.cpp
    engines/xeen/events.h
    engines/xeen/xeen.h


diff --git a/engines/xeen/events.cpp b/engines/xeen/events.cpp
index 7a0a512..bd556d6 100644
--- a/engines/xeen/events.cpp
+++ b/engines/xeen/events.cpp
@@ -206,9 +206,4 @@ void EventsManager::nextFrame() {
 	_vm->_screen->update();
 }
 
-/*------------------------------------------------------------------------*/
-
-GameEvent::GameEvent() {
-}
-
 } // End of namespace Xeen
diff --git a/engines/xeen/events.h b/engines/xeen/events.h
index 80ce83a..6775b95 100644
--- a/engines/xeen/events.h
+++ b/engines/xeen/events.h
@@ -189,11 +189,6 @@ public:
 	void waitForPress();
 };
 
-class GameEvent {
-public:
-	GameEvent();
-};
-
 } // End of namespace Xeen
 
 #endif /* XEEN_EVENTS_H */
diff --git a/engines/xeen/xeen.h b/engines/xeen/xeen.h
index b6a95f0..774e97b 100644
--- a/engines/xeen/xeen.h
+++ b/engines/xeen/xeen.h
@@ -191,7 +191,6 @@ public:
 	Spells *_spells;
 	Windows *_windows;
 	Mode _mode;
-	GameEvent _gameEvent;
 	GameMode _gameMode;
 	bool _noDirectionSense;
 	bool _startupWindowActive;


Commit: aa168e079f1145191b25ccc1894b52c64400068f
    https://github.com/scummvm/scummvm/commit/aa168e079f1145191b25ccc1894b52c64400068f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-07T11:11:12-04:00

Commit Message:
XEEN: Fix single pixel difference for post-deposit message

I still haven't tracked down how the original handles the
integer division rounding that results in the pre and post
deposit Deposit dialog message being offset by 1 pixel.
But since the problem could be resolved by standardising
when center alignment is set in both messages, and I
haven't noticed any problem elsewhere, I think this is
sufficient for now

Changed paths:
    devtools/create_xeen/constants.cpp


diff --git a/devtools/create_xeen/constants.cpp b/devtools/create_xeen/constants.cpp
index 5ff6946..fcfbeca 100644
--- a/devtools/create_xeen/constants.cpp
+++ b/devtools/create_xeen/constants.cpp
@@ -968,7 +968,7 @@ const char *const GOLD_GEMS =
 	"Gems\x3r\t000%s\x2\x3""c\v096\t013G\f37o\fdld\t040G\f37e\fdms\t067ESC\x1";
 
 const char *const GOLD_GEMS_2 =
-	"\t000\v000\x3""c%s\x3l\n"
+	"\x3""c\v000\t000%s\x3l\n"
 	"\n"
 	"\x4""077Gold\x3r\t000%s\x3l\n"
 	"\x4""077Gems\x3r\t000%s\x3l\t000\v051\x4""077\n"