mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-16 18:52:22 +00:00
Make use of the targetable_with_hotkey flag for SoF+
This commit is contained in:
@@ -363,6 +363,7 @@ union
|
||||
uint32 DestructibleUnk7;
|
||||
uint8 DestructibleUnk8;
|
||||
uint32 DestructibleUnk9;
|
||||
bool targetable_with_hotkey;
|
||||
|
||||
};
|
||||
|
||||
|
||||
@@ -3706,7 +3706,7 @@ namespace RoF
|
||||
Bitfields->showhelm = emu->showhelm;
|
||||
Bitfields->trader = 0;
|
||||
Bitfields->targetable = 1;
|
||||
Bitfields->targetable_with_hotkey = (emu->IsMercenary ? 0 : 1);
|
||||
Bitfields->targetable_with_hotkey = emu->targetable_with_hotkey ? 1 : 0;
|
||||
Bitfields->showname = ShowName;
|
||||
|
||||
// Not currently found
|
||||
|
||||
@@ -3706,7 +3706,7 @@ namespace RoF2
|
||||
Bitfields->showhelm = emu->showhelm;
|
||||
Bitfields->trader = 0;
|
||||
Bitfields->targetable = 1;
|
||||
Bitfields->targetable_with_hotkey = (emu->IsMercenary ? 0 : 1);
|
||||
Bitfields->targetable_with_hotkey = emu->targetable_with_hotkey ? 1 : 0;
|
||||
Bitfields->showname = ShowName;
|
||||
|
||||
// Not currently found
|
||||
|
||||
@@ -2383,7 +2383,7 @@ namespace SoD
|
||||
Bitfields->anon = emu->anon;
|
||||
Bitfields->showhelm = emu->showhelm;
|
||||
Bitfields->targetable = 1;
|
||||
Bitfields->targetable_with_hotkey = (emu->IsMercenary ? 0 : 1);
|
||||
Bitfields->targetable_with_hotkey = emu->targetable_with_hotkey ? 1 : 0;
|
||||
Bitfields->statue = 0;
|
||||
Bitfields->trader = 0;
|
||||
Bitfields->buyer = 0;
|
||||
|
||||
@@ -1889,7 +1889,7 @@ namespace SoF
|
||||
eq->beard = emu->beard;
|
||||
eq->targetable = 1; //New Field - Toggle Targetable on or off - 0 = off, 1 = on
|
||||
eq->NPC = emu->NPC;
|
||||
eq->targetable_with_hotkey = 1;//New Field - Toggle Targetable on or off - 0 = off, 1 = on
|
||||
eq->targetable_with_hotkey = emu->targetable_with_hotkey ? 1 : 0; //New Field - Toggle Targetable on or off - 0 = off, 1 = on
|
||||
eq->x = emu->x;
|
||||
eq->deltaX = emu->deltaX;
|
||||
eq->deltaY = emu->deltaY;
|
||||
|
||||
@@ -2668,7 +2668,7 @@ namespace Underfoot
|
||||
Bitfields->anon = emu->anon;
|
||||
Bitfields->showhelm = emu->showhelm;
|
||||
Bitfields->targetable = 1;
|
||||
Bitfields->targetable_with_hotkey = (emu->IsMercenary ? 0 : 1);
|
||||
Bitfields->targetable_with_hotkey = emu->targetable_with_hotkey ? 1 : 0;
|
||||
Bitfields->statue = 0;
|
||||
Bitfields->trader = 0;
|
||||
Bitfields->buyer = 0;
|
||||
|
||||
Reference in New Issue
Block a user