JailDoctor/thepool
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 6 Wiki Activity

- [FIX] No es podía botar sobre els actors que desapareixen

Browse Source 
- [CHG] Augmentat el màxim de pausa en animacions
- Més gràfics
- 100% de les habitacions completades!!!
This commit is contained in:
Raimon Zamora
2024-10-01 13:56:44 +02:00
parent 231a81a9e5
commit 2abc429616
22 changed files with 2156 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/actor.cpp
View File

@@ -669,8 +669,12 @@ namespace actor
// act->pos.z -= height;
}
}
if (( input::keyDown(SDL_SCANCODE_SPACE) || input::keyDown(config::getKey(KEY_JUMP)) ) && (hero::getSkills()&SKILL_SHOES) && (act->pos.y+act->size.y)<=max.y && act->pos.y>=min.y && (act->pos.x+act->size.x)<=max.x && act->pos.x>=min.x && act->react_mask==0 && ((act->pos.z==0 && room::getFloor()!=11) || act->below))
actor::actor_t *future_below = any_below_me(act);
if (( input::keyDown(SDL_SCANCODE_SPACE) || input::keyDown(config::getKey(KEY_JUMP)) ) && (hero::getSkills()&SKILL_SHOES) && (act->pos.y+act->size.y)<=max.y && act->pos.y>=min.y && (act->pos.x+act->size.x)<=max.x && act->pos.x>=min.x && act->react_mask==0 && ((act->pos.z==0 && room::getFloor()!=11) || (act->below || future_below)))
{
// [RZC 01/10/2024] Hack per a que al aterrar sobre els que desapareixen puga botar sobre ells, i a més ells desapareguen
if (!act->below && future_below && future_below->flags&FLAG_DISAPPEAR) actor::push(act, future_below, PUSH_ZN);
// [RZC 14/05/2024] hack usant react_mask i react_push del heroi. Llegir més avall.
act->react_mask=hero::getBoostJump()>0 ? 2 : 1; // =1 estic botant (anant cap amunt)
act->react_push=8; // es el comptador de botant, seguirà pujant mentres siga > 0
@@ -933,7 +937,12 @@ namespace actor
}
if ((act->pos.x+act->size.x)>max.x+4) {
const bool llevar_abad = room::getCurrent()==63 && room::getExit(XP)==62;
room::load(room::getExit(XP));
if (llevar_abad)
{
actor::remove(actor::find("ABAD"));
}
act->pos.x = room::getMin().x-3;
act->pos.z = room::getDoor(XN)*4;
hero::setFirstPos();

2
source/m_game.cpp
View File

@@ -863,7 +863,7 @@ namespace modules
//draw::print("ANIM SPEED:", 2, 156, 15, 0);
ui::label("ANMSPED", 2, line, 49, 11);
changed |= btn_small(49, line, act->anim_wait, 0, 10, 49);
changed |= btn_small(49, line, act->anim_wait, 0, 20, 49);
line+=10;
ui::label("MASKS", 2, line, 96, 11, GRAY); line+=10;