diff --git a/client_files/import/main.cpp b/client_files/import/main.cpp index a8477f77a..3a2f4154f 100644 --- a/client_files/import/main.cpp +++ b/client_files/import/main.cpp @@ -76,6 +76,24 @@ int GetSpellColumns(SharedDatabase *db) { return results.RowCount(); } +bool IsStringField(int i) { + switch(i) + { + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 8: + return true; + break; + default: + return false; + } +} + void ImportSpells(SharedDatabase *db) { Log.Out(Logs::General, Logs::Status, "Importing Spells..."); FILE *f = fopen("import/spells_us.txt", "r"); @@ -113,7 +131,12 @@ void ImportSpells(SharedDatabase *db) { sql += "'"; } - sql += split[i]; + if(split[i].compare("") == 0 && !IsStringField(i)) { + sql += "0"; + } + else { + sql += split[i]; + } sql += "'"; } @@ -128,7 +151,12 @@ void ImportSpells(SharedDatabase *db) { sql += "'"; } - sql += split[i]; + if(split[i].compare("") == 0 && !IsStringField(i)) { + sql += "0"; + } else { + sql += split[i]; + } + sql += "'"; } diff --git a/zone/client.cpp b/zone/client.cpp index e9983ad48..e2158cd54 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -141,11 +141,10 @@ Client::Client(EQStreamInterface* ieqs) merc_timer(RuleI(Mercs, UpkeepIntervalMS)), ItemTickTimer(10000), ItemQuestTimer(500), - anim_change_timer(100), anon_toggle_timer(250), afk_toggle_timer(250), helm_toggle_timer(250), - light_update_timer(250), + light_update_timer(600), m_Proximity(FLT_MAX, FLT_MAX, FLT_MAX), //arbitrary large number m_ZoneSummonLocation(-2.0f,-2.0f,-2.0f), m_AutoAttackPosition(0.0f, 0.0f, 0.0f, 0.0f), diff --git a/zone/client.h b/zone/client.h index 3d5bc8e4b..263aecf3e 100644 --- a/zone/client.h +++ b/zone/client.h @@ -1465,7 +1465,6 @@ private: Timer TrackingTimer; Timer RespawnFromHoverTimer; Timer merc_timer; - Timer anim_change_timer; Timer anon_toggle_timer; Timer afk_toggle_timer; Timer helm_toggle_timer; diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index fc05605c5..71c7ca7e4 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -12584,9 +12584,6 @@ void Client::Handle_OP_SpawnAppearance(const EQApplicationPacket *app) if (IsAIControlled()) return; - if(!anim_change_timer.Check()) - return; - if (sa->parameter == ANIM_STAND) { SetAppearance(eaStanding); playeraction = 0;