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

lint bits

Browse Source 
and some reformatting.
This commit is contained in:
nethack.rankin
2003-12-01 14:42:37 +00:00
parent 9d458f24ce
commit f761b02c8d
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/mhitu.c
View File

@@ -492,7 +492,8 @@ mattacku(mtmp)
You_feel("hemmed in."); You_feel("hemmed in.");
} else pline("But none comes."); } else pline("But none comes.");
} else { } else {
char *from_nowhere; const char *from_nowhere;
if (!Deaf) { if (!Deaf) {
pline("%s %s!", Something, pline("%s %s!", Something,
makeplural(growl_sound(mtmp))); makeplural(growl_sound(mtmp)));

47
src/teleport.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)teleport.c 3.4 2003/08/11 */ /* SCCS Id: @(#)teleport.c 3.4 2003/12/01 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -239,7 +239,7 @@ boolean allow_drag;
} }
ball_active = (Punished && uball->where != OBJ_FREE), ball_active = (Punished && uball->where != OBJ_FREE),
ball_still_in_range = FALSE; ball_still_in_range = FALSE;
/* If they have to move the ball, then drag if allow_drag is true; /* If they have to move the ball, then drag if allow_drag is true;
* otherwise they are teleporting, so unplacebc(). * otherwise they are teleporting, so unplacebc().
* If they don't have to move the ball, then always "drag" whether or * If they don't have to move the ball, then always "drag" whether or
@@ -614,29 +614,28 @@ level_tele()
if (wizard && !strcmp(buf,"?")) { if (wizard && !strcmp(buf,"?")) {
schar destlev = 0; schar destlev = 0;
xchar destdnum = 0; xchar destdnum = 0;
if ((newlev = (int)print_dungeon(TRUE, &destlev, &destdnum))) {
char buf[BUFSZ]; newlev = (int)print_dungeon(TRUE, &destlev, &destdnum);
newlevel.dnum = destdnum; if (!newlev) return;
newlevel.dlevel = destlev;
if (In_endgame(&newlevel) && !In_endgame(&u.uz)) { newlevel.dnum = destdnum;
Sprintf(buf, newlevel.dlevel = destlev;
"Destination is earth level"); if (In_endgame(&newlevel) && !In_endgame(&u.uz)) {
if (!u.uhave.amulet) { Sprintf(buf, "Destination is earth level");
struct obj *obj; if (!u.uhave.amulet) {
obj = mksobj(AMULET_OF_YENDOR, struct obj *obj = mksobj(AMULET_OF_YENDOR,
TRUE, FALSE); TRUE, FALSE);
if (obj) { if (obj) {
obj = addinv(obj); obj = addinv(obj);
Strcat(buf, " with the amulet"); Strcat(buf, " with the amulet");
} }
}
assign_level(&newlevel, &earth_level);
pline("%s.", buf);
} }
force_dest = TRUE; assign_level(&newlevel, &earth_level);
} else return; pline("%s.", buf);
}
force_dest = TRUE;
} else } else
#endif #endif /*WIZARD*/
if ((newlev = lev_by_name(buf)) == 0) newlev = atoi(buf); if ((newlev = lev_by_name(buf)) == 0) newlev = atoi(buf);
} while (!newlev && !digit(buf[0]) && } while (!newlev && !digit(buf[0]) &&
(buf[0] != '-' || !digit(buf[1])) && (buf[0] != '-' || !digit(buf[1])) &&
@@ -658,7 +657,7 @@ level_tele()
done(DIED); done(DIED);
pline("An energized cloud of dust begins to coalesce."); pline("An energized cloud of dust begins to coalesce.");
Your("body rematerializes%s.", invent ? Your("body rematerializes%s.", invent ?
", and you gather up all your possessions" : ""); ", and you gather up all your possessions" : "");
return; return;
} }