Merge from master terrible

2026-09-04 14:36:37 +00:00 · 2013-05-15 16:01:13 -07:00
parent 6887ae18ae 312100e1c6
commit b26df187e6
609 changed files with 37214 additions and 37933 deletions
@@ -14,30 +14,17 @@
 	#define PET_HOLD			12
 	#define PET_NOTAUNT			14
 	#define PET_LEADER			16
-	#define	PET_SLUMBER			17	
-	#define	PET_NOCAST			18	
-	#define	PET_FOCUS			19	
-	#define	PET_FOCUS_ON		25	
-	#define	PET_FOCUS_OFF		26	
-	
+	#define	PET_SLUMBER			17
+	#define	PET_NOCAST			18
+	#define	PET_FOCUS			19
+	#define	PET_FOCUS_ON		25
+	#define	PET_FOCUS_OFF		26
+
 	class Pet : public NPC {
 	public:
 		Pet(NPCType *type_data, Mob *owner, PetType type, uint16 spell_id, int16 power);
-		
+
 	};

 #endif

-
-
-
-
-
-
-
-
-
-
-
-
-