sadpmpk
/
HATPC
1
0
Fork 0
Code Issues 11 Pull Requests Projects 4 Releases Wiki Activity

Compare commits

base: sadpmpk:bc0f7617d457398777d9315ed8c07df7ba6708e7
Branches Tags
sadpmpk:main
sadpmpk:level_select
sadpmpk:scene_man
..
compare: sadpmpk:ce8401466838c882a9f21617b91ceea4a42f5684
Branches Tags
sadpmpk:main
sadpmpk:level_select
sadpmpk:scene_man

No commits in common. "bc0f7617d457398777d9315ed8c07df7ba6708e7" and "ce8401466838c882a9f21617b91ceea4a42f5684" have entirely different histories.
bc0f7617d4 ... ce84014668

2 changed files with 4 additions and 6 deletions
Show Stats Expand all files Collapse all files

8
scenes/game_systems.c
View File

@ -1710,15 +1710,13 @@ void hitbox_update_system(Scene_t* scene)
{ {
if (p_ent->position.y + p_bbox->size.y <= p_other_ent->position.y) if (p_ent->position.y + p_bbox->size.y <= p_other_ent->position.y)
{ {
CJump_t * p_cjump = get_component(p_ent, CJUMP_COMP_T);
// Don't allow the usual jump interaction with crate jump
p_cjump->short_hop = true;
p_cjump->jumped = false;
p_ctransform->velocity.y = -400; p_ctransform->velocity.y = -400;
if (p_pstate->jump_pressed) if (p_pstate->jump_pressed)
{ {
p_ctransform->velocity.y = -600; p_ctransform->velocity.y = -600;
CJump_t * p_cjump = get_component(p_ent, CJUMP_COMP_T);
p_cjump->short_hop = false;
p_cjump->jumped = true;
} }
if (p_ent->m_tag == PLAYER_ENT_TAG) if (p_ent->m_tag == PLAYER_ENT_TAG)
{ {

2
scenes/water_flow.c
View File

@ -289,7 +289,7 @@ void update_water_runner_system(Scene_t* scene)
break; break;
case SCANLINE_FILL: case SCANLINE_FILL:
{ {
const float FILL_RATE = 1.0f/20; const float FILL_RATE = 1.0f/24;
p_crunner->fractional += scene->delta_time; p_crunner->fractional += scene->delta_time;
if (p_crunner->fractional < FILL_RATE) break; if (p_crunner->fractional < FILL_RATE) break;