From: PatR Date: Thu, 19 Nov 2020 09:57:13 +0000 (-0800) Subject: rename #wizlevelflip to #wizfliplevel X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b5059065497ff7de93fabbb714f6484718f6ec6;p=nethack rename #wizlevelflip to #wizfliplevel Since ^V is dead key for me with Qt on OSX, I use #wizlevelport instead. It's annoying to have to type all the way up to the 'p' for it to become distinct. Rename the biggest conflict, \#wizlevelflip to #wizfliplevel. I still have to type as far as the first 'e' for #wizlevelport but 6 characters are easier to type than 10. It wasn't in the Guidebook so I've left things that way. I am adding it to 'wizhelp' though. --- diff --git a/dat/wizhelp b/dat/wizhelp index 4e68fef66..46b46dd52 100644 --- a/dat/wizhelp +++ b/dat/wizhelp @@ -20,9 +20,10 @@ Debug-Mode Quick Reference: #vanquished == disclose counts of dead monsters sorted in various ways #vision == show vision array #wizborn == show monster birth/death/geno/extinct stats +#wizfliplevel == transpose the current dungeon level #wizintrinsic == set selected intrinsic timeouts #wizmakemap == recreate the current dungeon level -#wizrumorcheck == validate rumor indexing and show first, second, and last +#wizrumorcheck == validate rumor indexing; also show first, second, and last random engravings, epitaphs, and hallucinatory monsters #wizsmell == smell a monster #wizwhere == show dungeon placement of all special levels diff --git a/src/cmd.c b/src/cmd.c index c6561ee19..ac1f1e21a 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -1,4 +1,4 @@ -/* NetHack 3.7 cmd.c $NHDT-Date: 1602621705 2020/10/13 20:41:45 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.423 $ */ +/* NetHack 3.7 cmd.c $NHDT-Date: 1605779800 2020/11/19 09:56:40 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.425 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2013. */ /* NetHack may be freely redistributed. See license for details. */ @@ -141,7 +141,7 @@ static int NDECL(wiz_polyself); static int NDECL(wiz_load_lua); static int NDECL(wiz_level_tele); static int NDECL(wiz_level_change); -static int NDECL(wiz_level_flip); +static int NDECL(wiz_flip_level); static int NDECL(wiz_show_seenv); static int NDECL(wiz_show_vision); static int NDECL(wiz_smell); @@ -1061,9 +1061,9 @@ wiz_level_tele(VOID_ARGS) return 0; } -/* #wizlevelflip - transpose the current level */ +/* #wizfliplevel - transpose the current level */ static int -wiz_level_flip(VOID_ARGS) +wiz_flip_level(VOID_ARGS) { static const char choices[] = "0123", prmpt[] = "Flip 0=randomly, 1=vertically, 2=horizonally, 3=both:"; @@ -1943,14 +1943,14 @@ struct ext_func_tab extcmdlist[] = { #endif { C('e'), "wizdetect", "reveal hidden things within a small radius", wiz_detect, IFBURIED | AUTOCOMPLETE | WIZMODECMD }, + { '\0', "wizfliplevel", "flip the level", + wiz_flip_level, IFBURIED | WIZMODECMD }, { C('g'), "wizgenesis", "create a monster", wiz_genesis, IFBURIED | AUTOCOMPLETE | WIZMODECMD }, { C('i'), "wizidentify", "identify all items in inventory", wiz_identify, IFBURIED | AUTOCOMPLETE | WIZMODECMD }, { '\0', "wizintrinsic", "set an intrinsic", wiz_intrinsic, IFBURIED | AUTOCOMPLETE | WIZMODECMD }, - { '\0', "wizlevelflip", "flip the level", - wiz_level_flip, IFBURIED | WIZMODECMD }, { C('v'), "wizlevelport", "teleport to another level", wiz_level_tele, IFBURIED | AUTOCOMPLETE | WIZMODECMD }, { '\0', "wizloaddes", "load and execute a des-file lua script", diff --git a/src/sp_lev.c b/src/sp_lev.c index 348f023e0..a21fc72ab 100755 --- a/src/sp_lev.c +++ b/src/sp_lev.c @@ -1,4 +1,4 @@ -/* NetHack 3.7 sp_lev.c $NHDT-Date: 1600909016 2020/09/24 00:56:56 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.203 $ */ +/* NetHack 3.7 sp_lev.c $NHDT-Date: 1605779812 2020/11/19 09:56:52 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.216 $ */ /* Copyright (c) 1989 by Jean-Christophe Collet */ /* NetHack may be freely redistributed. See license for details. */ @@ -406,7 +406,7 @@ struct rm *lev; } } -/* for #wizlevelflip; not needed when flipping during level creation; +/* for #wizfliplevel; not needed when flipping during level creation; update seen vector for whole flip area and glyph for known walls */ static void flip_visuals(flp, minx, miny, maxx, maxy) @@ -483,7 +483,7 @@ flip_encoded_direction_bits(int flp, int val) } while (0) /* transpose top with bottom or left with right or both; sometimes called - for new special levels, or for any level via the #wizlevelflip command */ + for new special levels, or for any level via the #wizfliplevel command */ void flip_level(flp, extras) int flp; @@ -808,7 +808,7 @@ boolean extras; } } - if (extras) { /* for #wizlevelflip rather than during level creation */ + if (extras) { /* for #wizfliplevel rather than during level creation */ /* flip hero location only if inside the flippable area */ if (inFlipArea(u.ux, u.uy)) { if (flp & 1)