Compare commits

...

2 Commits

2 changed files with 8 additions and 13 deletions

View File

@@ -27,9 +27,6 @@ namespace gamestate
{ {
sub_state = postfase::state::initial; sub_state = postfase::state::initial;
font::selectFont(font::type::colored);
font::setColor(font::color::red);
if (game::getConfig("fase") == 30) { if (game::getConfig("fase") == 30) {
gamestate::sequence::init(); gamestate::sequence::init();
return; return;
@@ -48,14 +45,12 @@ namespace gamestate
void initVictoria() void initVictoria()
{ {
sub_state = postfase::state::victoria; sub_state = postfase::state::victoria;
draw::surface *fondo = nullptr;
char filename[12] = "final00.GIF"; char filename[12] = "final00.GIF";
filename[6]= game::getConfig("fase") / 5; filename[6]= game::getConfig("fase") / 5;
fondo = draw::loadSurface(filename, true);
draw::setSource(fondo); draw::surface *fondo = draw::loadSurface(filename, true);
draw::draw(0,0,320,200,0,0); draw::draw(fondo);
draw::freeSurface(fondo); draw::freeSurface(fondo);
draw::fadein(); draw::fadein();
@@ -65,14 +60,14 @@ namespace gamestate
void initPassword() void initPassword()
{ {
sub_state = postfase::state::password; sub_state = postfase::state::password;
draw::surface *fondo = draw::loadSurface("postfase.gif", true);
std::string password = getPassword(); std::string password = getPassword();
draw::setSource(fondo); draw::surface *fondo = draw::loadSurface("postfase.gif", true);
draw::draw(0,0,320,200,0,0); draw::draw(fondo);
draw::freeSurface(fondo); draw::freeSurface(fondo);
font::selectFont(font::type::colored);
font::setColor(font::color::red);
font::print(175, 166, password); font::print(175, 166, password);
draw::fadein(); draw::fadein();

View File

@@ -327,7 +327,7 @@ namespace arounders
void initPujarCorda(arounder *a) void initPujarCorda(arounder *a)
{ {
a->frame = 0; a->frame = 0;
a->prevista = arounders::accions::pujarcorda; a->accio = arounders::accions::pujarcorda;
a->x = a->orientacio == arounders::orientacions::dreta ? a->x + 3 : a->x - 3; a->x = a->orientacio == arounders::orientacions::dreta ? a->x + 3 : a->x - 3;
procesarPujarCorda(a); procesarPujarCorda(a);
} }
@@ -335,7 +335,7 @@ namespace arounders
void initBaixarCorda(arounder *a) void initBaixarCorda(arounder *a)
{ {
a->frame = 0; a->frame = 0;
a->prevista = arounders::accions::baixarcorda; a->accio = arounders::accions::baixarcorda;
if (a->orientacio == arounders::orientacions::dreta) { if (a->orientacio == arounders::orientacions::dreta) {
a->x += 2; a->x += 2;
} else { } else {