*Merge.

--HG-- branch : trunk
2009-02-20 12:05:58 -06:00
parent 187cd928ea 956c828bf5
commit 1b587c0fe3
8 changed files with 111 additions and 67 deletions
@@ -31,7 +31,8 @@ enum PetType
    HUNTER_PET              = 1,
    GUARDIAN_PET            = 2,
    MINI_PET                = 3,
-    MAX_PET_TYPE            = 4
+    POSSESSED_PET           = 4,
+    MAX_PET_TYPE            = 5
 };

 extern char const* petTypeSuffix[MAX_PET_TYPE];