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

ASYLUM: * Fixed proper _currentScript pointer initialization.

Browse source 
* Silent some warnings.

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@399 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
This commit is contained in:
Alexandre Fontoura 2009-11-30 22:52:51 +00:00 • committed by Eugene Sandulenko
parent 9cc79d0cea
commit 05ec1ccd5e
No known key found for this signature in database
GPG key ID: 014D387312D34F08
8 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engines/asylum/scene.cpp
View file

@ -684,7 +684,7 @@ void Scene::updateMouse() {
//printf("Current Dir %d -- New Dir %d\n", actor->direction, dir);
}
void Scene::updateActor(uint32 actorIdx) {
void Scene::updateActor(int32 actorIdx) {
Actor *actor = getActor();
if (actor->visible()) {
@ -1381,7 +1381,7 @@ void Scene::drawActorsAndBarriers() {
// works the way I assume it should :P
if (!actInBar) {
if (LOBYTE(bar->flags) & 0x20)
if (!LOBYTE(bar->flags) & 0x80)
if (!(LOBYTE(bar->flags) & 0x80))
// XXX not sure if this will work, as it's
// supposed to set 0x40 to the lobyte...
bar->flags |= 0x40;
@ -1571,13 +1571,13 @@ void Scene::debugScreenScrolling(GraphicFrame *bg) {
// Horizontal scrolling
if (_cursor->x() < SCREEN_EDGES && _ws->targetX >= SCROLL_STEP)
_ws->targetX -= SCROLL_STEP;
else if (_cursor->x() > 640 - SCREEN_EDGES && _ws->targetX <= (uint32)bg->surface.w - 640 - SCROLL_STEP)
else if (_cursor->x() > 640 - SCREEN_EDGES && _ws->targetX <= bg->surface.w - 640 - SCROLL_STEP)
_ws->targetX += SCROLL_STEP;
// Vertical scrolling
if (_cursor->y() < SCREEN_EDGES && _ws->targetY >= SCROLL_STEP)
_ws->targetY -= SCROLL_STEP;
else if (_cursor->y() > 480 - SCREEN_EDGES && _ws->targetY <= (uint32)bg->surface.h - 480 - SCROLL_STEP)
else if (_cursor->y() > 480 - SCREEN_EDGES && _ws->targetY <= bg->surface.h - 480 - SCROLL_STEP)
_ws->targetY += SCROLL_STEP;
}