mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-24 21:37:18 +00:00
Code Issues Releases Wiki Activity

Merge pull request #235 from jruderman/copy_wparam

Browse Source 
Copy wparam when copying wall
This commit is contained in:
Zeno Rogue 2021-07-13 13:59:16 +02:00 committed by GitHub
commit b4f0f71436
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
monstermove.cpp
View File

@ -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);
}

5
pcmove.cpp
View File

@ -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;
}