JailDoctor/arounders
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Compare commits

base: JailDoctor:6b63dbd70aafc4fbd4a5ea67401a28cf0b86189b
Branches Tags
JailDoctor:master
JailDoctor:v1.2.0
...
compare: JailDoctor:6d9c902f2db29f7a547aafca28bbf70a79135455
Branches Tags
JailDoctor:master
JailDoctor:v1.2.0

2 Commits
6b63dbd70a ... 6d9c902f2d

Author SHA1 Message Date
Raimon Zamora
6d9c902f2d - [FIX] En gamestate_postfase el text no eixia del color que tocaba 2023-10-21 10:50:09 +02:00
Raimon Zamora
66fee27b50 - [FIX] Els arounders mai agafaven la corda 2023-10-21 10:39:41 +02:00
2 changed files with 8 additions and 13 deletions
Expand all files Collapse all files

17
source/gamestate_postfase.cpp
View File

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

4
source/proc_arounders.cpp
View File

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