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

Merge branch 'master' into 303

Browse source 
I hope it merged correctly...

Conflicts:
	contrib/extractor/ad.exe
	src/game/MovementHandler.cpp
	src/game/Player.h
This commit is contained in:
tomrus88 2008-12-11 12:22:37 +03:00
commit db64bf6b80
9 changed files with 47 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/shared/Database/DBCStructure.h
View file

@ -722,7 +722,7 @@ struct GlyphPropertiesEntry
uint32 Id;
uint32 SpellId;
uint32 TypeFlags;
uint32 Unk1;
uint32 Unk1; // GlyphIconId (SpellIcon.dbc)
};
struct GlyphSlotEntry

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "6889"
#define REVISION_NR "6895"
#endif // __REVISION_NR_H__