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

GOB: _renderFlags & 0x80 means "Do we have windows?"

Browse Source
This commit is contained in:
Sven Hesse 2012-06-21 22:59:33 +02:00
parent ed3d9d26dc
commit b1e50b4e30
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/gob/draw.h
View File

@ -32,7 +32,7 @@ namespace Gob {
#define RENDERFLAG_COLLISIONS 0x0004
#define RENDERFLAG_CAPTUREPOP 0x0008
#define RENDERFLAG_USEDELTAS 0x0010
#define RENDERFLAG_UNKNOWN 0x0080
#define RENDERFLAG_HASWINDOWS 0x0080
#define RENDERFLAG_NOBLITINVALIDATED 0x0200
#define RENDERFLAG_NOSUBTITLES 0x0400
#define RENDERFLAG_FROMSPLIT 0x0800

4
engines/gob/draw_fascin.cpp
View File

@ -747,7 +747,7 @@ int16 Draw_Fascination::openWin(int16 id) {
int16 Draw_Fascination::getWinFromCoord(int16 &dx, int16 &dy) {
int16 bestMatch = -1;
if ((_renderFlags & 128) == 0)
if (!(_renderFlags & RENDERFLAG_HASWINDOWS))
return -1;
for (int i = 0; i < 10; i++) {
@ -790,7 +790,7 @@ int16 Draw_Fascination::handleCurWin() {
int8 matchNum = 0;
int16 bestMatch = -1;
if ((_vm->_game->_mouseButtons != 1) || ((_renderFlags & 128) == 0))
if ((_vm->_game->_mouseButtons != 1) || !(_renderFlags & RENDERFLAG_HASWINDOWS))
return 0;
for (int i = 0; i < 10; i++) {

5
engines/gob/hotspots.cpp
View File

@ -533,8 +533,9 @@ void Hotspots::leave(uint16 index) {
}
int16 Hotspots::curWindow(int16 &dx, int16 &dy) const {
if ((_vm->_draw->_renderFlags & 0x80)==0)
return(0);
if (!(_vm->_draw->_renderFlags & RENDERFLAG_HASWINDOWS))
return 0;
for (int i = 0; i < 10; i++) {
if (_vm->_draw->_fascinWin[i].id != -1) {
if (_vm->_global->_inter_mouseX >= _vm->_draw->_fascinWin[i].left &&