mirror of
https://github.com/EQEmu/Server.git
synced 2025-12-13 23:01:30 +00:00
Merge pull request #344 from KayenEQ/Development
Fix for compile issue with vs2012
This commit is contained in:
commit
a71690b725
14
zone/aa.cpp
14
zone/aa.cpp
@ -547,9 +547,9 @@ void Mob::TemporaryPets(uint16 spell_id, Mob *targ, const char *name_override, u
|
|||||||
summon_count = MAX_SWARM_PETS;
|
summon_count = MAX_SWARM_PETS;
|
||||||
|
|
||||||
static const xy_location swarmPetLocations[MAX_SWARM_PETS] = {
|
static const xy_location swarmPetLocations[MAX_SWARM_PETS] = {
|
||||||
{5, 5}, {-5, 5}, {5, -5}, {-5, -5},
|
xy_location(5, 5), xy_location(-5, 5), xy_location(5, -5), xy_location(-5, -5),
|
||||||
{10, 10}, {-10, 10}, {10, -10}, {-10, -10},
|
xy_location(10, 10), xy_location(-10, 10), xy_location(10, -10), xy_location(-10, -10),
|
||||||
{8, 8}, {-8, 8}, {8, -8}, {-8, -8}
|
xy_location(8, 8), xy_location(-8, 8), xy_location(8, -8), xy_location(-8, -8)
|
||||||
};
|
};
|
||||||
|
|
||||||
while(summon_count > 0) {
|
while(summon_count > 0) {
|
||||||
@ -644,10 +644,10 @@ void Mob::TypesTemporaryPets(uint32 typesid, Mob *targ, const char *name_overrid
|
|||||||
summon_count = MAX_SWARM_PETS;
|
summon_count = MAX_SWARM_PETS;
|
||||||
|
|
||||||
static const xy_location swarmPetLocations[MAX_SWARM_PETS] = {
|
static const xy_location swarmPetLocations[MAX_SWARM_PETS] = {
|
||||||
{5, 5}, {-5, 5}, {5, -5}, {-5, -5},
|
xy_location(5, 5), xy_location(-5, 5), xy_location(5, -5), xy_location(-5, -5),
|
||||||
{10, 10}, {-10, 10}, {10, -10}, {-10, -10},
|
xy_location(10, 10), xy_location(-10, 10), xy_location(10, -10), xy_location(-10, -10),
|
||||||
{8, 8}, {-8, 8}, {8, -8}, {-8, -8}
|
xy_location(8, 8), xy_location(-8, 8), xy_location(8, -8), xy_location(-8, -8)
|
||||||
};
|
};;
|
||||||
|
|
||||||
while(summon_count > 0) {
|
while(summon_count > 0) {
|
||||||
int pet_duration = pet.duration;
|
int pet_duration = pet.duration;
|
||||||
|
|||||||
@ -6275,9 +6275,9 @@ void Client::Doppelganger(uint16 spell_id, Mob *target, const char *name_overrid
|
|||||||
summon_count = MAX_SWARM_PETS;
|
summon_count = MAX_SWARM_PETS;
|
||||||
|
|
||||||
static const xy_location swarmPetLocations[MAX_SWARM_PETS] = {
|
static const xy_location swarmPetLocations[MAX_SWARM_PETS] = {
|
||||||
{5, 5}, {-5, 5}, {5, -5}, {-5, -5},
|
xy_location(5, 5), xy_location(-5, 5), xy_location(5, -5), xy_location(-5, -5),
|
||||||
{10, 10}, {-10, 10}, {10, -10}, {-10, -10},
|
xy_location(10, 10), xy_location(-10, 10), xy_location(10, -10), xy_location(-10, -10),
|
||||||
{8, 8}, {-8, 8}, {8, -8}, {-8, -8}
|
xy_location(8, 8), xy_location(-8, 8), xy_location(8, -8), xy_location(-8, -8)
|
||||||
};
|
};
|
||||||
|
|
||||||
while(summon_count > 0) {
|
while(summon_count > 0) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user