mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-08-10 16:19:59 +00:00
Code Issues Releases Wiki Activity

Merge branch 'gccwarn' into controllerfixup

Browse source
This commit is contained in:
Valentin Ochs 2017-01-17 11:15:47 +01:00
commit f9357e7fca
99 changed files with 1238 additions and 792 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Aquaria/Intro.cpp
View file

@ -32,7 +32,7 @@ namespace IntroStuff
{
//Mappy *m;
bool quitFlag;
};
}
using namespace IntroStuff;
@ -201,7 +201,7 @@ void Intro::createMeteor(int layer, Vector pos, Vector off, Vector sz)
void Intro::clearMeteors()
{
for (int i = 0; i < meteors.size(); i++)
for (size_t i = 0; i < meteors.size(); i++)
{
meteors[i]->setLife(1);
meteors[i]->setDecayRate(100);
@ -258,7 +258,7 @@ void Intro::update(float dt)
citybg->offset = Vector(-100, 0);
citybg->scale = Vector(0.6, 0.6);
citybg->alpha = 0;
for (int i = 0; i < citybg->bones.size(); i++)
for (size_t i = 0; i < citybg->bones.size(); i++)
{
if (citybg->bones[i]->name != "meteor")
{
@ -275,7 +275,7 @@ void Intro::update(float dt)
eric->position = Vector(50, 400);
eric->alpha = 0;
eric->scale = Vector(0.4, 0.4);
for (int i = 0; i < eric->bones.size(); i++)
for (size_t i = 0; i < eric->bones.size(); i++)
{
eric->bones[i]->color = eric->color;
}