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

dreammaster dreammaster at scummvm.org
Sat Apr 28 12:52:13 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:
dcbb194640 XEEN: Fix rendering of Detect Monsters spell


Commit: dcbb194640b9e911be6d9bab788e36aa24ce0e5e
    https://github.com/scummvm/scummvm/commit/dcbb194640b9e911be6d9bab788e36aa24ce0e5e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-28T06:52:07-04:00

Commit Message:
XEEN: Fix rendering of Detect Monsters spell

Changed paths:
    engines/xeen/spells.cpp


diff --git a/engines/xeen/spells.cpp b/engines/xeen/spells.cpp
index 7ebe9ad..de55dd6 100644
--- a/engines/xeen/spells.cpp
+++ b/engines/xeen/spells.cpp
@@ -432,6 +432,7 @@ void Spells::detectMonster() {
 	Interface &intf = *_vm->_interface;
 	Map &map = *_vm->_map;
 	Party &party = *_vm->_party;
+	Resources &res = *_vm->_resources;
 	Sound &sound = *_vm->_sound;
 	Windows &windows = *_vm->_windows;
 	Window &w = windows[19];
@@ -455,23 +456,22 @@ void Spells::detectMonster() {
 					if (++gridEntry > 3)
 						gridEntry = 3;
 
-					sprites.draw(w, gridEntry, Common::Point(xDiff * 9 + 244,
-						yDiff * 7 + 81));
+					sprites.draw(w, gridEntry, Common::Point(271 + xDiff * 9, 102 - yDiff * 7));
 				}
 			}
 		}
 	}
 
-	sprites.draw(w, party._mazeDirection + 1, Common::Point(270, 101));
+	res._globalSprites.draw(w, party._mazeDirection + 1, Common::Point(270, 101));
 	sound.playFX(20);
 	w.update();
 
-	do {
+	while (!g_vm->shouldExit() && !events.isKeyMousePressed()) {
 		events.updateGameCounter();
 		intf.draw3d(true);
 
 		events.wait(1, false);
-	} while (!events.isKeyMousePressed());
+	}
 
 	w.close();
 }





More information about the Scummvm-git-logs mailing list