diff --git a/content.cpp b/content.cpp index 9321db62..010f24c5 100644 --- a/content.cpp +++ b/content.cpp @@ -1298,7 +1298,7 @@ LAND( 0xE08020, "Canvas", laCanvas, ZERO | LF_TECHNICAL, itNone, RESERVED, "A fa LAND( 0x00C000, "Palace Quest", laPrincessQuest, ZERO, itSavedPrincess, RESERVED, princessdesc) // fake NATIVE(isNative(laPalace, m)) - REQ(ACCONLY(laPalace) KILL(moVizier, laPalace)) + REQ(ACCONLY(laPalace) INMODE(princess::challenge) KILL(moVizier, laPalace)) LAND( 0xD0D060, "Wild West", laWildWest, ZERO, itBounty, RESERVED, wildwestdesc) NATIVE((m == moOutlaw) ? 2 : 0) @@ -1797,4 +1797,5 @@ MONSTER( '*', 0, "vertex", moRogueviz, ZERO | CF_TECHNICAL, RESERVED, moN #undef ACCONLY2 #undef ACCONLY3 #undef ACCONLYF -#undef IFINGAME \ No newline at end of file +#undef IFINGAME +#undef INMODE diff --git a/help.cpp b/help.cpp index 969b632a..7b49cfd8 100644 --- a/help.cpp +++ b/help.cpp @@ -700,6 +700,7 @@ void add_reqs(eLand l, string& s) { #define COND(x,y) s += (y); #define ITEMS_TOTAL(list, z) \ { int now = 0; string t = "("; for(eItem i: list) { if(t!="(") t += " | "; t += XLATN(iinf[i].name); now += items[i]; } t += ")"; s += XLAT("Treasure required: %1 x %2.\n", its(z), t); buteol(s, now, z); } + #define INMODE(x) ; #define ACCONLY(z) s += XLAT("Accessible only from %the1.\n", z); #define ACCONLY2(z,x) s += XLAT("Accessible only from %the1 or %the2.\n", z, x); #define ACCONLY3(z,y,x) s += XLAT("Accessible only from %the1, %2, or %3.\n", z, y, x); diff --git a/landlock.cpp b/landlock.cpp index b6557207..3ffc46bc 100644 --- a/landlock.cpp +++ b/landlock.cpp @@ -230,6 +230,7 @@ EX bool landUnlocked(eLand l) { #define ACCONLY3(x,y,z) #define ACCONLYF(x) #define IFINGAME(land, ok, fallback) if(isLandIngame(land)) { ok } else { fallback } + #define INMODE(x) if(x) return true; #include "content.cpp" case landtypes: return false;