mirror of
https://github.com/luksamuk/engine-psx.git
synced 2025-04-28 13:28:02 +03:00
Revert object position change and fix monitor collision
This commit is contained in:
parent
da16cf0bdb
commit
78b4c79a11
2 changed files with 1 additions and 2 deletions
|
@ -226,7 +226,6 @@ begin_render_routine:
|
|||
vy -= (frame->w >> 1);
|
||||
} else {
|
||||
vx -= (frame->w >> 1);
|
||||
if(!(flipmask & MASK_FLIP_FLIPX)) vx += 1;
|
||||
if(flipmask & MASK_FLIP_FLIPY) vy -= 64 - frame->h;
|
||||
vy -= frame->h;
|
||||
}
|
||||
|
|
|
@ -341,7 +341,7 @@ _monitor_update(ObjectState *state, ObjectTableEntry *entry, VECTOR *pos)
|
|||
{
|
||||
player.ev_grnd1.collided = player.ev_grnd2.collided = 1;
|
||||
player.ev_grnd1.angle = player.ev_grnd2.angle = 0;
|
||||
player.ev_grnd1.coord = player.ev_grnd2.coord = solidity_vy;
|
||||
player.ev_grnd1.coord = player.ev_grnd2.coord = solidity_vy + 4;
|
||||
} else if((player_vy + 8) > solidity_vy) {
|
||||
// Check for intersection on left/right
|
||||
if((player_vx + 8) < pos->vx) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue