mirror/tiny_link
1
0
Fork 0
mirror of https://github.com/NoelFB/tiny_link.git synced 2025-07-01 19:45:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

everything except boss

Browse Source
This commit is contained in:
Noel Berry
2021-01-03 19:47:16 -08:00
parent cdccb14f2e
commit 0d01334e0a
17 changed files with 99 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/collider.h
View File

@ -17,7 +17,7 @@ namespace TL
Grid
};
uint32_t mask;
uint32_t mask = 0;
Collider();

17
src/components/mover.cpp
View File

@ -38,7 +38,16 @@ bool Mover::move_y(int amount)
while (amount != 0)
{
if (collider->check(Mask::solid, Point(0, sign)))
// if hit solid
bool hit_something = collider->check(Mask::solid, Point(0, sign));
// no solid, but we're moving down, check for jumpthru
// but ONLY if we're not already overlapping a jumpthru
if (!hit_something && sign > 0)
hit_something = collider->check(Mask::jumpthru, Point(0, sign)) && !collider->check(Mask::jumpthru, Point(0, 0));
// stop movement
if (hit_something)
{
if (on_hit_y)
on_hit_y(this);
@ -82,7 +91,11 @@ bool Mover::on_ground(int dist) const
if (!collider)
return false;
return collider->check(Mask::solid, Point(0, dist));
return
// solid
collider->check(Mask::solid, Point(0, dist)) ||
// jumpthru
(collider->check(Mask::jumpthru, Point(0, dist)) && !collider->check(Mask::jumpthru, Point(0, 0)));
}
void Mover::update()

2
src/components/player.h
View File

@ -34,6 +34,6 @@ namespace TL
float m_invincible_timer = 0;
float m_start_timer = 1;
Collider* m_attack_collider = nullptr;
bool m_on_ground;
bool m_on_ground = false;
};
}