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

Fix warnings

Browse Source
This commit is contained in:
Pasi Kallinen
2015-03-12 17:57:13 +02:00
parent a46ad54b1d
commit 400d842a8f
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/extern.h
+1
View File
@@ -1582,6 +1582,7 @@ E int NDECL(dowhatdoes);
E char *FDECL(dowhatdoes_core,(CHAR_P, char *)); E char *FDECL(dowhatdoes_core,(CHAR_P, char *));
E int NDECL(dohelp); E int NDECL(dohelp);
E int NDECL(dohistory); E int NDECL(dohistory);
E int FDECL(do_screen_description, (coord, BOOLEAN_P, int, char *, const char **));
E int FDECL(do_look, (int, coord *)); E int FDECL(do_look, (int, coord *));
/* ### pcmain.c ### */ /* ### pcmain.c ### */
src/do_name.c
+1 -1
View File
@@ -96,7 +96,7 @@ const char *goal;
coord cc; coord cc;
int sym = 0; int sym = 0;
char tmpbuf[BUFSZ]; char tmpbuf[BUFSZ];
char *firstmatch = NULL; const char *firstmatch = NULL;
cc.x = cx; cc.x = cx;
cc.y = cy; cc.y = cy;
if (do_screen_description(cc, TRUE, sym, tmpbuf, &firstmatch)) { if (do_screen_description(cc, TRUE, sym, tmpbuf, &firstmatch)) {
src/pager.c
+3 -7
View File
@@ -454,16 +454,15 @@ const char **firstmatch;
boolean hit_trap; boolean hit_trap;
const char *x_str; const char *x_str;
static const char *mon_interior = "the interior of a monster"; static const char *mon_interior = "the interior of a monster";
struct permonst *pm = NULL;
if (looked) { if (looked) {
int oc, so; int oc;
unsigned os; unsigned os;
glyph = glyph_at(cc.x,cc.y); glyph = glyph_at(cc.x,cc.y);
/* Convert the glyph at the selected position to a symbol. */ /* Convert the glyph at the selected position to a symbol. */
so = mapglyph(glyph, &sym, &oc, &os, cc.x, cc.y); (void) mapglyph(glyph, &sym, &oc, &os, cc.x, cc.y);
} }
if (looked) if (looked)
@@ -642,7 +641,7 @@ const char **firstmatch;
char monbuf[BUFSZ]; char monbuf[BUFSZ];
char temp_buf[BUFSZ]; char temp_buf[BUFSZ];
pm = lookat(cc.x, cc.y, look_buf, monbuf); (void) lookat(cc.x, cc.y, look_buf, monbuf);
*firstmatch = look_buf; *firstmatch = look_buf;
if (*(*firstmatch)) { if (*(*firstmatch)) {
Sprintf(temp_buf, " (%s)", *firstmatch); Sprintf(temp_buf, " (%s)", *firstmatch);
@@ -685,7 +684,6 @@ do_look(mode, click_cc)
coord cc; /* screen pos of unknown glyph */ coord cc; /* screen pos of unknown glyph */
boolean save_verbose; /* saved value of flags.verbose */ boolean save_verbose; /* saved value of flags.verbose */
boolean from_screen; /* question from the screen */ boolean from_screen; /* question from the screen */
static const char *mon_interior = "the interior of a monster";
if (!clicklook) { if (!clicklook) {
if (quick) { if (quick) {
@@ -730,8 +728,6 @@ do_look(mode, click_cc)
out_str[0] = '\0'; out_str[0] = '\0';
if (from_screen || clicklook) { if (from_screen || clicklook) {
int oc, so;
unsigned os;
if (from_screen) { if (from_screen) {
if (flags.verbose) if (flags.verbose)
pline("Please move the cursor to %s.", pline("Please move the cursor to %s.",