mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-05 07:52:25 +00:00
Fix int16 spell ID limit with items (click, procs, etc)
See issue #7 (Did we resolve it yet?)
This commit is contained in:
parent
f188851bfb
commit
7c4abcc68d
@ -51,7 +51,7 @@
|
||||
**
|
||||
*/
|
||||
struct ItemEffect_Struct {
|
||||
int16 Effect;
|
||||
int32 Effect;
|
||||
uint8 Type;
|
||||
uint8 Level;
|
||||
uint8 Level2;
|
||||
|
||||
@ -4624,7 +4624,7 @@ struct ClickEffectStruct
|
||||
|
||||
struct ProcEffectStruct
|
||||
{
|
||||
uint32 effect;
|
||||
int32 effect;
|
||||
uint8 level2;
|
||||
uint32 type;
|
||||
uint8 level;
|
||||
@ -4639,7 +4639,7 @@ struct ProcEffectStruct
|
||||
|
||||
struct WornEffectStruct //worn, focus and scroll effect
|
||||
{
|
||||
uint32 effect;
|
||||
int32 effect;
|
||||
uint8 level2;
|
||||
uint32 type;
|
||||
uint8 level;
|
||||
|
||||
@ -4623,7 +4623,7 @@ struct ClickEffectStruct
|
||||
|
||||
struct ProcEffectStruct
|
||||
{
|
||||
uint32 effect;
|
||||
int32 effect;
|
||||
uint8 level2;
|
||||
uint32 type;
|
||||
uint8 level;
|
||||
@ -4638,7 +4638,7 @@ struct ProcEffectStruct
|
||||
|
||||
struct WornEffectStruct //worn, focus and scroll effect
|
||||
{
|
||||
uint32 effect;
|
||||
int32 effect;
|
||||
uint8 level2;
|
||||
uint32 type;
|
||||
uint8 level;
|
||||
|
||||
@ -4111,7 +4111,7 @@ struct ClickEffectStruct
|
||||
|
||||
struct ProcEffectStruct
|
||||
{
|
||||
uint32 effect;
|
||||
int32 effect;
|
||||
uint8 level2;
|
||||
uint32 type;
|
||||
uint8 level;
|
||||
@ -4126,7 +4126,7 @@ struct ProcEffectStruct
|
||||
|
||||
struct WornEffectStruct //worn, focus and scroll effect
|
||||
{
|
||||
uint32 effect;
|
||||
int32 effect;
|
||||
uint8 level2;
|
||||
uint32 type;
|
||||
uint8 level;
|
||||
|
||||
@ -3965,7 +3965,7 @@ struct ClickEffectStruct
|
||||
|
||||
struct ProcEffectStruct
|
||||
{
|
||||
uint32 effect;
|
||||
int32 effect;
|
||||
uint8 level2;
|
||||
uint32 type;
|
||||
uint8 level;
|
||||
@ -3980,7 +3980,7 @@ struct ProcEffectStruct
|
||||
|
||||
struct WornEffectStruct //worn, focus and scroll effect
|
||||
{
|
||||
uint32 effect;
|
||||
int32 effect;
|
||||
uint8 level2;
|
||||
uint32 type;
|
||||
uint8 level;
|
||||
|
||||
@ -4206,7 +4206,7 @@ struct ClickEffectStruct
|
||||
|
||||
struct ProcEffectStruct
|
||||
{
|
||||
uint32 effect;
|
||||
int32 effect;
|
||||
uint8 level2;
|
||||
uint32 type;
|
||||
uint8 level;
|
||||
@ -4221,7 +4221,7 @@ struct ProcEffectStruct
|
||||
|
||||
struct WornEffectStruct //worn, focus and scroll effect
|
||||
{
|
||||
uint32 effect;
|
||||
int32 effect;
|
||||
uint8 level2;
|
||||
uint32 type;
|
||||
uint8 level;
|
||||
|
||||
@ -997,23 +997,23 @@ void SharedDatabase::LoadItems(void *data, uint32 size, int32 items, uint32 max_
|
||||
|
||||
strcpy(item.CharmFile,row[ItemField::charmfile]);
|
||||
|
||||
item.Proc.Effect = (uint16)atoul(row[ItemField::proceffect]);
|
||||
item.Proc.Effect = (int32)atoul(row[ItemField::proceffect]);
|
||||
item.Proc.Type = (uint8)atoul(row[ItemField::proctype]);
|
||||
item.Proc.Level = (uint8)atoul(row[ItemField::proclevel]);
|
||||
item.Proc.Level2 = (uint8)atoul(row[ItemField::proclevel2]);
|
||||
item.Worn.Effect = (uint16)atoul(row[ItemField::worneffect]);
|
||||
item.Worn.Effect = (int32)atoul(row[ItemField::worneffect]);
|
||||
item.Worn.Type = (uint8)atoul(row[ItemField::worntype]);
|
||||
item.Worn.Level = (uint8)atoul(row[ItemField::wornlevel]);
|
||||
item.Worn.Level2 = (uint8)atoul(row[ItemField::wornlevel2]);
|
||||
item.Focus.Effect = (uint16)atoul(row[ItemField::focuseffect]);
|
||||
item.Focus.Effect = (int32)atoul(row[ItemField::focuseffect]);
|
||||
item.Focus.Type = (uint8)atoul(row[ItemField::focustype]);
|
||||
item.Focus.Level = (uint8)atoul(row[ItemField::focuslevel]);
|
||||
item.Focus.Level2 = (uint8)atoul(row[ItemField::focuslevel2]);
|
||||
item.Scroll.Effect = (uint16)atoul(row[ItemField::scrolleffect]);
|
||||
item.Scroll.Effect = (int32)atoul(row[ItemField::scrolleffect]);
|
||||
item.Scroll.Type = (uint8)atoul(row[ItemField::scrolltype]);
|
||||
item.Scroll.Level = (uint8)atoul(row[ItemField::scrolllevel]);
|
||||
item.Scroll.Level2 = (uint8)atoul(row[ItemField::scrolllevel2]);
|
||||
item.Bard.Effect = (uint16)atoul(row[ItemField::bardeffect]);
|
||||
item.Bard.Effect = (int32)atoul(row[ItemField::bardeffect]);
|
||||
item.Bard.Type = (uint8)atoul(row[ItemField::bardtype]);
|
||||
item.Bard.Level = (uint8)atoul(row[ItemField::bardlevel]);
|
||||
item.Bard.Level2 = (uint8)atoul(row[ItemField::bardlevel2]);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user