Major refactoring
This commit is contained in:
1 parent
92ba3f2b60
commit
a1dda3fd50
8 files changed
+75
-487
No files matched your search
+7
-6
@@ -9,7 +9,7 @@
|
||||
#include "render/ShadowMap.h"
|
||||
|
||||
#include "ScriptEngine.h"
|
||||
|
||||
#include "dialogue/DialogueSystem.h"
|
||||
namespace ZL
|
||||
{
|
||||
|
||||
@@ -40,7 +40,7 @@ namespace ZL
|
||||
InteractiveObject* targetInteractiveObject = nullptr;
|
||||
|
||||
ScriptEngine scriptEngine;
|
||||
|
||||
Dialogue::DialogueSystem dialogueSystem;
|
||||
|
||||
#ifdef SHOW_PATH
|
||||
std::vector<VertexRenderStruct> debugNavMeshes;
|
||||
@@ -65,16 +65,17 @@ namespace ZL
|
||||
|
||||
void update(int64_t deltaMs);
|
||||
|
||||
void handleDown(int64_t fingerId, int mx, int my);
|
||||
void handleDown(int64_t fingerId, int eventX, int eventY, int mx, int my);
|
||||
void handleUp(int64_t fingerId, int mx, int my);
|
||||
void handleMotion(int64_t fingerId, int mx, int my);
|
||||
|
||||
bool requestDialogueStart(const std::string& dialogueId);
|
||||
void setDialogueFlag(const std::string& flag, int value);
|
||||
int getDialogueFlag(const std::string& flag) const;
|
||||
|
||||
protected:
|
||||
Renderer& renderer;
|
||||
Inventory& inventory;
|
||||
|
||||
|
||||
Inventory& inventory;
|
||||
};
|
||||
|
||||
} // namespace ZL
|
||||
Reference in new issue
Block a user