|
@@ -1,5 +1,4 @@
|
|
|
#include "Animator.h"
|
|
#include "Animator.h"
|
|
|
-#include <stdio.h>
|
|
|
|
|
|
|
|
|
|
#define ANIMATOR WalrusRPG::Animator
|
|
#define ANIMATOR WalrusRPG::Animator
|
|
|
|
|
|
|
@@ -49,13 +48,10 @@ ANIMATOR::Animator()
|
|
|
elapsed_time = 0;
|
|
elapsed_time = 0;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-unsigned ANIMATOR::add_animation(Animation anim)
|
|
|
|
|
|
|
+void ANIMATOR::add_animation(int index, Animation anim)
|
|
|
{
|
|
{
|
|
|
- animations.push_back(anim);
|
|
|
|
|
- unsigned index = animations.size()-1;
|
|
|
|
|
animations[index] = anim;
|
|
animations[index] = anim;
|
|
|
animations[index].duration = get_animation_duration(anim);
|
|
animations[index].duration = get_animation_duration(anim);
|
|
|
- return animations.size();
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
unsigned ANIMATOR::get_animation_frame(unsigned id)
|
|
unsigned ANIMATOR::get_animation_frame(unsigned id)
|