Merge branch 'master' into 310

Conflicts:
	src/game/Unit.cpp
This commit is contained in:
tomrus88 2009-04-07 13:22:10 +04:00
commit 14e9afa46f
43 changed files with 4445 additions and 271 deletions

View file

@ -649,6 +649,27 @@ struct ChrRacesEntry
uint32 addon; // 68 (0 - original race, 1 - tbc addon, ...)
};
/* not used
struct CinematicCameraEntry
{
uint32 id; // 0 index
char* filename; // 1
uint32 soundid; // 2 in SoundEntries.dbc or 0
float start_x; // 3
float start_y; // 4
float start_z; // 5
float unk6; // 6 speed?
};
*/
struct CinematicSequencesEntry
{
uint32 Id; // 0 index
//uint32 unk1; // 1 always 0
//uint32 cinematicCamera; // 2 id in CinematicCamera.dbc
// 3-9 always 0
};
struct CreatureDisplayInfoEntry
{
uint32 Displayid; // 0 m_ID
@ -1079,6 +1100,13 @@ struct MapEntry
}
};
struct MovieEntry
{
uint32 Id; // 0 index
//char* filename; // 1
//uint32 unk2; // 2 always 100
};
struct QuestSortEntry
{
uint32 id; // 0 m_ID