Renamed Inventory to InventoryOld

This commit is contained in:
KimLS
2015-02-17 13:42:21 -08:00
parent b48a712887
commit b75e6308dd
31 changed files with 209 additions and 209 deletions
+1 -1
View File
@@ -1347,7 +1347,7 @@ bool Client::OPCharCreate(char *name, CharCreate_Struct *cc)
{
PlayerProfile_Struct pp;
ExtendedProfile_Struct ext;
Inventory inv;
InventoryOld inv;
time_t bday = time(nullptr);
char startzone[50]={0};
uint32 i;
+3 -3
View File
@@ -34,7 +34,7 @@ extern std::vector<RaceClassCombos> character_create_race_class_combos;
// the current stuff is at the bottom of this function
void WorldDatabase::GetCharSelectInfo(uint32 account_id, CharacterSelect_Struct* cs, uint32 ClientVersion) {
Inventory *inv;
InventoryOld *inv;
uint8 has_home = 0;
uint8 has_bind = 0;
@@ -167,7 +167,7 @@ void WorldDatabase::GetCharSelectInfo(uint32 account_id, CharacterSelect_Struct*
}
/* Load Inventory */
inv = new Inventory;
inv = new InventoryOld;
if (GetInventory(account_id, cs->name[char_num], inv))
{
const Item_Struct* item = nullptr;
@@ -176,7 +176,7 @@ void WorldDatabase::GetCharSelectInfo(uint32 account_id, CharacterSelect_Struct*
for (uint32 matslot = 0; matslot < _MaterialCount; matslot++)
{
invslot = Inventory::CalcSlotFromMaterial(matslot);
invslot = InventoryOld::CalcSlotFromMaterial(matslot);
if (invslot == INVALID_INDEX) { continue; }
inst = inv->GetItem(invslot);