pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 18:52:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Skill caps load with new smem scheme

Browse Source
This commit is contained in:
KimLS
2013-02-20 13:54:26 -08:00
parent 12bde7434a
commit 8eb7d0aaa8
54 changed files with 311 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/CMakeLists.txt
-1
View File
@@ -106,7 +106,6 @@ SET(zone_headers
errmsg.h
event_codes.h
faction.h
features.h
forage.h
groups.h
guild_mgr.h
zone/MobAI.cpp
+1 -1
View File
@@ -32,7 +32,7 @@ using namespace std;
#include "StringIDs.h"
#include "../common/MiscFunctions.h"
#include "../common/rulesys.h"
#include "features.h"
#include "../common/features.h"
#include "QuestParserCollection.h"
#include "watermap.h"
zone/Object.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
#include "../common/packet_functions.h"
#include "../common/packet_dump.h"
#include "../common/MiscFunctions.h"
#include "features.h"
#include "../common/features.h"
#include "StringIDs.h"
using namespace std;
zone/QuestParserCollection.cpp
+1 -1
View File
@@ -4,7 +4,7 @@
#include "QuestInterface.h"
#include "zone.h"
#include "zonedb.h"
#include "features.h"
#include "../common/features.h"
#include <stdio.h>
#include <stdlib.h>
zone/aggro.cpp
+1 -1
View File
@@ -1441,7 +1441,7 @@ bool Mob::PassCharismaCheck(Mob* caster, Mob* spellTarget, uint16 spell_id) {
if(IsCharmSpell(spell_id)) {
if (spells[spell_id].field209 == -1) //If charm spell has this set(-1), it can not break till end of duration.
if (spells[spell_id].powerful_flag == -1) //If charm spell has this set(-1), it can not break till end of duration.
return true;
//1: The mob has a default 25% chance of being allowed a resistance check against the charm.
zone/client.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ using namespace std;
extern volatile bool RunLoops;
#include "features.h"
#include "../common/features.h"
#include "masterentity.h"
#include "worldserver.h"
#include "../common/misc.h"
zone/client_logs.cpp
+1 -1
View File
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "../common/debug.h"
#include "features.h"
#include "../common/features.h"
#ifdef CLIENT_LOGS
#include "client_logs.h"
zone/client_logs.h
+1 -1
View File
@@ -19,7 +19,7 @@
#ifndef CLIENT_LOGS_H
#define CLIENT_LOGS_H
#include "../common/debug.h"
#include "features.h"
#include "../common/features.h"
#ifdef CLIENT_LOGS
#include "../common/eq_packet_structs.h"
zone/command.cpp
+1 -5
View File
@@ -56,7 +56,7 @@
#include "masterentity.h"
#include "map.h"
#include "watermap.h"
#include "features.h"
#include "../common/features.h"
#include "pathing.h"
#include "client_logs.h"
#include "guild_mgr.h"
@@ -4285,13 +4285,10 @@ void command_spellinfo(Client *c, const Seperator *sep)
c->Message(0, " base[12]: %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d", s->base[0], s->base[1], s->base[2], s->base[3], s->base[4], s->base[5], s->base[6], s->base[7], s->base[8], s->base[9], s->base[10], s->base[11]);
c->Message(0, " base22[12]: %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d", s->base2[0], s->base2[1], s->base2[2], s->base2[3], s->base2[4], s->base2[5], s->base2[6], s->base2[7], s->base2[8], s->base2[9], s->base2[10], s->base2[11]);
c->Message(0, " max[12]: %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d", s->max[0], s->max[1], s->max[2], s->max[3], s->max[4], s->max[5], s->max[6], s->max[7], s->max[8], s->max[9], s->max[10], s->max[11]);
c->Message(0, " icon: %d", s->icon);
c->Message(0, " memicon: %d", s->memicon);
c->Message(0, " components[4]: %d, %d, %d, %d", s->components[0], s->components[1], s->components[2], s->components[3]);
c->Message(0, " component_counts[4]: %d, %d, %d, %d", s->component_counts[0], s->component_counts[1], s->component_counts[2], s->component_counts[3]);
c->Message(0, " NoexpendReagent[4]: %d, %d, %d, %d", s->NoexpendReagent[0], s->NoexpendReagent[1], s->NoexpendReagent[2], s->NoexpendReagent[3]);
c->Message(0, " formula[12]: 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x", s->formula[0], s->formula[1], s->formula[2], s->formula[3], s->formula[4], s->formula[5], s->formula[6], s->formula[7], s->formula[8], s->formula[9], s->formula[10], s->formula[11]);
c->Message(0, " LightType: %d", s->LightType);
c->Message(0, " goodEffect: %d", s->goodEffect);
c->Message(0, " Activated: %d", s->Activated);
c->Message(0, " resisttype: %d", s->resisttype);
@@ -4307,7 +4304,6 @@ void command_spellinfo(Client *c, const Seperator *sep)
s->classes[5], s->classes[6], s->classes[7], s->classes[8], s->classes[9],
s->classes[10], s->classes[11], s->classes[12], s->classes[13], s->classes[14]);
c->Message(0, " CastingAnim: %d", s->CastingAnim);
c->Message(0, " TargetAnim: %d", s->TargetAnim);
c->Message(0, " SpellAffectIndex: %d", s->SpellAffectIndex);
c->Message(0, " RecourseLink: %d", s->RecourseLink);
}
zone/embparser.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
#include "../common/debug.h"
#include "masterentity.h"
#include "features.h"
#include "../common/features.h"
#include "embparser.h"
#include "questmgr.h"
#include "command.h"
zone/embparser.h
+1 -1
View File
@@ -9,7 +9,7 @@
#include "client.h"
#include "parser.h"
#include "embperl.h"
#include "features.h"
#include "../common/features.h"
#include "QuestParserCollection.h"
#include "QuestInterface.h"
zone/embperl.cpp
+1 -1
View File
@@ -16,7 +16,7 @@ Eglin
#include <vector>
#include "embperl.h"
#include "embxs.h"
#include "features.h"
#include "../common/features.h"
#ifndef GvCV_set
#define GvCV_set(gv,cv) (GvCV(gv) = (cv))
#endif
zone/entity.cpp
+1 -1
View File
@@ -40,7 +40,7 @@ using namespace std;
#include "../common/packet_functions.h"
#include "petitions.h"
#include "../common/spdat.h"
#include "features.h"
#include "../common/features.h"
#include "StringIDs.h"
#include "parser.h"
#include "../common/dbasync.h"
zone/exp.cpp
+1 -1
View File
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "../common/debug.h"
#include "features.h"
#include "../common/features.h"
#include "masterentity.h"
#include "StringIDs.h"
#include "../common/MiscFunctions.h"
zone/faction.h
+1 -1
View File
@@ -19,7 +19,7 @@
#define FACTION_H
#include "../common/types.h"
#include "features.h"
#include "../common/features.h"
#include <map>
#include <string>
zone/features.h
-308
View File
@@ -1,308 +0,0 @@
/* EQEMu: Everquest Server Emulator
Copyright (C) 2001-2004 EQEMu Development Team (http://eqemu.org)
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY except by those people which sell it, which
are required to give you total support for your newly bought product;
without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef FEATURES_H
#define FEATURES_H
/*
This file defines many optional features for the emu
as well as various parameters used by the emu.
If ambitious, most of these could prolly be turned into
database variables, but the really frequently run pieces
of code, should not be done that way for speed reasons IMO
*/
/*
Core Zone features
*/
//Uncomment this to cause a zone to basically idle
//when there are no players in it, mobs stop wandering, etc..
#define IDLE_WHEN_EMPTY
#ifdef EMBPERL
//Enable the new XS based perl parser
#define EMBPERL_XS
//enable classes in the new XS based parser
#define EMBPERL_XS_CLASSES
//enable IO capture and transmission to in game clients
//this seems to make perl very unhappy on reload, and crashes
#define EMBPERL_IO_CAPTURE
//enable perl-based in-game command, pretty useless without EMBPERL_XS_CLASSES
#define EMBPERL_COMMANDS
//enable #plugin and #peval, which requires IO::Stringy
//#define EMBPERL_EVAL_COMMANDS
#endif
/*
Map Configuration
In general, these computations are expensive, so if you have performance
problems, consider turning them off.
*/
//uncomment this to make the LOS code say all mobs can see all others
//when no map file is loaded, opposed to the default nobody-sees-anybody
#define LOS_DEFAULT_CAN_SEE
/*
Zone extensions and features
*/
//Uncomment this to scale XP gained from MOBs based on their CON
//#define CON_XP_SCALING
//Uncomment to make group buffs affect group pets
#define GROUP_BUFF_PETS
//Uncomment this line to enable named quest files:
#define QUEST_SCRIPTS_BYNAME
#ifdef QUEST_SCRIPTS_BYNAME
//extends byname system to look in a templates directory
//independant of zone name
#define QUEST_TEMPLATES_BYNAME
#define QUEST_TEMPLATES_DIRECTORY "templates"
#endif
//the min ratio at which a mob's speed is reduced
#define FLEE_HP_MINSPEED 22
//number of tics to try to run straight away before looking again
#define FLEE_RUN_DURATION 1000
//number of miliseconds between when a mob will check its flee state
//this is only checked when the mob is damaged.
#define FLEE_CHECK_TIMER 2000
//enable functionality to send log message to the client
//it still needs to be enabled with the #logs command
#define CLIENT_LOGS
//uncomment to print warnings about commands with 0 status...
//#define COMMANDS_WARNINGS
//uncomment to allow perl commands to override compiled commands
#define COMMANDS_PERL_OVERRIDE
//enable logging of commands used
#define COMMANDS_LOGGING
//only log commands which require this minimum status or more
#define COMMANDS_LOGGING_MIN_STATUS 1
//path to where sql logs should be placed
#define SQL_LOG_PATH "sql_logs/"
//New aggro system to reduce overhead.
#define REVERSE_AGGRO
//Enable spacial queue to manage NPC update packets
//#define PACKET_UPDATE_MANAGER
//#define MANAGE_HP_UPDATES
//The highest you can #setskill / #setallskill
#define HIGHEST_CAN_SET_SKILL 400
#define SKILL_MAX_LEVEL 75
//#define MIN_RANGED_ATK_RANGE 25
//replaced the above define with RuleI(Combat, MinRangedAttackDist)
/*
Zone Numerical configuration
*/
//Reuse times for various skills, here for convenience, in sec
//set to 0 to disable server side checking of timers.
enum { //reuse times
FeignDeathReuseTime = 9,
SneakReuseTime = 7,
HideReuseTime = 8,
TauntReuseTime = 5,
InstillDoubtReuseTime = 9,
FishingReuseTime = 11,
ForagingReuseTime = 50,
MendReuseTime = 290,
BashReuseTime = 5,
BackstabReuseTime = 9,
KickReuseTime = 5,
TailRakeReuseTime = 6,
EagleStrikeReuseTime = 5,
RoundKickReuseTime = 9,
TigerClawReuseTime = 6,
FlyingKickReuseTime = 7,
SenseTrapsReuseTime = 9,
DisarmTrapsReuseTime = 9,
HarmTouchReuseTime = 4300,
LayOnHandsReuseTime = 4300,
FrenzyReuseTime = 10
};
enum { //timer settings, all in milliseconds
AImovement_duration = 100,
AIthink_duration = 150,
AIscanarea_delay = 500,
AIfeignremember_delay = 500,
AItarget_check_duration = 500,
AIClientScanarea_delay = 750, //used in REVERSE_AGGRO
AIassistcheck_delay = 3000, //now often a fighting NPC will yell for help
ClientProximity_interval = 1000,
CombatEventTimer_expire = 12000,
Tribute_duration = 600000,
ZoneTimerResolution = 3, //sleep time between zone main loop runs (milliseconds)
FeignMemoryDuration = 120000, // EverHood - Duration player must feign death to clear zonewide agro.
EnragedTimer = 360000,
EnragedDurationTimer = 10000
};
enum { //some random constants
//each of these attack modifiers are added to the NPC's level to determine their
//probability of executing such an attack (which may or may not hit)
NPCDualAttackModifier = 20,
NPCTripleAttackModifier = 0,
NPCQuadAttackModifier = -20
};
//Max number of groups you can link with. Not tied to the client.
//if group linking is enabled above
#define MAX_GROUP_LINKS 8
//this is the number of levels above the thief's level that
//an npc can be and still let the theif PP them
#define THIEF_PICKPOCKET_OVER 5
//this is the % chance that an NPC will dual wield a 2nd weapon
//in its loot table, if it is able to.
//Aug 2007: was 5% chance.. changed to 100% by default since that seems more normal
//Kept it intact codewise incase someone wants to or is already using it.
#define NPC_DW_CHANCE 100
//This is the entry in npc_types to spawn for trap damagaes
#define TRAP_NPC_TYPE 1586
//This is the multiplier of eqemu speed to get client speed
//tweak this if pathing mobs seem to jump forward or backwards
//this should prolly be dynamic based on ping time or something.. who knows
//Values found in the emu somewhere at one point in time: 36, 43
#define NPC_RUNANIM_RATIO 37
//this is used to multiply an NPCs movement rate, yeilding map units..
#define NPC_SPEED_MULTIPLIER 46 //used to be 2.8... no idea why it changed
//minimum level to do alchemy
#define MIN_LEVEL_ALCHEMY 25
//chance ratio that a
#define THREATENLY_ARRGO_CHANCE 32 // 32/128 (25%) chance that a mob will arrgo on con Threatenly
// max factions per npc faction list
#define MAX_NPC_FACTIONS 20
//value caps
#define MAX_FACTION 1500
#define MIN_FACTION -1500
//The Level Cap:
//#define LEVEL_CAP RuleI(Character, MaxLevel) //hard cap is 127
#define HARD_LEVEL_CAP 127
//the square of the maximum range at whihc you could possibly use NPC services (shop, tribute, etc)
#define USE_NPC_RANGE2 200*200 //arbitrary right now
//the formula for experience for killing a mob.
//level is the only valid variable to use
#define EXP_FORMULA level*level*75*35/10
#define HIGHEST_AA_VALUE 35
//Leadership AA experience points
#define GROUP_EXP_PER_POINT 1000
#define RAID_EXP_PER_POINT 2000
//Some hard coded statuses from commands and other places:
enum {
minStatusToBeGM = 40,
minStatusToUseGMCommands = 80,
minStatusToKick = 150,
minStatusToAvoidFalling = 100,
minStatusToHaveInvalidSpells = 80,
minStatusToHaveInvalidSkills = 80,
minStatusToIgnoreZoneFlags = 80,
minStatusToSeeOthersZoneFlags = 80,
minStatusToEditOtherGuilds = 80,
commandMovecharSelfOnly = 80, //below this == only self move allowed
commandMovecharToSpecials = 200, //ability to send people to cshom/load zones
commandZoneToSpecials = 80, //zone to cshome, out of load zones
commandToggleAI = 250, //can turn NPC AI on and off
commandCastSpecials = 100, //can cast special spells
commandInstacast = 100, //insta-cast all #casted spells
commandLevelAboveCap = 100, //can #level players above level cap
commandLevelNPCAboveCap = 100, //can #level NPCs above level cap
commandSetSkillsOther = 100, //ability to setskills on others
commandRaceOthers = 100, //ability to #race on others
commandGenderOthers = 100, //ability to #gender on others
commandTextureOthers = 100, //ability to #texture on others
commandDoAnimOthers = 100, //can #doanim on others
commandLockZones = 101, //can lock or unlock zones
commandEditPlayerCorpses = 150, //can Edit Player Corpses
commandChangeFlags = 200, //ability to set/refresh flags
commandBanPlayers = 100, //can set bans on players
commandChangeDatarate = 201, //edit client's data rate
commandZoneToCoords = 0 //can #zone with coords
};
//default states for logging flag on NPCs and clients (having NPCs on by default is prolly a bad idea)
#define CLIENT_DEFAULT_LOGGING_ENABLED true
#define NPC_DEFAULT_LOGGING_ENABLED false
/*
Developer configuration
*/
//#define EQPROFILE
#ifdef EQPROFILE
//Enable the zone profiler
#define ZONE_PROFILE
#define COMMON_PROFILE
#define PROFILE_DUMP_TIME 3*60
#endif //EQPROFILE
#endif
zone/groups.h
+1 -1
View File
@@ -24,7 +24,7 @@
#include "../common/eq_packet_structs.h"
#include "entity.h"
#include "mob.h"
#include "features.h"
#include "../common/features.h"
#include "../common/servertalk.h"
#define MAX_MARKED_NPCS 3
zone/mob.h
+1 -1
View File
@@ -18,7 +18,7 @@
#ifndef MOB_H
#define MOB_H
#include "features.h"
#include "../common/features.h"
#include "common.h"
#include "entity.h"
#include "hate_list.h"
zone/net.cpp
+2 -67
View File
@@ -17,7 +17,7 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org)
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "../common/debug.h"
#include "features.h"
#include "../common/features.h"
#include <iostream>
using namespace std;
#include <string.h>
@@ -599,15 +599,6 @@ NetConnection::~NetConnection() {
if (WorldAddress != 0)
safe_delete_array(WorldAddress);
}
bool chrcmpI(const char* a, const char* b) {
#if EQDEBUG >= 11
_log(EQEMuLog::Debug, "crhcmpl() a:%i b:%i", (int*) a, (int*) b);
#endif
if(((int)* a)==((int)* b))
return false;
else
return true;
}
void LoadSpells(EQEmu::MemoryMappedFile **mmf) {
int records = database.GetMaxSpellID() + 1;
@@ -618,7 +609,7 @@ void LoadSpells(EQEmu::MemoryMappedFile **mmf) {
*mmf = new EQEmu::MemoryMappedFile("shared/spells");
uint32 size = (*mmf)->Size();
if(size != (records * sizeof(SPDat_Spell_Struct))) {
EQ_EXCEPT("zone", "Unable to load spells: (*mmf)->Size() != records * sizeof(SPDat_Spell_Struct)");
EQ_EXCEPT("Zone", "Unable to load spells: (*mmf)->Size() != records * sizeof(SPDat_Spell_Struct)");
}
spells = reinterpret_cast<SPDat_Spell_Struct*>((*mmf)->Get());
@@ -658,59 +649,3 @@ void UpdateWindowTitle(char* iNewTitle) {
#endif
}
/*bool ZoneBootup(uint32 iZoneID, bool iStaticZone) {
const char* zonename = database.GetZoneName(iStaticZone);
if (iZoneID == 0 || zonename == 0)
return false;
if (zone != 0 || ZoneLoaded) {
cerr << "Error: Zone::Bootup call when zone already booted!" << endl;
worldserver.SetZone(0);
return false;
}
numclients = 0;
zone = new Zone(iZoneID, zonename, net.GetZoneAddress(), net.GetZonePort());
if (!zone->Init(iStaticZone)) {
safe_delete(zone);
cerr << "Zone->Init failed" << endl;
worldserver.SetZone(0);
return false;
}
if (!eqns.Open(net.GetZonePort())) {
safe_delete(zone);
cerr << "NetConnection::Init failed" << endl;
worldserver.SetZone(0);
return false;
}
if (!zone->LoadZoneCFG(zone->GetShortName(), true)) // try loading the zone name...
zone->LoadZoneCFG(zone->GetFileName()); // if that fails, try the file name, then load defaults
//petition_list.ClearPetitions();
//petition_list.ReadDatabase();
ZoneLoaded = true;
worldserver.SetZone(iZoneID);
zone->GetTimeSync();
cout << "-----------" << endl << "Zone server '" << zonename << "' listening on port:" << net.GetZonePort() << endl << "-----------" << endl;
//entity_list.WriteEntityIDs();
UpdateWindowTitle();
return true;
}*/
// Original source found at http://www.castaglia.org/proftpd/doc/devel-guide/src/lib/strsep.c.html
char *strsep(char **stringp, const char *delim)
{
char *res;
if(!stringp || !*stringp || !**stringp)
return (char*)0;
res = *stringp;
while(**stringp && !strchr(delim,**stringp))
(*stringp)++;
if(**stringp) {
**stringp = '\0';
(*stringp)++;
}
return res;
}
zone/perl_PlayerCorpse.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "features.h"
#include "../common/features.h"
#ifdef EMBPERL_XS_CLASSES
#include "../common/debug.h"
#include "embperl.h"
zone/perl_client.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "features.h"
#include "../common/features.h"
#ifdef EMBPERL_XS_CLASSES
#include "../common/debug.h"
#include "embperl.h"
zone/perl_doors.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "features.h"
#include "../common/features.h"
#ifdef EMBPERL_XS_CLASSES
#include "../common/debug.h"
#include "embperl.h"
zone/perl_entity.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "features.h"
#include "../common/features.h"
#ifdef EMBPERL_XS_CLASSES
#include "../common/debug.h"
#include <list>
zone/perl_groups.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "features.h"
#include "../common/features.h"
#ifdef EMBPERL_XS_CLASSES
#include "../common/debug.h"
#include "embperl.h"
zone/perl_hateentry.cpp
+1 -1
View File
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "features.h"
#include "../common/features.h"
#include "client.h"
#ifdef EMBPERL_XS_CLASSES
#include "../common/debug.h"
zone/perl_mob.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "features.h"
#include "../common/features.h"
#ifdef EMBPERL_XS_CLASSES
#include "../common/debug.h"
#include "embperl.h"
zone/perl_npc.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "features.h"
#include "../common/features.h"
#ifdef EMBPERL_XS_CLASSES
#include "../common/debug.h"
#include "embperl.h"
zone/perl_object.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "features.h"
#include "../common/features.h"
#ifdef EMBPERL_XS_CLASSES
#include "../common/debug.h"
#include "embperl.h"
zone/perl_perlpacket.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "features.h"
#include "../common/features.h"
#ifdef EMBPERL_XS_CLASSES
#include "../common/debug.h"
#include "embperl.h"
zone/perl_questitem.cpp
+1 -1
View File
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "features.h"
#include "../common/features.h"
#include "client.h"
#ifdef EMBPERL_XS_CLASSES
#include "../common/debug.h"
zone/perl_raids.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "features.h"
#include "../common/features.h"
#ifdef EMBPERL_XS_CLASSES
#include "../common/debug.h"
#include "embperl.h"
zone/perlparser.cpp
+1 -1
View File
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "features.h"
#include "../common/features.h"
#ifdef EMBPERL
#ifdef EMBPERL_XS
zone/spell_effects.cpp
+1 -1
View File
@@ -741,7 +741,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial)
// define spells with fixed duration
// charm spells with -1 in field 209 are all of fixed duration, so lets use that instead of spell_ids
if(spells[spell_id].field209 == -1)
if(spells[spell_id].powerful_flag == -1)
bBreak = true;
if (!bBreak)
zone/tasks.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net)
#include "../common/MiscFunctions.h"
#include "../common/rulesys.h"
#include "masterentity.h"
#include "features.h"
#include "../common/features.h"
#include "QuestParserCollection.h"
zone/tribute.cpp
+1 -1
View File
@@ -17,7 +17,7 @@
*/
#include "../common/debug.h"
#include "../common/eq_packet_structs.h"
#include "features.h"
#include "../common/features.h"
#include "masterentity.h"
#include "../common/packet_dump.h"
#include "../common/MiscFunctions.h"
zone/updatemgr.cpp
+1 -1
View File
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "../common/debug.h"
#include "features.h"
#include "../common/features.h"
#ifdef PACKET_UPDATE_MANAGER
#include "updatemgr.h"
zone/updatemgr.h
+1 -1
View File
@@ -18,7 +18,7 @@
#ifndef UPDATE_MANAGER_H
#define UPDATE_MANAGER_H
#include "features.h"
#include "../common/features.h"
#ifdef PACKET_UPDATE_MANAGER
#include "../common/timer.h"
zone/waypoints.cpp
+1 -1
View File
@@ -33,7 +33,7 @@ using namespace std;
#include "StringIDs.h"
#include "../common/MiscFunctions.h"
#include "../common/rulesys.h"
#include "features.h"
#include "../common/features.h"
#include "QuestParserCollection.h"
struct wp_distance
zone/zone.cpp
+1 -1
View File
@@ -35,7 +35,7 @@ using namespace std;
#endif
#include "masterentity.h"
#include "features.h"
#include "../common/features.h"
#include "spawngroup.h"
#include "spawn2.h"
#include "zone.h"
zone/zone.h
+1 -1
View File
@@ -25,7 +25,7 @@
#include "../common/servertalk.h"
#include "../common/rulesys.h"
#include "../common/eq_packet_structs.h"
#include "features.h"
#include "../common/features.h"
#include "spawngroup.h"
//#include "mob.h"
#include "zonedump.h"
zone/zone_profile.cpp
+1 -1
View File
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "../common/debug.h"
#include "features.h"
#include "../common/features.h"
#ifdef EQPROFILE
#include "zone_profile.h"
zone/zone_profile.h
+1 -1
View File
@@ -19,7 +19,7 @@
#define ZONE_PROFILE_H
#ifdef ZONE //only possibly profile if we are building zone
#include "features.h"
#include "../common/features.h"
#endif
#ifdef EQPROFILE