mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-03-03 17:49:41 +00:00
added journal class
This commit is contained in:
parent
dc4e6216c3
commit
190f77f6c9
5 changed files with 39 additions and 1 deletions
|
@ -70,9 +70,11 @@ source_group(apps\\openmw\\mwgui FILES ${GAMEGUI_HEADER} ${GAMEGUI})
|
||||||
|
|
||||||
set(GAMEDIALOGUE_HEADER
|
set(GAMEDIALOGUE_HEADER
|
||||||
mwdialogue/dialoguemanager.hpp
|
mwdialogue/dialoguemanager.hpp
|
||||||
|
mwdialogue/journal.hpp
|
||||||
)
|
)
|
||||||
set(GAMEDIALOGUE
|
set(GAMEDIALOGUE
|
||||||
mwdialogue/dialoguemanager.cpp
|
mwdialogue/dialoguemanager.cpp
|
||||||
|
mwdialogue/journal.cpp
|
||||||
)
|
)
|
||||||
source_group(apps\\openmw\\mwdialogue FILES ${GAMEDIALOGUE_HEADER} ${GAMEDIALOGUE})
|
source_group(apps\\openmw\\mwdialogue FILES ${GAMEDIALOGUE_HEADER} ${GAMEDIALOGUE})
|
||||||
|
|
||||||
|
|
|
@ -36,6 +36,7 @@
|
||||||
#include "mwclass/classes.hpp"
|
#include "mwclass/classes.hpp"
|
||||||
|
|
||||||
#include "mwdialogue/dialoguemanager.hpp"
|
#include "mwdialogue/dialoguemanager.hpp"
|
||||||
|
#include "mwdialogue/journal.hpp"
|
||||||
|
|
||||||
#include "mwmechanics/mechanicsmanager.hpp"
|
#include "mwmechanics/mechanicsmanager.hpp"
|
||||||
|
|
||||||
|
@ -228,6 +229,7 @@ OMW::Engine::~Engine()
|
||||||
delete mEnvironment.mGlobalScripts;
|
delete mEnvironment.mGlobalScripts;
|
||||||
delete mEnvironment.mMechanicsManager;
|
delete mEnvironment.mMechanicsManager;
|
||||||
delete mEnvironment.mDialogueManager;
|
delete mEnvironment.mDialogueManager;
|
||||||
|
delete mEnvironment.mJournal;
|
||||||
delete mScriptManager;
|
delete mScriptManager;
|
||||||
delete mScriptContext;
|
delete mScriptContext;
|
||||||
delete mPhysicEngine;
|
delete mPhysicEngine;
|
||||||
|
@ -396,6 +398,7 @@ void OMW::Engine::go()
|
||||||
mEnvironment.mMechanicsManager = new MWMechanics::MechanicsManager (mEnvironment);
|
mEnvironment.mMechanicsManager = new MWMechanics::MechanicsManager (mEnvironment);
|
||||||
|
|
||||||
// Create dialog system
|
// Create dialog system
|
||||||
|
mEnvironment.mJournal = new MWDialogue::Journal (mEnvironment);
|
||||||
mEnvironment.mDialogueManager = new MWDialogue::DialogueManager (mEnvironment);
|
mEnvironment.mDialogueManager = new MWDialogue::DialogueManager (mEnvironment);
|
||||||
|
|
||||||
// load cell
|
// load cell
|
||||||
|
|
10
apps/openmw/mwdialogue/journal.cpp
Normal file
10
apps/openmw/mwdialogue/journal.cpp
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
|
||||||
|
#include "journal.hpp"
|
||||||
|
|
||||||
|
namespace MWDialogue
|
||||||
|
{
|
||||||
|
MWDialogue::Journal::Journal (MWWorld::Environment& environment)
|
||||||
|
: mEnvironment (environment)
|
||||||
|
{}
|
||||||
|
|
||||||
|
}
|
21
apps/openmw/mwdialogue/journal.hpp
Normal file
21
apps/openmw/mwdialogue/journal.hpp
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
#ifndef GAME_MMDIALOG_JOURNAL_H
|
||||||
|
#define GAME_MWDIALOG_JOURNAL_H
|
||||||
|
|
||||||
|
namespace MWWorld
|
||||||
|
{
|
||||||
|
struct Environment;
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace MWDialogue
|
||||||
|
{
|
||||||
|
class Journal
|
||||||
|
{
|
||||||
|
MWWorld::Environment& mEnvironment;
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
|
Journal (MWWorld::Environment& environment);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
|
@ -24,6 +24,7 @@ namespace MWMechanics
|
||||||
namespace MWDialogue
|
namespace MWDialogue
|
||||||
{
|
{
|
||||||
class DialogueManager;
|
class DialogueManager;
|
||||||
|
class Journal;
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace MWInput
|
namespace MWInput
|
||||||
|
@ -41,7 +42,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), mDialogueManager (0), mFrameDuration (0),
|
mMechanicsManager (0), mDialogueManager (0), mJournal (0), mFrameDuration (0),
|
||||||
mInputManager (0)
|
mInputManager (0)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
@ -51,6 +52,7 @@ namespace MWWorld
|
||||||
MWGui::WindowManager *mWindowManager;
|
MWGui::WindowManager *mWindowManager;
|
||||||
MWMechanics::MechanicsManager *mMechanicsManager;
|
MWMechanics::MechanicsManager *mMechanicsManager;
|
||||||
MWDialogue::DialogueManager *mDialogueManager;
|
MWDialogue::DialogueManager *mDialogueManager;
|
||||||
|
MWDialogue::Journal *mJournal;
|
||||||
float mFrameDuration;
|
float mFrameDuration;
|
||||||
|
|
||||||
// For setting GUI mode
|
// For setting GUI mode
|
||||||
|
|
Loading…
Reference in a new issue