From defc53d4d1a74959adf4e87f2e715ac3c4c2f7b7 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 12 Jul 2013 22:35:51 +0300 Subject: [PATCH] FULLPIPE: Scene drawing stubs --- engines/fullpipe/scene.cpp | 28 ++++++++++++++++++++++++++++ engines/fullpipe/scene.h | 3 +++ engines/fullpipe/stateloader.cpp | 6 +++--- engines/fullpipe/statics.cpp | 8 ++++++++ engines/fullpipe/statics.h | 2 ++ 5 files changed, 44 insertions(+), 3 deletions(-) diff --git a/engines/fullpipe/scene.cpp b/engines/fullpipe/scene.cpp index e6a1a9b76d10..fa144df2eb63 100644 --- a/engines/fullpipe/scene.cpp +++ b/engines/fullpipe/scene.cpp @@ -234,4 +234,32 @@ void Scene::init() { warning("STUB: Scene::init()"); } +void Scene::draw(int par) { + updateScrolling(par); + + drawContent(60000, 0, true); + + //_staticANIObjectList2.sortByPriority(); + + for (CPtrList::iterator s = _staticANIObjectList2.begin(); s != _staticANIObjectList2.end(); ++s) { + ((StaticANIObject *)s)->draw2(); + } + + int priority = -1; + for (CPtrList::iterator s = _staticANIObjectList2.begin(); s != _staticANIObjectList2.end(); ++s) { + drawContent(((StaticANIObject *)s)->_priority, priority, false); + ((StaticANIObject *)s)->draw(); + + priority = ((StaticANIObject *)s)->_priority; + } + + drawContent(-1, priority, false); +} + +void Scene::updateScrolling(int par) { +} + +void Scene::drawContent(int minPri, int maxPri, bool drawBG) { +} + } // End of namespace Fullpipe diff --git a/engines/fullpipe/scene.h b/engines/fullpipe/scene.h index e2bda176cfcf..1a76d3163865 100644 --- a/engines/fullpipe/scene.h +++ b/engines/fullpipe/scene.h @@ -43,6 +43,9 @@ class Scene : public Background { virtual bool load(MfcArchive &file); void initStaticANIObjects(); void init(); + void draw(int par); + void drawContent(int minPri, int maxPri, bool drawBG); + void updateScrolling(int par); }; class SceneTag : public CObject { diff --git a/engines/fullpipe/stateloader.cpp b/engines/fullpipe/stateloader.cpp index 02e297055f61..e01d08e20efc 100644 --- a/engines/fullpipe/stateloader.cpp +++ b/engines/fullpipe/stateloader.cpp @@ -101,10 +101,10 @@ bool FullpipeEngine::loadGam(const char *fname) { _inventory->rebuildItemRects(); - for (CPtrList::iterator s = _inventory->getScene()->_picObjList.begin(); s != _inventory->getScene()->_picObjList.end(); ++s) { - } - warning("STUB: loadGam()"); + //for (CPtrList::iterator s = _inventory->getScene()->_picObjList.begin(); s != _inventory->getScene()->_picObjList.end(); ++s) { + //} + } else return false; diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp index f51bc1701746..cdb8fabf4688 100644 --- a/engines/fullpipe/statics.cpp +++ b/engines/fullpipe/statics.cpp @@ -124,6 +124,14 @@ Statics *StaticANIObject::addStatics(Statics *ani) { return 0; } +void StaticANIObject::draw() { + warning("STUB: StaticANIObject::draw()"); +} + +void StaticANIObject::draw2() { + warning("STUB: StaticANIObject::draw2()"); +} + Statics::Statics() { _staticsId = 0; _picture = 0; diff --git a/engines/fullpipe/statics.h b/engines/fullpipe/statics.h index 7c52e18d33d9..3f1687874704 100644 --- a/engines/fullpipe/statics.h +++ b/engines/fullpipe/statics.h @@ -145,6 +145,8 @@ class StaticANIObject : public GameObject { Movement *getMovementById(int id); Statics *addStatics(Statics *ani); + void draw(); + void draw2(); }; } // End of namespace Fullpipe