pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-03 17:46:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed ItemUseType enumeration to ItemInstTypes enumeration - naming conflicted with definition

Browse Source
This commit is contained in:
Uleat
2013-10-27 05:45:52 -04:00
parent d5152a0e59
commit e53fa1d873
5 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/Object.cpp
+1 -1
View File
@@ -218,7 +218,7 @@ Object::Object(const char *model, float x, float y, float z, float heading, uint
user = nullptr;
last_user = nullptr;
ItemInst* inst = nullptr;
inst = new ItemInst(ItemUseWorldContainer);
inst = new ItemInst(ItemInstWorldContainer);
// Initialize members
m_id = 0;
zone/zone.cpp
+2 -2
View File
@@ -270,7 +270,7 @@ bool Zone::LoadZoneObjects() {
//tradeskill containers do not have an itemid of 0... at least what I am seeing
if (itemid == 0) {
// Generic tradeskill container
inst = new ItemInst(ItemUseWorldContainer);
inst = new ItemInst(ItemInstWorldContainer);
}
else {
// Groundspawn object
@@ -279,7 +279,7 @@ bool Zone::LoadZoneObjects() {
//Father Nitwit's fix... not perfect...
if(inst == nullptr && type != OT_DROPPEDITEM) {
inst = new ItemInst(ItemUseWorldContainer);
inst = new ItemInst(ItemInstWorldContainer);
}
// Load child objects if container