diff options
| author | Matthew Hoops | 2012-08-28 16:50:15 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-08-28 16:50:15 -0400 |
| commit | f61146f32791831211c7b9399ec681aed109f03b (patch) | |
| tree | 7aa7e8d749448f06427cce963ba088e2f9d71716 /engines/pegasus/items | |
| parent | 81e7c9a0c1599786a1aeb73d243609a2d280335f (diff) | |
| download | scummvm-rg350-f61146f32791831211c7b9399ec681aed109f03b.tar.gz scummvm-rg350-f61146f32791831211c7b9399ec681aed109f03b.tar.bz2 scummvm-rg350-f61146f32791831211c7b9399ec681aed109f03b.zip | |
PEGASUS: Remove g_allItems global construction
Diffstat (limited to 'engines/pegasus/items')
| -rw-r--r-- | engines/pegasus/items/itemlist.cpp | 8 | ||||
| -rw-r--r-- | engines/pegasus/items/itemlist.h | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/engines/pegasus/items/itemlist.cpp b/engines/pegasus/items/itemlist.cpp index 4c30975589..ff8cae546b 100644 --- a/engines/pegasus/items/itemlist.cpp +++ b/engines/pegasus/items/itemlist.cpp @@ -26,14 +26,12 @@ #include "common/error.h" #include "common/stream.h" -#include "engines/pegasus/items/item.h" -#include "engines/pegasus/items/itemlist.h" +#include "pegasus/pegasus.h" +#include "pegasus/items/item.h" +#include "pegasus/items/itemlist.h" namespace Pegasus { -// TODO: Don't use global construction! -ItemList g_allItems; - ItemList::ItemList() { } diff --git a/engines/pegasus/items/itemlist.h b/engines/pegasus/items/itemlist.h index b5a1d489be..173a54104d 100644 --- a/engines/pegasus/items/itemlist.h +++ b/engines/pegasus/items/itemlist.h @@ -52,8 +52,7 @@ public: typedef ItemList::iterator ItemIterator; -// TODO: Don't use global construction! -extern ItemList g_allItems; +#define g_allItems (((PegasusEngine *)g_engine)->getAllItems()) } // End of namespace Pegasus |