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

[10598] Create enum GameObjectDynamicLowFlags and use instead of hard coded

Browse source 
Signed-off-by: NoFantasy <nofantasy@nf.no>
This commit is contained in:
NoFantasy 2010-10-09 19:20:01 +02:00
parent c4c9b5a726
commit ba3578107a
3 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/game/Object.cpp
View file

@ -570,7 +570,7 @@ void Object::BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask *
IsActivateToQuest = true; IsActivateToQuest = true;
updateMask->SetBit(GAMEOBJECT_DYNAMIC); updateMask->SetBit(GAMEOBJECT_DYNAMIC);
updateMask->SetBit(GAMEOBJECT_BYTES_1); updateMask->SetBit(GAMEOBJECT_BYTES_1); // why do we need this here?
} }
else if (isType(TYPEMASK_UNIT)) else if (isType(TYPEMASK_UNIT))
{ {
@ -687,33 +687,31 @@ void Object::BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask *
// GAMEOBJECT_TYPE_DUNGEON_DIFFICULTY can have lo flag = 2 // GAMEOBJECT_TYPE_DUNGEON_DIFFICULTY can have lo flag = 2
// most likely related to "can enter map" and then should be 0 if can not enter // most likely related to "can enter map" and then should be 0 if can not enter
// GO_DYNFLAG_ACTIVATE = 0x01
// GO_DYNFLAG_ANIMATE = 0x02
// GO_DYNFLAG_NO_INTERACT = 0x04
// GO_DYNFLAG_SPARKLE = 0x08
if (IsActivateToQuest) if (IsActivateToQuest)
{ {
switch(((GameObject*)this)->GetGoType()) switch(((GameObject*)this)->GetGoType())
{ {
case GAMEOBJECT_TYPE_QUESTGIVER: case GAMEOBJECT_TYPE_QUESTGIVER:
*data << uint16(1); // GO also seen with GO_DYNFLAG_LO_SPARKLE explicit, relation/reason unclear (192861)
*data << uint16(GO_DYNFLAG_LO_ACTIVATE);
*data << uint16(-1); *data << uint16(-1);
break; break;
case GAMEOBJECT_TYPE_CHEST: case GAMEOBJECT_TYPE_CHEST:
*data << uint16(9); // 1 for client before 2.3.0 // GO_DYNFLAG_LO_ACTIVATE only, before client 2.3.0
*data << uint16(GO_DYNFLAG_LO_ACTIVATE | GO_DYNFLAG_LO_SPARKLE);
*data << uint16(-1); *data << uint16(-1);
break; break;
case GAMEOBJECT_TYPE_GENERIC: case GAMEOBJECT_TYPE_GENERIC:
*data << uint16(8); // unclear if 0x01 should be added // unclear if GO_DYNFLAG_LO_ACTIVATE should be added
*data << uint16(GO_DYNFLAG_LO_SPARKLE);
*data << uint16(-1); *data << uint16(-1);
break; break;
case GAMEOBJECT_TYPE_SPELL_FOCUS: case GAMEOBJECT_TYPE_SPELL_FOCUS:
*data << uint16(9); *data << uint16(GO_DYNFLAG_LO_ACTIVATE | GO_DYNFLAG_LO_SPARKLE);
*data << uint16(-1); *data << uint16(-1);
break; break;
case GAMEOBJECT_TYPE_GOOBER: case GAMEOBJECT_TYPE_GOOBER:
*data << uint16(9); *data << uint16(GO_DYNFLAG_LO_ACTIVATE | GO_DYNFLAG_LO_SPARKLE);
*data << uint16(-1); *data << uint16(-1);
break; break;
default: default:

8
src/game/SharedDefines.h
View file

@ -1219,6 +1219,14 @@ enum GameObjectFlags
GO_FLAG_UNK_11 = 0x00000400 //? Seen on type 33, possibly meaning "destructed" GO_FLAG_UNK_11 = 0x00000400 //? Seen on type 33, possibly meaning "destructed"
}; };
enum GameObjectDynamicLowFlags
{
GO_DYNFLAG_LO_ACTIVATE = 0x01, // enables interaction with GO
GO_DYNFLAG_LO_ANIMATE = 0x02, // possibly more distinct animation of GO
GO_DYNFLAG_LO_NO_INTERACT = 0x04, // appears to disable interaction (not fully verified)
GO_DYNFLAG_LO_SPARKLE = 0x08, // makes GO sparkle
};
enum TextEmotes enum TextEmotes
{ {
TEXTEMOTE_AGREE = 1, TEXTEMOTE_AGREE = 1,

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 "10597" #define REVISION_NR "10598"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__