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

Merge branch 'master' into 303

Browse source 
Conflicts:
	src/game/ItemPrototype.h
	src/game/ObjectMgr.cpp
	src/shared/Database/SQLStorage.cpp
This commit is contained in:
tomrus88 2008-11-16 17:20:43 +03:00
commit e738198eb4
33 changed files with 721 additions and 335 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/GameObject.h
View file

@ -362,7 +362,7 @@ struct GameObjectInfo
uint32 data[24];
} raw;
};
char *ScriptName;
uint32 ScriptId;
};
struct GameObjectLocale