Minor code change for CharacterState
This commit is contained in:
1 parent
0eb9d0be25
commit
0ca00f965d
3 files changed
+62
-80
No files matched your search
@@ -7,6 +7,7 @@
|
||||
#include "external/nlohmann/json.hpp"
|
||||
#include "TextModel.h"
|
||||
#include "InteractiveObject.h"
|
||||
#include "../CharacterState.h"
|
||||
|
||||
namespace ZL {
|
||||
|
||||
@@ -71,6 +72,10 @@ namespace ZL {
|
||||
bool canAttack = false;
|
||||
bool enabled = true;
|
||||
float interactionRadius = 0.0f;
|
||||
|
||||
// Converts this JSON-parsed descriptor into a fully-populated CharacterState
|
||||
// (including creationInfo) ready for Character::createFromState().
|
||||
CharacterState toCharacterState() const;
|
||||
};
|
||||
|
||||
class GameObjectLoader {
|
||||
@@ -89,6 +94,7 @@ namespace ZL {
|
||||
|
||||
static std::vector<std::unique_ptr<ZL::Character>> loadAndCreate_Npcs(
|
||||
const std::string& jsonPath,
|
||||
Renderer& renderer,
|
||||
const std::string& zipPath = ""
|
||||
);
|
||||
|
||||
|
||||
Reference in new issue
Block a user