mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-08-18 04:29:56 +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

6
Aquaria/Game.h
View file

@ -670,9 +670,9 @@ public:
void registerSporeDrop(const Vector &pos, int t);
bool collideBoxWithGrid(const Vector& position, int w, int h);
bool collideCircleWithGrid(const Vector& position, int r);
bool collideCircleWithGrid(const Vector& position, float r);
bool collideHairVsCircle(Entity *a, int num, const Vector &pos2, int radius, float perc=0, int *colSegment=0);
bool collideHairVsCircle(Entity *a, int num, const Vector &pos2, float radius, float perc=0, int *colSegment=0);
bool collideCircleVsCircle(Entity *a, Entity *b);
Bone *collideSkeletalVsCircle(Entity *skeletal, Entity *circle);
@ -823,7 +823,7 @@ public:
void setTimerTextAlpha(float a, float t);
void setTimerText(float time);
void generateCollisionMask(Quad *q, int overrideCollideRadius=0);
void generateCollisionMask(Quad *q, float overrideCollideRadius=0);
std::string sceneNatureForm;
std::string fromScene, toNode;
int toFlip;