thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use the same syntax for accessing script variables as BS1 does, i.e. now

Browse source 
it's Logic::_scriptVars[ID] instead of just ID. Apart from looking cool, it
makes it much easier to tell the difference between variables and constants
when looking at the code.

Of course, this sort of sweeping changes is jolly good for introducing
truly weird regressions, which is why I waited until after 0.6.0.

svn-id: r13331
This commit is contained in:
Torbjörn Andersson 2004-03-17 09:03:15 +00:00
parent 03200025df
commit 4c3a68027f
25 changed files with 395 additions and 385 deletions
Download patch file Download diff file Expand all files Collapse all files

16
sword2/scroll.cpp
View file

@ -44,18 +44,10 @@ void Sword2Engine::setScrolling(void) {
uint16 scroll_distance_y;
// if the scroll offsets are being forced in script
if (SCROLL_X || SCROLL_Y) {
// ensure not too far right
if (_thisScreen.max_scroll_offset_x > SCROLL_X)
_thisScreen.scroll_offset_x = SCROLL_X;
else
_thisScreen.scroll_offset_x = _thisScreen.max_scroll_offset_x;
// ensure not too far down
if (_thisScreen.max_scroll_offset_y > SCROLL_Y)
_thisScreen.scroll_offset_y = SCROLL_Y;
else
_thisScreen.scroll_offset_y = _thisScreen.max_scroll_offset_y;
if (Logic::_scriptVars[SCROLL_X] || Logic::_scriptVars[SCROLL_Y]) {
// ensure not too far right or too far down
_thisScreen.scroll_offset_x = MIN((uint16) Logic::_scriptVars[SCROLL_X], _thisScreen.max_scroll_offset_x);
_thisScreen.scroll_offset_y = MIN((uint16) Logic::_scriptVars[SCROLL_Y], _thisScreen.max_scroll_offset_y);
} else {
// George's offset from the centre - the desired position
// for him