From adf21355eedbced834982e1af94068a94db2dc8a Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Wed, 8 Jul 2009 10:59:29 +0000 Subject: [PATCH] ASYLUM: Fixed warnings git-svn-id: http://asylumengine.googlecode.com/svn/trunk@233 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c --- engines/asylum/interpreter.cpp | 8 ++++---- engines/asylum/scene.cpp | 8 ++++---- engines/asylum/scene.h | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/engines/asylum/interpreter.cpp b/engines/asylum/interpreter.cpp index 399a795e6f7..c60c775dcbd 100644 --- a/engines/asylum/interpreter.cpp +++ b/engines/asylum/interpreter.cpp @@ -87,7 +87,7 @@ void Interpreter::processActionLists() { break; case kHideActor: { - int actorIndex = 0; + uint32 actorIndex = 0; if (currentCommand.param1 == -1) ;//actorIndex = _scene->getWorldStats()->playerActor; else @@ -102,7 +102,7 @@ void Interpreter::processActionLists() { break; case kShowActor: { - int actorIndex = 0; + uint32 actorIndex = 0; if (currentCommand.param1 == -1) ;//actorIndex = _scene->getWorldStats()->playerActor; else @@ -116,7 +116,7 @@ void Interpreter::processActionLists() { } break; case kSetActorStats: { - int actorIndex = 0; + uint32 actorIndex = 0; if (currentCommand.param1 == -1) ;//actorIndex = _scene->getWorldStats()->playerActor; else @@ -152,7 +152,7 @@ void Interpreter::processActionLists() { case kWaitUntilFramePlayed: { int barrierIndex = _scene->_sceneResource->getBarrierIndexById(currentCommand.param1); if (barrierIndex >= 0) { - int frameNum = 0; + uint32 frameNum = 0; if (currentCommand.param2 == -1) frameNum = _scene->_sceneResource->getWorldStats()->barriers[barrierIndex].frameCount - 1; else diff --git a/engines/asylum/scene.cpp b/engines/asylum/scene.cpp index 4d4cade860e..05e3b365dee 100644 --- a/engines/asylum/scene.cpp +++ b/engines/asylum/scene.cpp @@ -145,8 +145,8 @@ void Scene::actorVisible(int actorIndex, bool visible) { // FIXME - Remove this once mainActor uses proper actor info if (actorIndex == 0) { - if(_sceneResource->getMainActor()) - ;//_sceneResource->getMainActor()->setAction(action); + //if(_sceneResource->getMainActor()) + //_sceneResource->getMainActor()->setAction(action); } } @@ -157,8 +157,8 @@ bool Scene::actorVisible(int actorIndex) { // FIXME - Remove this once mainActor uses proper actor info if (actorIndex == 0) { - if(_sceneResource->getMainActor()) - ;//_sceneResource->getMainActor()->setAction(action); + //if(_sceneResource->getMainActor()) + //_sceneResource->getMainActor()->setAction(action); } return false; diff --git a/engines/asylum/scene.h b/engines/asylum/scene.h index e923a666e32..c32e55c618a 100644 --- a/engines/asylum/scene.h +++ b/engines/asylum/scene.h @@ -41,8 +41,8 @@ class Sound; class SceneResource; class Text; class Interpreter; -class ActionDefinitions; -class PolyDefinitions; +struct ActionDefinitions; +struct PolyDefinitions; class Scene { public: