diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt index 8d8fb2b45..d73bb7630 100644 --- a/apps/openmw/CMakeLists.txt +++ b/apps/openmw/CMakeLists.txt @@ -96,7 +96,7 @@ add_openmw_dir (mwbase inputmanager windowmanager statemanager ) -add_openmw_dir (mwmp DedicatedPlayer LocalPlayer Networking Main GUIChat GUILogin GUIController PlayerMarkerCollection GUIDialogList) +add_openmw_dir (mwmp DedicatedPlayer LocalPlayer Networking Main GUIChat GUILogin GUIController PlayerMarkerCollection GUIDialogList WorldController) # Main executable diff --git a/apps/openmw/mwmp/Main.cpp b/apps/openmw/mwmp/Main.cpp index 7da65022f..a7cc79754 100644 --- a/apps/openmw/mwmp/Main.cpp +++ b/apps/openmw/mwmp/Main.cpp @@ -64,6 +64,7 @@ Main::Main() mNetworking = new Networking(); mLocalPlayer = new LocalPlayer(); mGUIController = new GUIController(); + mWorldController = new WorldController(); //mLocalPlayer->CharGen(0, 4); server = "mp.tes3mp.com"; @@ -215,6 +216,11 @@ GUIController *Main::getGUIController() const return mGUIController; } +WorldController *Main::getWorldController() const +{ + return mWorldController; +} + void Main::PressedKey(int key) { if (pMain == nullptr) return; diff --git a/apps/openmw/mwmp/Main.hpp b/apps/openmw/mwmp/Main.hpp index f145ce7e2..a51fb1f6f 100644 --- a/apps/openmw/mwmp/Main.hpp +++ b/apps/openmw/mwmp/Main.hpp @@ -3,6 +3,7 @@ #include "Networking.hpp" #include "LocalPlayer.hpp" #include "GUIController.hpp" +#include "WorldController.hpp" namespace mwmp { @@ -26,6 +27,7 @@ namespace mwmp Networking *getNetworking() const; LocalPlayer *getLocalPlayer() const; GUIController *getGUIController() const; + WorldController *getWorldController() const; void UpdateWorld(float dt) const; @@ -40,6 +42,7 @@ namespace mwmp LocalPlayer *mLocalPlayer; GUIController *mGUIController; + WorldController *mWorldController; std::string server; unsigned short port; }; diff --git a/apps/openmw/mwmp/WorldController.cpp b/apps/openmw/mwmp/WorldController.cpp new file mode 100644 index 000000000..546ecd1fd --- /dev/null +++ b/apps/openmw/mwmp/WorldController.cpp @@ -0,0 +1,18 @@ +#include +#include +#include + + +#include "WorldController.hpp" +#include "Main.hpp" + + +mwmp::WorldController::WorldController() +{ + +} + +mwmp::WorldController::~WorldController() +{ + +} diff --git a/apps/openmw/mwmp/WorldController.hpp b/apps/openmw/mwmp/WorldController.hpp new file mode 100644 index 000000000..e7b4e0ccd --- /dev/null +++ b/apps/openmw/mwmp/WorldController.hpp @@ -0,0 +1,15 @@ +#ifndef OPENMW_WORLDCONTROLLER_HPP +#define OPENMW_WORLDCONTROLLER_HPP + +namespace mwmp +{ + class WorldController + { + public: + + WorldController(); + ~WorldController(); + }; +} + +#endif //OPENMW_WORLDCONTROLLER_HPP