mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-07-03 14:34:34 +00:00
Code Issues Releases Wiki Activity

Make some ints floats.

Browse source
This commit is contained in:
fgenesis 2013-07-20 20:17:57 +02:00
parent 9f4c55c177
commit c2506d5bb2
12 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
BBGE/RenderObject.h
View file

@ -289,13 +289,13 @@ public:
//D3DXMATRIX matrix;
#endif
int collideRadius;
float collideRadius;
Vector collidePosition;
std::vector<Vector> collisionMask;
std::vector<Vector> transformedCollisionMask;
CollideRects collisionRects;
int collisionMaskRadius;
float collisionMaskRadius;
float alphaMod;

2
BBGE/SkeletalSprite.cpp
View file

@ -1079,7 +1079,7 @@ Bone *SkeletalSprite::getBoneByIdx(int idx)
return 0;
}
Bone *SkeletalSprite::initBone(int idx, std::string gfx, int pidx, int rbp, std::string name, int cr, bool fh, bool fv, const Vector &cp)
Bone *SkeletalSprite::initBone(int idx, std::string gfx, int pidx, int rbp, std::string name, float cr, bool fh, bool fv, const Vector &cp)
{
Bone *b = new Bone;
b->boneIdx = idx;

2
BBGE/SkeletalSprite.h
View file

@ -270,7 +270,7 @@ protected:
int selectedBone;
friend class AnimationLayer;
std::vector<AnimationLayer> animLayers;
Bone* initBone(int idx, std::string gfx, int pidx, int rbp=0, std::string name="", int cr=0, bool fh=false, bool fv=false, const Vector &cp=Vector(0,0,0));
Bone* initBone(int idx, std::string gfx, int pidx, int rbp=0, std::string name="", float cr=0, bool fh=false, bool fv=false, const Vector &cp=Vector(0,0,0));
void deleteBones();
void onUpdate(float dt);
};