mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-12-24 06:26:02 +00:00
Code Issues Releases Wiki Activity

rogueviz::fifteen:: used rv_hook and new map loading

Browse Source
This commit is contained in:
Zeno Rogue
2021-03-31 11:42:45 +02:00
parent 0af2877cc1
commit 7c8c4f3d04
1 changed files with 58 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
rogueviz/fifteen.cpp
View File

@@ -5,7 +5,7 @@
* \brief fifteen+4 puzzle * \brief fifteen+4 puzzle
*/ */
#include "../hyper.h" #include "rogueviz.h"
namespace hr { namespace hr {
@@ -24,8 +24,6 @@ map<cell*, celldata> fif;
eWall empty = waChasm; eWall empty = waChasm;
bool in = false;
enum ePenMove { pmJump, pmRotate, pmAdd, pmMirrorFlip }; enum ePenMove { pmJump, pmRotate, pmAdd, pmMirrorFlip };
ePenMove pen; ePenMove pen;
@@ -87,7 +85,6 @@ void scramble() {
} }
bool draw_fifteen(cell *c, const shiftmatrix& V) { bool draw_fifteen(cell *c, const shiftmatrix& V) {
if(!in) return false;
if(!fif.count(c)) { c->land = laNone; c->wall = waChasm; return false; } if(!fif.count(c)) { c->land = laNone; c->wall = waChasm; return false; }
check_move(); check_move();
@@ -258,39 +255,46 @@ void launch() {
start_game(); start_game();
init_fifteen(); init_fifteen();
in = true;
showstartmenu = false; showstartmenu = false;
mapeditor::drawplayer = false; mapeditor::drawplayer = false;
} }
#if CAP_COMMANDLINE void enable();
int rugArgs() {
using namespace arg;
if(0) ;
else if(argis("-fifteen")) {
PHASEFROM(3);
launch();
#if ISWEB
mapstream::loadMap("1");
#endif
}
else return 1; void load_fifteen(fhstream& f) {
return 0; int num;
f.read(num);
fif.clear();
println(hlog, "read num = ", num);
for(int i=0; i<num; i++) {
int32_t at = f.get<int>();
println(hlog, "at = ", at);
cell *c = mapstream::cellbyid[at];
auto& cd = fif[c];
f.read(cd.target);
f.read(cd.targetdir);
cd.targetdir = mapstream::fixspin(mapstream::relspin[at], cd.targetdir, c->type, f.vernum);
if(nonorientable)
f.read(cd.targetmirror);
f.read(cd.current);
f.read(cd.currentdir);
if(nonorientable)
f.read(cd.currentmirror);
cd.currentdir = mapstream::fixspin(mapstream::relspin[at], cd.currentdir, c->type, f.vernum);
println(hlog, "assigned ", cd.current, " to ", c);
}
enable();
} }
void o_key(o_funcs& v) { void o_key(o_funcs& v) {
if(in) v.push_back(named_dialog("edit the Fifteen puzzle", edit_fifteen)); v.push_back(named_dialog("edit the Fifteen puzzle", edit_fifteen));
} }
auto fifteen_hook = void enable() {
addHook(hooks_args, 100, rugArgs) + rogueviz::rv_hook(hooks_o_key, 80, o_key);
addHook(hooks_o_key, 80, o_key) + rogueviz::rv_hook(hooks_drawcell, 100, draw_fifteen);
addHook(hooks_drawcell, 100, draw_fifteen) + rogueviz::rv_hook(mapstream::hooks_savemap, 100, [] (fhstream& f) {
addHook(mapstream::hooks_savemap, 100, [] (fhstream& f) { f.write<int>(15);
if(!in) return;
f.write<int>(isize(fif)); f.write<int>(isize(fif));
for(auto cd: fif) { for(auto cd: fif) {
f.write(mapstream::cellids[cd.first]); f.write(mapstream::cellids[cd.first]);
@@ -304,33 +308,34 @@ auto fifteen_hook =
if(nonorientable) if(nonorientable)
f.write(cd.second.currentmirror); f.write(cd.second.currentmirror);
} }
}) + });
addHook(hooks_clearmemory, 40, [] () { rogueviz::rv_hook(hooks_clearmemory, 40, [] () {
fif.clear(); fif.clear();
}) + });
addHook(mapstream::hooks_loadmap, 100, [] (fhstream& f) { }
int num;
if(!in) return; #if CAP_COMMANDLINE
f.read(num); int rugArgs() {
fif.clear(); using namespace arg;
println(hlog, "read num = ", num);
for(int i=0; i<num; i++) { if(0) ;
int32_t at = f.get<int>(); else if(argis("-fifteen")) {
println(hlog, "at = ", at); PHASEFROM(3);
cell *c = mapstream::cellbyid[at]; launch();
auto& cd = fif[c]; addHook(mapstream::hooks_loadmap_old, 100, load_fifteen);
f.read(cd.target); #if ISWEB
f.read(cd.targetdir); mapstream::loadMap("1");
cd.targetdir = mapstream::fixspin(mapstream::relspin[at], cd.targetdir, c->type, f.vernum); #endif
if(nonorientable) }
f.read(cd.targetmirror);
f.read(cd.current); else return 1;
f.read(cd.currentdir); return 0;
if(nonorientable) }
f.read(cd.currentmirror);
cd.currentdir = mapstream::fixspin(mapstream::relspin[at], cd.currentdir, c->type, f.vernum); auto fifteen_hook =
println(hlog, "assigned ", cd.current, " to ", c); addHook(hooks_args, 100, rugArgs)
} + addHook(mapstream::hooks_loadmap, 100, [] (fhstream& f, int id) {
if(id == 15) load_fifteen(f);
}); });
#endif #endif