diff options
author | krzys-h <krzys_h@interia.pl> | 2013-03-31 10:21:22 +0200 |
---|---|---|
committer | krzys-h <krzys_h@interia.pl> | 2013-03-31 10:21:22 +0200 |
commit | 90301e24c0fc5fcd6bffb0399e203e5adea6aa2c (patch) | |
tree | 68739b64cb01f432b6bf593acae5cec97ddb46bc /src/app | |
parent | 845c8e9437e26cf3193d4e3dae2a02f03e17747d (diff) | |
download | colobot-90301e24c0fc5fcd6bffb0399e203e5adea6aa2c.tar.gz colobot-90301e24c0fc5fcd6bffb0399e203e5adea6aa2c.tar.bz2 colobot-90301e24c0fc5fcd6bffb0399e203e5adea6aa2c.zip |
Added field "item" to class "object" in CBot
Diffstat (limited to 'src/app')
-rw-r--r-- | src/app/app.cpp | 1 | ||||
-rw-r--r-- | src/app/app.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/app/app.cpp b/src/app/app.cpp index 59a04f4..c42c8b0 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -95,6 +95,7 @@ CApplication::CApplication() { m_private = new ApplicationPrivate(); m_iMan = new CInstanceManager(); + m_objMan = new CObjectManager; m_eventQueue = new CEventQueue(); m_profile = new CProfile(); diff --git a/src/app/app.h b/src/app/app.h index dcc90e0..07f1b90 100644 --- a/src/app/app.h +++ b/src/app/app.h @@ -31,6 +31,8 @@ #include "graphics/engine/engine.h" #include "graphics/opengl/gldevice.h" +#include "object/objman.h" + #include <string> #include <vector> @@ -374,6 +376,8 @@ protected: //! Instance manager // TODO: to be removed CInstanceManager* m_iMan; + //! Object manager + CObjectManager* m_objMan; //! Global event queue CEventQueue* m_eventQueue; //! Graphics engine |