mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-11-18 14:45:12 +00:00
Code Issues Releases Wiki Activity

Merge pull request #472 from ohlordhebacc/mapeditor-lastexplore-shmup-fix

Browse Source 
Fix the "lastexplore" value getting set to the turn/knives thrown count instead of "shmup::curtime" when enabling the map editor in shmup, and when playing the fifteen+4 puzzle in shmup
This commit is contained in:
Zeno Rogue
2025-10-13 09:18:22 +02:00
committed by GitHub
parent 744f42ad21 c384169cba
commit ae97ae0b9a
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
debug.cpp
View File

@@ -168,7 +168,7 @@ vector<cheatkey> cheats = {
cheatkey{'R'-64, "advance the rose wave", buildRosemap}, cheatkey{'R'-64, "advance the rose wave", buildRosemap},
#if CAP_EDIT #if CAP_EDIT
cheatkey{'A', "start the Map Editor", [] { cheatkey{'A', "start the Map Editor", [] {
lastexplore = turncount; lastexplore = shmup::on ? shmup::curtime : turncount;
pushScreen(mapeditor::showMapEditor); pushScreen(mapeditor::showMapEditor);
}}, }},
cheatkey{'A'-64, "start the Vector Graphics Editor", [] { cheatkey{'A'-64, "start the Vector Graphics Editor", [] {

2
menus.cpp
View File

@@ -331,7 +331,7 @@ EX void showCreative() {
dialog::cheat_if_confirmed([] { dialog::cheat_if_confirmed([] {
cheater++; cheater++;
pushScreen(mapeditor::showMapEditor); pushScreen(mapeditor::showMapEditor);
lastexplore = turncount; lastexplore = shmup::on ? shmup::curtime : turncount;
addMessage(XLAT("You activate your terraforming powers!")); addMessage(XLAT("You activate your terraforming powers!"));
}); });
}); });

2
rogueviz/fifteen.cpp
View File

@@ -167,7 +167,7 @@ bool fifteen3 = true;
bool draw_fifteen(cell *c, const shiftmatrix& V) { bool draw_fifteen(cell *c, const shiftmatrix& V) {
hr::addaura(tC0(V), darkened(0x0000FF), 0); hr::addaura(tC0(V), darkened(0x0000FF), 0);
lastexplore = turncount; lastexplore = shmup::on ? shmup::curtime : turncount;
if(!fif.count(c)) { c->land = laNone; c->wall = waChasm; c->item = itNone; c->monst = moNone; return false; } if(!fif.count(c)) { c->land = laNone; c->wall = waChasm; c->item = itNone; c->monst = moNone; return false; }
check_move(); check_move();