libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-18 07:39:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fascination - based on the theoritical values of flag, use getWindow instead of the code I added. Suppress shr 8 in getWindow and switched from int8 to uint16, in order to match the executable.

Browse Source 
svn-id: r47868
This commit is contained in:
Arnaud Boutonné 2010-02-03 22:14:06 +00:00
parent b2876ca9d3
commit f5764b1152
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
engines/gob/hotspots.cpp
View File

@ -85,8 +85,8 @@ MouseButtons Hotspots::Hotspot::getButton() const {
return kMouseButtonsNone;
}
uint8 Hotspots::Hotspot::getWindow() const {
return (flags & 0x0F00) >> 8;
uint16 Hotspots::Hotspot::getWindow() const {
return (flags & 0x0F00);
}
uint8 Hotspots::Hotspot::getCursor() const {
@ -576,16 +576,16 @@ uint16 Hotspots::checkMouse(Type type, uint16 &id, uint16 &index) const {
continue;
//Strangerke, for Fascination
if ((spot.flags & 0xFF00) != winId)
continue;
// if ((spot.flags & 0xFF00) != winId)
// continue;
if (spot.getType() > kTypeMove)
// Only consider click and move hotspots
continue;
// if (spot.getWindow() != 0)
// Only check the main window
// continue;
if (spot.getWindow() != winId)
// Only check the current window
continue;
if (!spot.isIn(_vm->_global->_inter_mouseX - dx, _vm->_global->_inter_mouseY - dy))
// If we're not in it, ignore it
@ -610,13 +610,13 @@ uint16 Hotspots::checkMouse(Type type, uint16 &id, uint16 &index) const {
continue;
//Strangerke, for Fascination
if ((spot.flags & 0xFF00) != winId)
continue;
// if (spot.getWindow() != 0)
// Only check the main window
// if ((spot.flags & 0xFF00) != winId)
// continue;
if (spot.getWindow() != winId)
// Only check the active window
continue;
if (spot.getType() < kTypeMove)
// Only consider hotspots that can be clicked
continue;
@ -1665,6 +1665,8 @@ int16 Hotspots::findCursor(uint16 x, uint16 y) const {
cursor = 0;
for (int i = 0; (i < kHotspotCount) && !_hotspots[i].isEnd(); i++) {
const Hotspot &spot = _hotspots[i];
// this check is /really/ Fascination specific.
// It's illogical, so if it's to be reused in Adi games... Be careful!
if ((spot.flags & 0xFF00) == curType)
if (spot.isIn(x - deltax, y - deltay)) {
if (spot.getType() < kTypeInput1NoLeave)

2
engines/gob/hotspots.h
View File

@ -128,7 +128,7 @@ private:
Type getType () const;
MouseButtons getButton() const;
uint8 getWindow() const;
uint16 getWindow() const;
uint8 getCursor() const;
uint8 getState () const;