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

Merge remote branch 'origin/master' into 330

Browse source 
Conflicts:
	src/game/DBCfmt.h
	src/game/GossipDef.cpp
	src/game/Mail.cpp
This commit is contained in:
tomrus88 2009-11-04 02:37:09 +03:00
commit 2732c33465
48 changed files with 1023 additions and 786 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/DBCStructure.h
View file

@ -1069,7 +1069,7 @@ struct MailTemplateEntry
uint32 ID; // 0
//char* subject[16]; // 1-16
// 17 name flags, unused
//char* content[16]; // 18-33
char* content[16]; // 18-33
};
struct MapEntry