mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2024-11-28 14:49:54 +00:00
Merge pull request #235 from jruderman/copy_wparam
Copy wparam when copying wall
This commit is contained in:
commit
b4f0f71436
@ -182,6 +182,7 @@ EX void moveMonster(const movei& mi) {
|
||||
if(isLeader(m)) {
|
||||
if(ct->wall == waBigStatue) {
|
||||
ct->wall = cf->wall;
|
||||
ct->wparam = cf->wparam;
|
||||
cf->wall = waBigStatue;
|
||||
animateMovement(mi.rev(), LAYER_BOAT);
|
||||
}
|
||||
|
@ -818,6 +818,7 @@ bool pcmove::after_escape() {
|
||||
changes.ccell(cwt.at);
|
||||
|
||||
c2->wall = cwt.at->wall;
|
||||
c2->wparam = cwt.at->wparam;
|
||||
if(doesnotFall(cwt.at)) {
|
||||
cwt.at->wall = what;
|
||||
if(cellHalfvine(what))
|
||||
@ -1103,8 +1104,10 @@ bool pcmove::perform_actual_move() {
|
||||
flipplayer = true; if(multi::players > 1) multi::flipped[multi::cpid] = true;
|
||||
});
|
||||
if(c2->item && isAlch(c2)) {
|
||||
if(alchMayDuplicate(cwt.at->wall))
|
||||
if(alchMayDuplicate(cwt.at->wall)) {
|
||||
c2->wall = cwt.at->wall;
|
||||
c2->wparam = cwt.at->wparam;
|
||||
}
|
||||
else
|
||||
c2->wall = waNone;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user