pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-12 08:02:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge git://github.com/EQEmu/Server into Development

Browse Source
This commit is contained in:
KayenEQ 2014-10-31 21:47:20 -04:00
commit 441ddf233a
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
utils/sql/git/required/2014_10_16_special_abilities_null.sql
View File

@ -1,4 +0,0 @@
ALTER TABLE `merc_stats` MODIFY COLUMN `special_abilities` text CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL AFTER `attack_speed`;
ALTER TABLE `npc_types` MODIFY COLUMN `special_abilities` text CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL AFTER `npcspecialattks`;

4
utils/sql/git/required/2014_10_30_special_abilities_null.sql Normal file
View File

@ -0,0 +1,4 @@
ALTER TABLE `merc_stats` MODIFY COLUMN `special_abilities` text CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL;
ALTER TABLE `npc_types` MODIFY COLUMN `special_abilities` text CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL;

12
zone/questmgr.cpp
View File

@ -1290,9 +1290,9 @@ void QuestManager::signal(int npc_id, int wait_ms) {
void QuestManager::setglobal(const char *varname, const char *newvalue, int options, const char *duration) { void QuestManager::setglobal(const char *varname, const char *newvalue, int options, const char *duration) {
QuestManagerCurrentQuestVars(); QuestManagerCurrentQuestVars();
int qgZoneid=zone->GetZoneID(); int qgZoneid = zone->GetZoneID();
int qgCharid=0; int qgCharid = 0;
int qgNpcid = owner->GetNPCTypeID(); int qgNpcid = owner ? owner->GetNPCTypeID() : 0; // encounter scripts don't have an owner
/* options value determines the availability of global variables to NPCs when a quest begins /* options value determines the availability of global variables to NPCs when a quest begins
------------------------------------------------------------------ ------------------------------------------------------------------
@ -1410,9 +1410,9 @@ void QuestManager::targlobal(const char *varname, const char *value, const char
void QuestManager::delglobal(const char *varname) { void QuestManager::delglobal(const char *varname) {
QuestManagerCurrentQuestVars(); QuestManagerCurrentQuestVars();
int qgZoneid=zone->GetZoneID(); int qgZoneid = zone->GetZoneID();
int qgCharid=0; int qgCharid = 0;
int qgNpcid=owner->GetNPCTypeID(); int qgNpcid = owner ? owner->GetNPCTypeID() : 0; // encounter scripts don't have an owner
if (initiator && initiator->IsClient()) // some events like waypoint and spawn don't have a player involved if (initiator && initiator->IsClient()) // some events like waypoint and spawn don't have a player involved
qgCharid=initiator->CharacterID(); qgCharid=initiator->CharacterID();