pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-11 21:01:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adjustments to OP_SpawnAppearance, as well as updating import client files to handle newer spell files

Browse Source
This commit is contained in:
KimLS 2015-02-09 17:48:07 -08:00
parent e6eb4e16d1
commit 543e265b0a
4 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
client_files/import/main.cpp
View File

@ -76,6 +76,24 @@ int GetSpellColumns(SharedDatabase *db) {
return results.RowCount(); 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) { void ImportSpells(SharedDatabase *db) {
Log.Out(Logs::General, Logs::Status, "Importing Spells..."); Log.Out(Logs::General, Logs::Status, "Importing Spells...");
FILE *f = fopen("import/spells_us.txt", "r"); FILE *f = fopen("import/spells_us.txt", "r");
@ -113,7 +131,12 @@ void ImportSpells(SharedDatabase *db) {
sql += "'"; sql += "'";
} }
sql += split[i]; if(split[i].compare("") == 0 && !IsStringField(i)) {
sql += "0";
}
else {
sql += split[i];
}
sql += "'"; sql += "'";
} }
@ -128,7 +151,12 @@ void ImportSpells(SharedDatabase *db) {
sql += "'"; sql += "'";
} }
sql += split[i]; if(split[i].compare("") == 0 && !IsStringField(i)) {
sql += "0";
} else {
sql += split[i];
}
sql += "'"; sql += "'";
} }

3
zone/client.cpp
View File

@ -141,11 +141,10 @@ Client::Client(EQStreamInterface* ieqs)
merc_timer(RuleI(Mercs, UpkeepIntervalMS)), merc_timer(RuleI(Mercs, UpkeepIntervalMS)),
ItemTickTimer(10000), ItemTickTimer(10000),
ItemQuestTimer(500), ItemQuestTimer(500),
anim_change_timer(100),
anon_toggle_timer(250), anon_toggle_timer(250),
afk_toggle_timer(250), afk_toggle_timer(250),
helm_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_Proximity(FLT_MAX, FLT_MAX, FLT_MAX), //arbitrary large number
m_ZoneSummonLocation(-2.0f,-2.0f,-2.0f), m_ZoneSummonLocation(-2.0f,-2.0f,-2.0f),
m_AutoAttackPosition(0.0f, 0.0f, 0.0f, 0.0f), m_AutoAttackPosition(0.0f, 0.0f, 0.0f, 0.0f),

1
zone/client.h
View File

@ -1465,7 +1465,6 @@ private:
Timer TrackingTimer; Timer TrackingTimer;
Timer RespawnFromHoverTimer; Timer RespawnFromHoverTimer;
Timer merc_timer; Timer merc_timer;
Timer anim_change_timer;
Timer anon_toggle_timer; Timer anon_toggle_timer;
Timer afk_toggle_timer; Timer afk_toggle_timer;
Timer helm_toggle_timer; Timer helm_toggle_timer;

3
zone/client_packet.cpp
View File

@ -12584,9 +12584,6 @@ void Client::Handle_OP_SpawnAppearance(const EQApplicationPacket *app)
if (IsAIControlled()) if (IsAIControlled())
return; return;
if(!anim_change_timer.Check())
return;
if (sa->parameter == ANIM_STAND) { if (sa->parameter == ANIM_STAND) {
SetAppearance(eaStanding); SetAppearance(eaStanding);
playeraction = 0; playeraction = 0;