diff --git a/achievement.cpp b/achievement.cpp index 9224cb58..e856e47b 100644 --- a/achievement.cpp +++ b/achievement.cpp @@ -801,9 +801,9 @@ EX void achievement_final(bool really_final) { if(PURE) specialcode+=4; if(numplayers() > 1) specialcode+=8; if(inv::on) specialcode+=16; - if(bow::crossbow_mode && bow::style == bow::cbBull) specialcode += 32; - if(bow::crossbow_mode && bow::style == bow::cbGeodesic) specialcode += 64; - if(bow::crossbow_mode && bow::style == bow::cbGeometric) specialcode += 96; + if(bow::crossbow_mode() && bow::style == bow::cbBull) specialcode += 32; + if(bow::crossbow_mode() && bow::style == bow::cbGeodesic) specialcode += 64; + if(bow::crossbow_mode() && bow::style == bow::cbGeometric) specialcode += 96; if(sphere && specialland == laHalloween) { if(specialcode) return; diff --git a/rogueviz/notknot.cpp b/rogueviz/notknot.cpp index 9b335bff..ee95ec32 100644 --- a/rogueviz/notknot.cpp +++ b/rogueviz/notknot.cpp @@ -1429,7 +1429,13 @@ void portal_slideshow(tour::ss::slideshow_callback cb) { "This is a collection of portals. We start with knotted portals in Euclidean geometry, " "then we visit portals in other geometries, and finally, we explore portals between different " "geometries.\n\nLoading these may take some time, so you need to press 'r' to run them. In most slides you can also press '5' to change various parameters.", - [] (presmode mode) {} + [] (presmode mode) { + slide_action(mode, '9', "list of portal scenes", [=] { + popScreenAll(); + ss::current_folder = get_foldername(slides[currentslide].name); + pushScreen(ss::showMenu); + }); + } }); auto add = [&] (string s, string text, string youtube, reaction_t act) { diff --git a/tour.cpp b/tour.cpp index 3a0c0cd8..52543a7f 100644 --- a/tour.cpp +++ b/tour.cpp @@ -180,7 +180,7 @@ string get_slidename(const string& s) { return s.substr(i); } -string get_foldername(const string& s) { +EX string get_foldername(const string& s) { int i = 0; for(int k=0; k