Update UF packet stuff to have 30 BUFF_COUNT

This commit is contained in:
Michael Cook (mackal) 2016-08-02 21:10:32 -04:00
parent d68a3b191e
commit 37ecc69088
2 changed files with 3 additions and 6 deletions

View File

@ -1870,7 +1870,7 @@ namespace UF
OUT(thirst_level); OUT(thirst_level);
OUT(hunger_level); OUT(hunger_level);
//PS this needs to be figured out more; but it was 'good enough' //PS this needs to be figured out more; but it was 'good enough'
for (r = 0; r < structs::BUFF_COUNT; r++) for (r = 0; r < BUFF_COUNT; r++)
{ {
if (emu->buffs[r].spellid != 0xFFFF && emu->buffs[r].spellid != 0) if (emu->buffs[r].spellid != 0xFFFF && emu->buffs[r].spellid != 0)
{ {

View File

@ -26,7 +26,7 @@ namespace UF
namespace structs { namespace structs {
static const uint32 BUFF_COUNT = 25; static const uint32 BUFF_COUNT = 30;
/* /*
** Compiler override to ensure ** Compiler override to ensure
@ -958,8 +958,7 @@ struct PlayerProfile_Struct
/*07880*/ uint32 toxicity; // Potion Toxicity (15=too toxic, each potion adds 3) /*07880*/ uint32 toxicity; // Potion Toxicity (15=too toxic, each potion adds 3)
/*07884*/ uint32 thirst_level; // Drink (ticks till next drink) /*07884*/ uint32 thirst_level; // Drink (ticks till next drink)
/*07888*/ uint32 hunger_level; // Food (ticks till next eat) /*07888*/ uint32 hunger_level; // Food (ticks till next eat)
/*07892*/ SpellBuff_Struct buffs[BUFF_COUNT]; // [1900] Buffs currently on the player (30 Max) - (Each Size 76) /*07892*/ SpellBuff_Struct buffs[BUFF_COUNT]; // [2280] Buffs currently on the player (30 Max) - (Each Size 76)
/*09792*/ uint8 unknown09792[380]; // BUFF_COUNT has been left at 25. These are the extra 5 buffs in Underfoot
/*10172*/ Disciplines_Struct disciplines; // [400] Known disciplines /*10172*/ Disciplines_Struct disciplines; // [400] Known disciplines
/*10972*/ uint32 recastTimers[MAX_RECAST_TYPES]; // Timers (UNIX Time of last use) /*10972*/ uint32 recastTimers[MAX_RECAST_TYPES]; // Timers (UNIX Time of last use)
/*11052*/ uint8 unknown11052[160]; // Some type of Timers /*11052*/ uint8 unknown11052[160]; // Some type of Timers
@ -2167,9 +2166,7 @@ struct GroupFollow_Struct { // Underfoot Follow Struct
struct InspectBuffs_Struct { struct InspectBuffs_Struct {
/*000*/ uint32 spell_id[BUFF_COUNT]; /*000*/ uint32 spell_id[BUFF_COUNT];
/*100*/ uint32 filler100[5]; // BUFF_COUNT is really 30...
/*120*/ int32 tics_remaining[BUFF_COUNT]; /*120*/ int32 tics_remaining[BUFF_COUNT];
/*220*/ uint32 filler220[5]; // BUFF_COUNT is really 30...
}; };