Remove inlines

Clean up macros

more tomorrow

Cleanup and optimize CDActivities table

Remove unused include

Further work on CDActivityRewards

Update MasterServer.cpp

Further animations work

Activities still needs work for a better PK.

fix type

All of these replacements worked

Create internal interface for animations

Allows for user to just call GetAnimationTIme or PlayAnimation rather than passing in arbitrary true false statements

dDatabase/Tables/CDAnimationsTable.h

@@ -3,9 +3,10 @@
 // Custom Classes
 #include "CDTable.h"
 
-struct CDAnimations {
-	unsigned int animationGroupID;          //!< The animation group ID
-	std::string animation_type;        //!< The animation type
+struct CDAnimation {
+	// unsigned int animationGroupID;
+	// std::string animation_type;
+	// The above two are a pair to represent a primary key in the map.
 	std::string animation_name;        //!< The animation name
 	float chance_to_play;           //!< The chance to play the animation
 	unsigned int min_loops;                 //!< The minimum number of loops
@@ -19,15 +20,20 @@ struct CDAnimations {
 	float blendTime;                //!< The blend time
 };
 
+typedef LookupResult<CDAnimation> CDAnimationLookupResult;
 
 class CDAnimationsTable : public CDTable<CDAnimationsTable> {
-private:
-	std::vector<CDAnimations> entries;
-
+	typedef int32_t AnimationGroupID;
+	typedef std::string AnimationID;
+	typedef std::pair<std::string, AnimationGroupID> CDAnimationKey;
 public:
-	CDAnimationsTable();
-	// Queries the table with a custom "where" clause
-	std::vector<CDAnimations> Query(std::function<bool(CDAnimations)> predicate);
-
-	std::vector<CDAnimations> GetEntries(void) const;
+	CDAnimationLookupResult GetAnimation(const AnimationID& animationType, const std::string& previousAnimationName, const AnimationGroupID animationGroupID);
+	void CacheAnimationGroup(AnimationGroupID animationGroupID);
+private:
+	void CacheAnimations(const CDAnimationKey animationKey);
+	bool CacheData(CppSQLite3Statement queryToCache);
+	/**
+	 * Each animation type has a vector of animations.  This is because there can be animations have a percent chance to play so one is selected at random.
+	 */
+	std::map<CDAnimationKey, std::vector<CDAnimation>> animations;
 };