TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2024-12-14 20:18:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

make pacman's face (mouse) face to the dir which he hits the wall (#1735)

Browse Source
This commit is contained in:
sommermoregentraum 2024-01-07 23:55:45 +08:00 committed by GitHub
parent 5ced8c90d3
commit 4b93e78dd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
firmware/application/external/pacman/playfield.hpp vendored
View File

@ -205,11 +205,13 @@ class Sprite {
byte who; byte who;
byte _speed; byte _speed;
byte dir; byte dir;
byte lastDir;
byte phase; byte phase;
// Sprite bits // Sprite bits
byte palette2; // 4->16 color map index byte palette2; // 4->16 color map index
byte bits; // index of sprite bits byte bits; // index of sprite bits
signed char sy; signed char sy;
void Init(const byte* s) { void Init(const byte* s) {
@ -274,9 +276,17 @@ class Sprite {
f = pgm_read_byte(_pacLeftAnim + f); f = pgm_read_byte(_pacLeftAnim + f);
else if (dir == MRight) else if (dir == MRight)
f = pgm_read_byte(_pacRightAnim + f); f = pgm_read_byte(_pacRightAnim + f);
else else if (dir == MDown || dir == MUp)
f = pgm_read_byte(_pacVAnim + f); f = pgm_read_byte(_pacVAnim + f);
if (dir == MUp) else if (dir == MStopped) {
if (lastDir == MLeft)
f = pgm_read_byte(_pacLeftAnim + f);
else if (lastDir == MRight)
f = pgm_read_byte(_pacRightAnim + f);
else if (lastDir == MDown || lastDir == MUp)
f = pgm_read_byte(_pacVAnim + f);
}
if ((dir == MUp) || (dir == MStopped && lastDir == MUp))
sy = -1; sy = -1;
bits = f + PACMANSPRITE; bits = f + PACMANSPRITE;
} }
@ -838,15 +848,19 @@ class Playfield {
else if (DEMO == 0 && s->who == PACMAN && choice[3] < 0x7FFF && but_RIGHT) else if (DEMO == 0 && s->who == PACMAN && choice[3] < 0x7FFF && but_RIGHT)
dir = MRight; dir = MRight;
else if (DEMO == 0 && choice[0] < 0x7FFF && s->who == PACMAN && dir == MUp) else if (DEMO == 0 && choice[0] < 0x7FFF && s->who == PACMAN && dir == MUp) {
dir = MUp; dir = MUp;
else if (DEMO == 0 && choice[1] < 0x7FFF && s->who == PACMAN && dir == MLeft) s->lastDir = MUp;
} else if (DEMO == 0 && choice[1] < 0x7FFF && s->who == PACMAN && dir == MLeft) {
dir = MLeft; dir = MLeft;
else if (DEMO == 0 && choice[2] < 0x7FFF && s->who == PACMAN && dir == MDown) s->lastDir = MLeft;
} else if (DEMO == 0 && choice[2] < 0x7FFF && s->who == PACMAN && dir == MDown) {
dir = MDown; dir = MDown;
else if (DEMO == 0 && choice[3] < 0x7FFF && s->who == PACMAN && dir == MRight) s->lastDir = MDown;
} else if (DEMO == 0 && choice[3] < 0x7FFF && s->who == PACMAN && dir == MRight) {
dir = MRight; dir = MRight;
else if ((DEMO == 0 && s->who != PACMAN) || DEMO == 1) { s->lastDir = MRight;
} else if ((DEMO == 0 && s->who != PACMAN) || DEMO == 1) {
// Don't choose opposite of current direction? // Don't choose opposite of current direction?
int16_t dist = choice[4 - dir]; // favor current direction int16_t dist = choice[4 - dir]; // favor current direction