nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

merge 2

Browse Source
This commit is contained in:
nhmall
2019-01-04 23:19:58 -05:00
parent ebabf16ad0
commit 1086be1027
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/options.c
+1 -1
View File
@@ -1862,7 +1862,7 @@ free_menu_coloring()
{ {
struct menucoloring *tmp, *tmp2; struct menucoloring *tmp, *tmp2;
for (tmp = menu_colorings; tmp; tmp = tmp2) { for (tmp = g.menu_colorings; tmp; tmp = tmp2) {
tmp2 = tmp->next; tmp2 = tmp->next;
regex_free(tmp->match); regex_free(tmp->match);
free((genericptr_t) tmp->origstr); free((genericptr_t) tmp->origstr);
src/spell.c
+8 -8
View File
@@ -1302,14 +1302,14 @@ int what;
save_tport.tport_indx = MAXSPELL; save_tport.tport_indx = MAXSPELL;
} else if (what == UNHIDESPELL) { } else if (what == UNHIDESPELL) {
/*assert( save_tport.savespell.sp_id == SPE_TELEPORT_AWAY );*/ /*assert( save_tport.savespell.sp_id == SPE_TELEPORT_AWAY );*/
spl_book[save_tport.tport_indx] = save_tport.savespell; g.spl_book[save_tport.tport_indx] = save_tport.savespell;
save_tport.tport_indx = MAXSPELL; /* burn bridge... */ save_tport.tport_indx = MAXSPELL; /* burn bridge... */
} else if (what == ADD_SPELL) { } else if (what == ADD_SPELL) {
save_tport.savespell = spl_book[i]; save_tport.savespell = g.spl_book[i];
save_tport.tport_indx = i; save_tport.tport_indx = i;
spl_book[i].sp_id = SPE_TELEPORT_AWAY; g.spl_book[i].sp_id = SPE_TELEPORT_AWAY;
spl_book[i].sp_lev = objects[SPE_TELEPORT_AWAY].oc_level; g.spl_book[i].sp_lev = objects[SPE_TELEPORT_AWAY].oc_level;
spl_book[i].sp_know = KEEN; g.spl_book[i].sp_know = KEEN;
return REMOVESPELL; /* operation needed to reverse */ return REMOVESPELL; /* operation needed to reverse */
} }
} else { /* spellid(i) == SPE_TELEPORT_AWAY */ } else { /* spellid(i) == SPE_TELEPORT_AWAY */
@@ -1317,12 +1317,12 @@ int what;
save_tport.tport_indx = MAXSPELL; save_tport.tport_indx = MAXSPELL;
} else if (what == REMOVESPELL) { } else if (what == REMOVESPELL) {
/*assert( i == save_tport.tport_indx );*/ /*assert( i == save_tport.tport_indx );*/
spl_book[i] = save_tport.savespell; g.spl_book[i] = save_tport.savespell;
save_tport.tport_indx = MAXSPELL; save_tport.tport_indx = MAXSPELL;
} else if (what == HIDE_SPELL) { } else if (what == HIDE_SPELL) {
save_tport.savespell = spl_book[i]; save_tport.savespell = g.spl_book[i];
save_tport.tport_indx = i; save_tport.tport_indx = i;
spl_book[i].sp_id = NO_SPELL; g.spl_book[i].sp_id = NO_SPELL;
return UNHIDESPELL; /* operation needed to reverse */ return UNHIDESPELL; /* operation needed to reverse */
} }
} }
src/teleport.c
+1 -1
View File
@@ -548,7 +548,7 @@ dotelecmd()
win = create_nhwindow(NHW_MENU); win = create_nhwindow(NHW_MENU);
start_menu(win); start_menu(win);
any = zeroany; any = g.zeroany;
for (i = 0; i < SIZE(tports); ++i) { for (i = 0; i < SIZE(tports); ++i) {
any.a_int = (int) tports[i].menulet; any.a_int = (int) tports[i].menulet;
add_menu(win, NO_GLYPH, &any, (char) any.a_int, 0, ATR_NONE, add_menu(win, NO_GLYPH, &any, (char) any.a_int, 0, ATR_NONE,