Relintai/entity_spell_system
1
0
Fork 0
mirror of https://github.com/Relintai/entity_spell_system.git synced 2025-02-20 17:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

-Removed the fail cond from Bag::get_item.

Browse Source 
-Removed the bag include from item template.
This commit is contained in:
Relintai 2019-09-27 16:35:55 +02:00
parent f337ab57c4
commit a4554f5bf7
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/item_template.cpp
View File

@ -3,7 +3,6 @@
#include "item_instance.h"
#include "aura.h"
#include "spell.h"
#include "../inventory/bag.h"
int ItemTemplate::get_id() const {
return _id;

1
data/item_template.h
View File

@ -13,7 +13,6 @@
class ItemInstance;
class Aura;
class Spell;
class Bag;
class ItemTemplate : public Resource {
GDCLASS(ItemTemplate, Resource);

4
inventory/bag.cpp
View File

@ -80,7 +80,9 @@ Ref<ItemInstance> Bag::get_item(const int index) {
return call("_get_item", index);
}
ERR_FAIL_INDEX_V(index, _items.size(), Ref<ItemInstance>());
if (index >= _items.size()) {
return Ref<ItemInstance>();
}
return _items.get(index);
}