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

MADS: Further cleanup of previously anonymous fields

Browse Source
This commit is contained in:
Paul Gilbert 2014-04-05 21:30:42 -04:00
parent e37d1b7280
commit 11403c5db6
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/mads/action.h
View File

@ -88,7 +88,7 @@ private:
void appendVocab(int vocabId, bool capitalise = false);
void startWalkingDirectly(int v);
void startWalkingDirectly(int walkType);
public:
ActionDetails _action, _activeAction;
int8 _flags1, _flags2;

2
engines/mads/game.cpp
View File

@ -171,7 +171,7 @@ void Game::sectionLoop() {
_visitedScenes.add(_scene._nextSceneId);
// Reset the user interface
_screenObjects._v8333C = true;
_screenObjects._forceRescan = true;
_screenObjects._inputMode = kInputBuildingSentences;
_scene._userInterface._scrollerY = 0;

2
engines/mads/hotspots.cpp
View File

@ -135,7 +135,7 @@ void DynamicHotspots::refresh() {
case kInputBuildingSentences:
case kInputLimitedSentences:
scrObjects.add(dh._bounds, _vm->_game->_scene._layer, CAT_12, dh._descId);
scrObjects._v8333C = true;
scrObjects._forceRescan = true;
break;
default:
break;

8
engines/mads/screen.cpp
View File

@ -252,7 +252,7 @@ ScreenObject::ScreenObject() {
ScreenObjects::ScreenObjects(MADSEngine *vm) : _vm(vm) {
_objectY = -1;
_v8333C = false;
_forceRescan = false;
_inputMode = kInputBuildingSentences;
_v7FED6 = 0;
_v8332A = 0;
@ -289,7 +289,7 @@ void ScreenObjects::check(bool scanFlag) {
_vm->_events->_rightMousePressed = false;
if ((_vm->_events->_mouseMoved || _vm->_game->_scene._userInterface._scrollerY
|| _v8332A || _v8333C) && scanFlag) {
|| _v8332A || _forceRescan) && scanFlag) {
_category = CAT_NONE;
_selectedObject = scanBackwards(_vm->_events->currentPos(), LAYER_GUI);
if (_selectedObject > 0) {
@ -320,7 +320,7 @@ void ScreenObjects::check(bool scanFlag) {
}
}
if (_vm->_events->_mouseButtons || (_vm->_easyMouse && scene._action._interAwaiting > 1
if (_vm->_events->_mouseButtons || (_vm->_easyMouse && scene._action._interAwaiting > AWAITING_COMMAND
&& scene._userInterface._category == CAT_INV_LIST) ||
(_vm->_easyMouse && scene._userInterface._category == CAT_HOTSPOT)) {
scene._action.checkActionAtMousePos();
@ -337,7 +337,7 @@ void ScreenObjects::check(bool scanFlag) {
if (_vm->_events->_mouseButtons || _vm->_easyMouse)
scene._action.set();
_v8333C = 0;
_forceRescan = 0;
}
scene._action.refresh();

2
engines/mads/screen.h
View File

@ -157,7 +157,7 @@ public:
InputMode _inputMode;
int _v7FED6;
int _v8332A;
int _v8333C;
int _forceRescan;
int _selectedObject;
ScrCategory _category;
int _newDescId;