libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-01 14:21:41 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

DIRECTOR: JANITORIAL: Change spaces to tabs

Browse Source
This commit is contained in:
Nathanael Gentry 2020-04-12 10:27:00 -04:00 committed by Eugene Sandulenko
parent 9909097285
commit 1ce36183bd
5 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/director/director.h
View File

@ -128,7 +128,7 @@ public:
// events.cpp
void processEvents();
void setDraggedSprite(uint16 id);
uint32 getMacTicks();
uint32 getMacTicks();
void waitForClick();
public:

16
engines/director/events.cpp
View File

@ -77,10 +77,10 @@ void DirectorEngine::processEvents() {
sc->_stopPlay = true;
break;
case Common::EVENT_MOUSEMOVE:
sc->_lastEventTime = g_director->getMacTicks();
sc->_lastRollTime = sc->_lastEventTime;
break;
case Common::EVENT_MOUSEMOVE:
sc->_lastEventTime = g_director->getMacTicks();
sc->_lastRollTime = sc->_lastEventTime;
break;
case Common::EVENT_LBUTTONDOWN:
pos = g_system->getEventManager()->getMousePos();
@ -91,8 +91,8 @@ void DirectorEngine::processEvents() {
sc->_currentMouseDownSpriteId = spriteId;
sc->_mouseIsDown = true;
sc->_lastEventTime = g_director->getMacTicks();
sc->_lastClickTime = sc->_lastEventTime;
sc->_lastEventTime = g_director->getMacTicks();
sc->_lastClickTime = sc->_lastEventTime;
debugC(3, kDebugEvents, "event: Button Down @(%d, %d), sprite id: %d", pos.x, pos.y, spriteId);
_lingo->processEvent(kEventMouseDown);
@ -136,8 +136,8 @@ void DirectorEngine::processEvents() {
debugC(1, kDebugEvents, "processEvents(): keycode: %d", _keyCode);
}
sc->_lastEventTime = g_director->getMacTicks();
sc->_lastKeyTime = sc->_lastEventTime;
sc->_lastEventTime = g_director->getMacTicks();
sc->_lastKeyTime = sc->_lastEventTime;
_lingo->processEvent(kEventKeyDown);
break;

38
engines/director/lingo/lingo-the.cpp
View File

@ -426,26 +426,26 @@ Datum Lingo::getTheEntity(int entity, Datum &id, int field) {
d.type = INT;
d.u.i = _vm->getCurrentScore()->_mouseIsDown;
break;
case kTheLastFrame:
d.type = INT;
d.u.i = _vm->getCurrentScore()->_frames.size() - 1;
case kTheLastFrame:
d.type = INT;
d.u.i = _vm->getCurrentScore()->_frames.size() - 1;
break;
case kTheLastEvent:
d.type = INT;
d.u.i = _vm->getMacTicks() - _vm->getCurrentScore()->_lastEventTime;
break;
case kTheLastClick:
d.type = INT;
d.u.i = _vm->getMacTicks() - _vm->getCurrentScore()->_lastClickTime;
break;
case kTheLastKey:
d.type = INT;
d.u.i = _vm->getMacTicks() - _vm->getCurrentScore()->_lastKeyTime;
break;
case kTheLastRoll:
d.type = INT;
d.u.i = _vm->getMacTicks() - _vm->getCurrentScore()->_lastRollTime;
break;
case kTheLastEvent:
d.type = INT;
d.u.i = _vm->getMacTicks() - _vm->getCurrentScore()->_lastEventTime;
break;
case kTheLastClick:
d.type = INT;
d.u.i = _vm->getMacTicks() - _vm->getCurrentScore()->_lastClickTime;
break;
case kTheLastKey:
d.type = INT;
d.u.i = _vm->getMacTicks() - _vm->getCurrentScore()->_lastKeyTime;
break;
case kTheLastRoll:
d.type = INT;
d.u.i = _vm->getMacTicks() - _vm->getCurrentScore()->_lastRollTime;
break;
default:
warning("Lingo::getTheEntity(): Unprocessed getting field \"%s\" of entity %s", field2str(field), entity2str(entity));
d.type = VOID;

8
engines/director/score.cpp
View File

@ -76,10 +76,10 @@ Score::Score(DirectorEngine *vm) {
_soundManager = _vm->getSoundManager();
_currentMouseDownSpriteId = 0;
_mouseIsDown = false;
_lastEventTime = _vm->getMacTicks();
_lastKeyTime = _lastEventTime;
_lastClickTime = _lastEventTime;
_lastRollTime = _lastEventTime;
_lastEventTime = _vm->getMacTicks();
_lastKeyTime = _lastEventTime;
_lastClickTime = _lastEventTime;
_lastRollTime = _lastEventTime;
// FIXME: TODO: Check whether the original truely does it
if (_vm->getVersion() <= 3) {

8
engines/director/score.h
View File

@ -142,10 +142,10 @@ public:
Common::Rect _movieRect;
uint16 _currentMouseDownSpriteId;
bool _mouseIsDown;
uint32 _lastEventTime;
uint32 _lastRollTime;
uint32 _lastClickTime;
uint32 _lastKeyTime;
uint32 _lastEventTime;
uint32 _lastRollTime;
uint32 _lastClickTime;
uint32 _lastKeyTime;
bool _stopPlay;
uint32 _nextFrameTime;