projects
/
IvanGame.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0dcbb27
)
Fixed use of 'This' to 'Game::game()' in Actor.
author
Tegmine
<emilyteng55@gmail.com>
Sat, 3 Mar 2012 22:00:04 +0000
(16:00 -0600)
committer
Tegmine
<emilyteng55@gmail.com>
Sat, 3 Mar 2012 22:00:04 +0000
(16:00 -0600)
Actor.cpp
patch
|
blob
|
history
diff --git
a/Actor.cpp
b/Actor.cpp
index
ad68834
..
9ae069d
100644
(file)
--- a/
Actor.cpp
+++ b/
Actor.cpp
@@
-1,4
+1,5
@@
#include "Actor.h"
+#include "Game.h"
//the beggining
Actor::Actor(Animation *anim):
mFrame(0),
@@
-19,5
+20,5
@@
Actor::Actor(std::vector<string> anims):
mCurrentAnimation(0)
{
for(int i=0; i<anims.size(); i++)
- mAnimations.
Add(This.Game.
CurrentLevel.GetAnimation(anim));
+ mAnimations.
push_back(Game::game()->
CurrentLevel.GetAnimation(anim));
}
\ No newline at end of file