mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 22:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10326] Process GAMEOBJECT_TYPE_FISHINGHOLE in normal way as for other GO's

Browse source 
Signed-off-by: NoFantasy <nofantasy@nf.no>
This commit is contained in:
NoFantasy 2010-08-06 15:30:12 +02:00
parent 027261e295
commit 2c165670b1
3 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/game/GameObject.cpp
View file

@ -1137,8 +1137,7 @@ void GameObject::Use(Unit* user)
GameObject* ok = LookupFishingHoleAround(20.0f + CONTACT_DISTANCE); GameObject* ok = LookupFishingHoleAround(20.0f + CONTACT_DISTANCE);
if (ok) if (ok)
{ {
player->SendLoot(ok->GetGUID(),LOOT_FISHINGHOLE); ok->Use(player);
player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_FISH_IN_GAMEOBJECT, ok->GetGOInfo()->id);
SetLootState(GO_JUST_DEACTIVATED); SetLootState(GO_JUST_DEACTIVATED);
} }
else else
@ -1335,6 +1334,17 @@ void GameObject::Use(Unit* user)
} }
break; break;
} }
case GAMEOBJECT_TYPE_FISHINGHOLE: // 25
{
if (user->GetTypeId() != TYPEID_PLAYER)
return;
Player* player = (Player*)user;
player->SendLoot(GetGUID(), LOOT_FISHINGHOLE);
player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_FISH_IN_GAMEOBJECT, GetGOInfo()->id);
return;
}
case GAMEOBJECT_TYPE_FLAGDROP: // 26 case GAMEOBJECT_TYPE_FLAGDROP: // 26
{ {
if (user->GetTypeId() != TYPEID_PLAYER) if (user->GetTypeId() != TYPEID_PLAYER)

2
src/game/GameObject.h
View file

@ -281,7 +281,7 @@ struct GameObjectInfo
uint32 openTextID; //6 uint32 openTextID; //6
uint32 losOK; //7 uint32 losOK; //7
} flagstand; } flagstand;
//25 GAMEOBJECT_TYPE_FISHINGHOLE // not implemented yet //25 GAMEOBJECT_TYPE_FISHINGHOLE
struct struct
{ {
uint32 radius; //0 how close bobber must land for sending loot uint32 radius; //0 how close bobber must land for sending loot

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10325" #define REVISION_NR "10326"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__