projects
/
IvanGame.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
986e60b
)
Matt committed code that didn't compile. Fixed.
master
author
Matt Mullins
<mokomull@gmail.com>
Sat, 16 Jun 2012 06:46:53 +0000
(23:46 -0700)
committer
Matt Mullins
<mokomull@gmail.com>
Sat, 16 Jun 2012 06:46:53 +0000
(23:46 -0700)
Animation.h
patch
|
blob
|
history
Level.h
patch
|
blob
|
history
diff --git
a/Animation.h
b/Animation.h
index
dca4577
..
33f4615
100644
(file)
--- a/
Animation.h
+++ b/
Animation.h
@@
-19,11
+19,11
@@
class Animation
{
public:
/// Tells if loading the Animation was successful
{
public:
/// Tells if loading the Animation was successful
- int mBuilt
,
+ int mBuilt
;
/// Number of frames in this Animation
/// Number of frames in this Animation
- mNumFrames,
+ int mNumFrames;
/// Animation's current width
/// Animation's current width
- int mW
,
+ int mW
;
/// The animation's current Height
int mH;
std::vector<SpriteFrame> Frames;
/// The animation's current Height
int mH;
std::vector<SpriteFrame> Frames;
diff --git
a/Level.h
b/Level.h
index
8ddb904
..
93bfc84
100644
(file)
--- a/
Level.h
+++ b/
Level.h
@@
-225,7
+225,7
@@
protected: // allow inheritance
/// Textures that have been loaded by the level.
map<string, Texture> mTextures;
/// List of sprites that should be added this game loop
/// Textures that have been loaded by the level.
map<string, Texture> mTextures;
/// List of sprites that should be added this game loop
- vector<WorldObject*> ToAdd
+ vector<WorldObject*> ToAdd
;
/// List of sprites that should die after this game loop
vector<WorldObject*> ToRemove;
/// List of all the fonts we have
/// List of sprites that should die after this game loop
vector<WorldObject*> ToRemove;
/// List of all the fonts we have