teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

changed namespace, class and function names to ensure consistent spelling

Browse source
This commit is contained in:
Marc Zinnschlag 2010-08-06 19:16:44 +02:00
parent d6541d4f3c
commit c806415f08
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/engine.cpp
View file

@ -119,7 +119,7 @@ OMW::Engine::~Engine()
delete mEnvironment.mSoundManager; delete mEnvironment.mSoundManager;
delete mEnvironment.mGlobalScripts; delete mEnvironment.mGlobalScripts;
delete mEnvironment.mMechanicsManager; delete mEnvironment.mMechanicsManager;
delete mEnvironment.mDialogManager; delete mEnvironment.mDialogueManager;
delete mScriptManager; delete mScriptManager;
delete mScriptContext; delete mScriptContext;
} }
@ -254,7 +254,7 @@ void OMW::Engine::go()
mEnvironment.mWorld->getStore(), *mEnvironment.mWindowManager); mEnvironment.mWorld->getStore(), *mEnvironment.mWindowManager);
// Create dialog system // Create dialog system
mEnvironment.mDialogManager = new MWDialog::DialogManager (mEnvironment); mEnvironment.mDialogueManager = new MWDialogue::DialogueManager (mEnvironment);
// load cell // load cell
ESM::Position pos; ESM::Position pos;

6
apps/openmw/mwdialogue/dialoguemanager.cpp
View file

@ -5,11 +5,11 @@
#include <iostream> #include <iostream>
namespace MWDialog namespace MWDialogue
{ {
DialogManager::DialogManager (MWWorld::Environment& environment) : mEnvironment (environment) {} DialogueManager::DialogueManager (MWWorld::Environment& environment) : mEnvironment (environment) {}
void DialogManager::startDialog (const MWWorld::Ptr& actor) void DialogueManager::startDialogue (const MWWorld::Ptr& actor)
{ {
std::cout << "talking with " << MWWorld::Class::get (actor).getName (actor) << std::endl; std::cout << "talking with " << MWWorld::Class::get (actor).getName (actor) << std::endl;
} }

12
apps/openmw/mwdialogue/dialoguemanager.hpp
View file

@ -1,5 +1,5 @@
#ifndef GAME_MMDIALOG_DIALOGMANAGER_H #ifndef GAME_MMDIALOG_DIALOGUEMANAGER_H
#define GAME_MWDIALOG_DIALOGMANAGER_H #define GAME_MWDIALOG_DIALOGUEMANAGER_H
#include "../mwworld/ptr.hpp" #include "../mwworld/ptr.hpp"
@ -8,17 +8,17 @@ namespace MWWorld
class Environment; class Environment;
} }
namespace MWDialog namespace MWDialogue
{ {
class DialogManager class DialogueManager
{ {
MWWorld::Environment& mEnvironment; MWWorld::Environment& mEnvironment;
public: public:
DialogManager (MWWorld::Environment& environment); DialogueManager (MWWorld::Environment& environment);
void startDialog (const MWWorld::Ptr& actor); void startDialogue (const MWWorld::Ptr& actor);
}; };
} }

8
apps/openmw/mwworld/environment.hpp
View file

@ -21,9 +21,9 @@ namespace MWMechanics
class MechanicsManager; class MechanicsManager;
} }
namespace MWDialog namespace MWDialogue
{ {
class DialogManager; class DialogueManager;
} }
namespace MWWorld namespace MWWorld
@ -36,7 +36,7 @@ namespace MWWorld
public: public:
Environment() Environment()
: mWorld (0), mSoundManager (0), mGlobalScripts (0), mWindowManager (0), : mWorld (0), mSoundManager (0), mGlobalScripts (0), mWindowManager (0),
mMechanicsManager (0), mDialogManager (0), mFrameDuration (0) mMechanicsManager (0), mDialogueManager (0), mFrameDuration (0)
{} {}
World *mWorld; World *mWorld;
@ -44,7 +44,7 @@ namespace MWWorld
MWScript::GlobalScripts *mGlobalScripts; MWScript::GlobalScripts *mGlobalScripts;
MWGui::WindowManager *mWindowManager; MWGui::WindowManager *mWindowManager;
MWMechanics::MechanicsManager *mMechanicsManager; MWMechanics::MechanicsManager *mMechanicsManager;
MWDialog::DialogManager *mDialogManager; MWDialogue::DialogueManager *mDialogueManager;
float mFrameDuration; float mFrameDuration;
}; };
} }