Skip to content

Fixes for MSCC #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
magical wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes for MSCC #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea15c99
mslogic: Fix and simplify block pushing logic.
magical Nov 21, 2009
45f48ef
mslogic: Don't move Swimming Chip, even if on the monster list
magical Oct 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 14 additions & 17 deletions mslogic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -867,9 +867,8 @@ static struct { unsigned char chip, block, creature; } const movelaws[] = {
* causes blue and hidden walls to remain unexposed.
* CMM_CLONECANTBLOCK means that the creature will not be prevented
* from moving by an identical creature standing in the way.
* CMM_NOPUSHING prevents Chip from pushing blocks inside this
* function. CMM_TELEPORTPUSH indicates to the block-pushing logic
* that Chip is teleporting. This prevents a stack of two blocks from
* CMM_TELEPORTPUSH indicates to the block-pushing logic that
* Chip is teleporting. This prevents a stack of two blocks from
* being treated as a single block, and allows Chip to push a slipping
* block away from him. CMM_NOFIRECHECK causes bugs and walkers to not
* avoid fire. Finally, CMM_NODEFERBUTTONS causes buttons pressed by
Expand All @@ -878,10 +877,9 @@ static struct { unsigned char chip, block, creature; } const movelaws[] = {
#define CMM_NOLEAVECHECK 0x0001
#define CMM_NOEXPOSEWALLS 0x0002
#define CMM_CLONECANTBLOCK 0x0004
#define CMM_NOPUSHING 0x0008
#define CMM_TELEPORTPUSH 0x0010
#define CMM_NOFIRECHECK 0x0020
#define CMM_NODEFERBUTTONS 0x0040
#define CMM_TELEPORTPUSH 0x0008
#define CMM_NOFIRECHECK 0x0010
#define CMM_NODEFERBUTTONS 0x0020

/* Move a block at the given position forward in the given direction.
* FALSE is returned if the block cannot be pushed.
Expand Down Expand Up @@ -954,6 +952,13 @@ static int canmakemove(creature const *cr, int dir, int flags)
}

if (cr->id == Chip) {
/* If the top tile is a block, push it. */
floor = cellat(to)->top.id;
if (floor == Block_Static) {
if (!pushblock(to, dir, flags))
return FALSE;
}
/* Now check the floor tile */
floor = floorat(to);
if (!(movelaws[floor].chip & dir))
return FALSE;
Expand All @@ -971,16 +976,6 @@ static int canmakemove(creature const *cr, int dir, int flags)
getfloorat(to)->id = Wall;
return FALSE;
}
if (floor == Block_Static) {
if (!pushblock(to, dir, flags))
return FALSE;
else if (flags & CMM_NOPUSHING)
return FALSE;
if ((flags & CMM_TELEPORTPUSH) && floorat(to) == Block_Static
&& cellat(to)->bot.id == Empty)
return TRUE;
return canmakemove(cr, dir, flags | CMM_NOPUSHING);
}
} else if (cr->id == Block) {
floor = cellat(to)->top.id;
if (iscreature(floor)) {
Expand Down Expand Up @@ -1338,6 +1333,8 @@ static void choosemove(creature *cr)
{
if (cr->id == Chip) {
choosechipmove(cr, cr->state & CS_SLIP);
} else if (cr->id == Swimming_Chip) {
/* nothing */
} else {
if (cr->state & CS_SLIP)
cr->tdir = NIL;
Expand Down