From e046719d0e8a6d8763e5a89fa6c6feaa02ced421 Mon Sep 17 00:00:00 2001 From: Arthur Dene Ice Date: Sun, 11 May 2014 23:53:22 -0700 Subject: [PATCH] ulong conversions to u/int/8/16 --- zone/embparser_api.cpp | 2 +- zone/zone.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/zone/embparser_api.cpp b/zone/embparser_api.cpp index ad4cb81ef..1f25b1974 100644 --- a/zone/embparser_api.cpp +++ b/zone/embparser_api.cpp @@ -182,7 +182,7 @@ XS(XS__summonitem) if (items == 1) quest_manager.summonitem(SvUV(ST(0))); else if(items == 2) - quest_manager.summonitem(SvUV(ST(0)), SvUV(ST(1))); + quest_manager.summonitem(SvUV(ST(0)), (int16)SvUV(ST(1))); else Perl_croak(aTHX_ "Usage: summonitem(itemid, [charges])"); XSRETURN_EMPTY; diff --git a/zone/zone.cpp b/zone/zone.cpp index 0f03a59ce..698f24783 100644 --- a/zone/zone.cpp +++ b/zone/zone.cpp @@ -476,9 +476,9 @@ void Zone::LoadNewMerchantData(uint32 merchantid){ ml.id = merchantid; ml.item = atoul(row[0]); ml.slot = atoul(row[1]); - ml.faction_required = atoul(row[2]); - ml.level_required = atoul(row[3]); - ml.alt_currency_cost = atoul(row[3]); + ml.faction_required = (int16)atoul(row[2]); + ml.level_required = (int8)atoul(row[3]); + ml.alt_currency_cost = (uint16)atoul(row[3]); ml.classes_required = atoul(row[4]); merlist.push_back(ml); } @@ -523,9 +523,9 @@ void Zone::LoadMerchantData_result(MYSQL_RES* result) { ml.slot = atoul(row[1]); ml.item = atoul(row[2]); - ml.faction_required = atoul(row[3]); - ml.level_required = atoul(row[4]); - ml.alt_currency_cost = atoul(row[5]); + ml.faction_required = (int16)atoul(row[3]); + ml.level_required = (int8)atoul(row[4]); + ml.alt_currency_cost = (uint16)atoul(row[5]); ml.classes_required = atoul(row[6]); cur->second.push_back(ml); }