wbrawner/reone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Do not add QueueEmpty action to creatures

Browse source
This commit is contained in:
Vsevolod Kremianskii 2020-08-14 12:39:26 +07:00
parent 289ed25a57
commit 65e1b7006f
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/object/creature.cpp
View file

@ -59,8 +59,6 @@ Creature::Creature(uint32_t id) : Object(id) {
_type = ObjectType::Creature;
_drawDistance = 2048.0f;
_fadeDistance = 0.25f * _drawDistance;
_actions.push_back(Action(ActionType::QueueEmpty));
}
void Creature::load(const GffStruct &gffs) {

9
src/game/templates.cpp
View file

@ -30,7 +30,7 @@ namespace reone {
namespace game {
static map<string, shared_ptr<Item>> g_itemCache = map<string, shared_ptr<Item>>();
static map<string, shared_ptr<Item>> g_itemCache;
TemplateManager &TemplateManager::instance() {
static TemplateManager instance;
@ -42,17 +42,16 @@ shared_ptr<Item> TemplateManager::findItem(const string &resRef) {
if (it != g_itemCache.end()) {
return it->second;
}
debug("Loading item blueprint " + resRef);
debug("Templates: load item: " + resRef);
ResourceManager &resources = ResourceManager::instance();
shared_ptr<GffStruct> uti(resources.findGFF(resRef, ResourceType::ItemBlueprint));
shared_ptr<GffStruct> uti(ResMan.findGFF(resRef, ResourceType::ItemBlueprint));
shared_ptr<Item> item;
if (uti) {
item.reset(new Item());
item->load(resRef, *uti);
} else {
warn("Item blueprint not found: " + resRef);
warn("Templates: item not found: " + resRef);
}
auto pair = g_itemCache.insert(make_pair(resRef, item));