pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-02 16:46:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge from master

Browse Source
This commit is contained in:
KimLS
2013-06-17 11:47:45 -07:00
parent c0d37b2e04 e811e3975b
commit bb8d11a57b
10 changed files with 41 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/patches/RoF.cpp
+4
View File
@@ -4992,7 +4992,11 @@ char* SerializeItem(const ItemInst *inst, int16 slot_id_in, uint32 *length, uint
ibs.Magic = item->Magic;
ibs.CastTime_ = item->CastTime_;
ibs.ReqLevel = item->ReqLevel;
if(item->ReqLevel > 100)
ibs.ReqLevel = 100;
ibs.RecLevel = item->RecLevel;
if(item->RecLevel > 100)
ibs.RecLevel = 100;
ibs.RecSkill = item->RecSkill;
ibs.BardType = item->BardType;
ibs.BardValue = item->BardValue;
common/spdat.h
+1 -1
View File
@@ -625,7 +625,7 @@ struct SPDat_Spell_Struct
/* 019 */ uint16 mana; // Mana Used
/* 020 */ int base[EFFECT_COUNT]; //various purposes
/* 032 */ int base2[EFFECT_COUNT]; //various purposes
/* 044 */ int16 max[EFFECT_COUNT];
/* 044 */ int32 max[EFFECT_COUNT];
/* 056 */ //uint16 icon; // Spell icon
/* 057 */ //uint16 memicon; // Icon on membarthing
/* 058 */ int32 components[4]; // reagents