Merge from master

2026-09-04 18:46:37 +00:00 · 2013-05-08 20:22:40 -07:00
parent bcf9546b2d f6100ed834
commit feae79b417
47 changed files with 1222 additions and 142 deletions
@@ -253,6 +253,8 @@ public:
 	bool createBot(const char *name, const char *lastname, uint8 level, uint16 race, uint8 botclass, uint8 gender);
 #endif

+	inline uint16 GetMana(uint32 spell_id) { return( spells[spell_id].mana); }
+
 protected:
 	Mob *owner;	//NPC is never nullptr when functions are called.
 	Client *initiator;	//this can be null.