*Merge.

--HG-- branch : trunk
2009-03-06 18:09:01 -06:00
parent 13fc3dcd7e b49732c04d
commit 7915fd768a
33 changed files with 533 additions and 261 deletions
@@ -97,12 +97,11 @@ struct CreatureMover
 struct InstanceTemplate
 {
    uint32 map;
-    uint32 parent;
-    uint32 levelMin;
-    uint32 levelMax;
+    uint32 parent;    
    uint32 maxPlayers;
    uint32 maxPlayersHeroic;
    uint32 reset_delay;                                 // FIX ME: now exist normal/heroic raids with possible different time of reset.
+    uint32 access_id;
    float startLocX;
    float startLocY;
    float startLocZ;