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

- [FIX] Al agafar un objecte cau normal, o no cau si hi ha altre objecte que ho impideix

Browse Source
This commit is contained in:
Raimon Zamora
2024-09-28 08:53:18 +02:00
parent 1521c7e152
commit 2799ef28aa
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/actor.cpp
View File

@@ -665,7 +665,8 @@ namespace actor
{ {
const int height = act->below->size.z; const int height = act->below->size.z;
pick(act->below); pick(act->below);
if (!input::keyDown(SDL_SCANCODE_SPACE) && !input::keyDown(config::getKey(KEY_JUMP))) 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 || act->below)))
// 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 || act->below)) 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 || act->below))
@@ -682,8 +683,8 @@ namespace actor
} }
hero::useBoostJump(); hero::useBoostJump();
} }
if (input::keyDown(SDL_SCANCODE_Z) && act->pos.z>0) { act->push |= PUSH_ZN; moving = true; } //if (input::keyDown(SDL_SCANCODE_Z) && act->pos.z>0) { act->push |= PUSH_ZN; moving = true; }
if (input::keyDown(SDL_SCANCODE_A) && act->pos.z<max.z) { act->push |= PUSH_ZP; moving = true; } //if (input::keyDown(SDL_SCANCODE_A) && act->pos.z<max.z) { act->push |= PUSH_ZP; moving = true; }
// [RZC 14/05/2024] Açò es un hack. estic usant react_mask i react_push del hero com a guarda // [RZC 14/05/2024] Açò es un hack. estic usant react_mask i react_push del hero com a guarda
// i contador per al bot. Supose que perque se suposa que el heroi no te raons // i contador per al bot. Supose que perque se suposa que el heroi no te raons