Whitespace/KNF nits.

[bsdgames-darwin.git] / rogue / play.c

diff --git a/rogue/play.c b/rogue/play.c
index 601f89249012f6602b9d75815c21984d6123a627..1e14754de5c29538bafe0422222040da20befd8a 100644 (file)
--- a/rogue/play.c
+++ b/rogue/play.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: play.c,v 1.3 1995/04/22 10:28:04 cgd Exp $     */
+/*     $NetBSD: play.c,v 1.8 2008/01/14 00:23:52 dholland Exp $        */
 
 /*
  * Copyright (c) 1988, 1993
@@ -15,11 +15,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -36,11 +32,12 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)play.c     8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: play.c,v 1.3 1995/04/22 10:28:04 cgd Exp $";
+__RCSID("$NetBSD: play.c,v 1.8 2008/01/14 00:23:52 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -59,12 +56,9 @@ static char rcsid[] = "$NetBSD: play.c,v 1.3 1995/04/22 10:28:04 cgd Exp $";
 #include "rogue.h"
 
 boolean interrupted = 0;
-char *unknown_command = "unknown command";
-
-extern short party_room, bear_trap;
-extern char hit_message[];
-extern boolean wizard, trap_door;
+const char *unknown_command = "unknown command";
 
+void
 play_level()
 {
        short ch;
@@ -73,7 +67,7 @@ play_level()
        for (;;) {
                interrupted = 0;
                if (hit_message[0]) {
-                       message(hit_message, 1);
+                       messagef(1, "%s", hit_message);
                        hit_message[0] = 0;
                }
                if (trap_door) {
@@ -112,7 +106,7 @@ CH:
                case 'u':
                case 'n':
                case 'b':
-                       (void) one_move_rogue(ch, 1);
+                       (void)one_move_rogue(ch, 1);
                        break;
                case 'H':
                case 'J':
@@ -220,7 +214,7 @@ CH:
                        throw();
                        break;
                case 'v':
-                       message("rogue-clone: Version III. (Tim Stoehr was here), tektronix!zeus!tims", 0);
+                       messagef(0, "rogue-clone: Version III. (Tim Stoehr was here), tektronix!zeus!tims");
                        break;
                case 'Q':
                        quit(0);
@@ -252,28 +246,28 @@ CH:
                        if (wizard) {
                                inventory(&level_objects, ALL_OBJECTS);
                        } else {
-                               message(unknown_command, 0);
+                               messagef(0, "%s", unknown_command);
                        }
                        break;
                case '\023':
                        if (wizard) {
                                draw_magic_map();
                        } else {
-                               message(unknown_command, 0);
+                               messagef(0, "%s", unknown_command);
                        }
                        break;
                case '\024':
                        if (wizard) {
                                show_traps();
                        } else {
-                               message(unknown_command, 0);
+                               messagef(0, "%s", unknown_command);
                        }
                        break;
                case '\017':
                        if (wizard) {
                                show_objects();
                        } else {
-                               message(unknown_command, 0);
+                               messagef(0, "%s", unknown_command);
                        }
                        break;
                case '\001':
@@ -283,21 +277,21 @@ CH:
                        if (wizard) {
                                c_object_for_wizard();
                        } else {
-                               message(unknown_command, 0);
+                               messagef(0, "%s", unknown_command);
                        }
                        break;
                case '\015':
                        if (wizard) {
                                show_monsters();
                        } else {
-                               message(unknown_command, 0);
+                               messagef(0, "%s", unknown_command);
                        }
                        break;
                case 'S':
                        save_game();
                        break;
                default:
-                       message(unknown_command, 0);
+                       messagef(0, "%s", unknown_command);
                        break;
                }
        }