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

ASYLUM: Silenced a warning, some cleanup

Browse source 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@195 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
This commit is contained in:
Filippos Karapetis 2009-06-22 19:29:34 +00:00 • committed by Eugene Sandulenko
parent ffcd82b310
commit d22bc0cf51
No known key found for this signature in database
GPG key ID: 014D387312D34F08
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
engines/asylum/scene.cpp
View file

@ -124,7 +124,7 @@ void Scene::updateCursor() {
}
void Scene::update() {
bool scrollScreen = false;
//bool scrollScreen = false;
GraphicFrame *bg = _bgResource->getFrame(0);
MainActor *mainActor = _sceneResource->getMainActor();
@ -136,7 +136,7 @@ void Scene::update() {
} else {
mainActor->walkTo(_screen, _mouseX, _mouseY);
uint32 newCursor = -1;
uint32 newCursor = 0;
// Change cursor
switch (mainActor->getCurrentAction()) {
@ -177,19 +177,19 @@ void Scene::update() {
// Horizontal scrolling
if (_mouseX < SCREEN_EDGES && _startX >= SCROLL_STEP) {
_startX -= SCROLL_STEP;
scrollScreen = true;
//scrollScreen = true;
} else if (_mouseX > 640 - SCREEN_EDGES && _startX <= bg->surface.w - 640 - SCROLL_STEP) {
_startX += SCROLL_STEP;
scrollScreen = true;
//scrollScreen = true;
}
// Vertical scrolling
if (_mouseY < SCREEN_EDGES && _startY >= SCROLL_STEP) {
_startY -= SCROLL_STEP;
scrollScreen = true;
//scrollScreen = true;
} else if (_mouseY > 480 - SCREEN_EDGES && _startY <= bg->surface.h - 480 - SCROLL_STEP) {
_startY += SCROLL_STEP;
scrollScreen = true;
//scrollScreen = true;
}
// Copy the background to the back buffer before updating the scene animations