Remove the need for -Wno-pointer-sign. Object diffs checked.

[bsdgames-darwin.git] / trek / lose.c

diff --git a/trek/lose.c b/trek/lose.c
index ab9959d4435264bd3b1909904ef76f2e72026b05..974b1776ec6a3c9fbb596ecc4c6e4043895530a6 100644 (file)
--- a/trek/lose.c
+++ b/trek/lose.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: lose.c,v 1.3 1995/04/22 10:59:08 cgd Exp $     */
+/*     $NetBSD: lose.c,v 1.9 2009/05/24 21:44:56 dholland Exp $        */
 
 /*
  * Copyright (c) 1980, 1993
@@ -12,11 +12,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.
  *
@@ -33,16 +29,20 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)lose.c     8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: lose.c,v 1.3 1995/04/22 10:59:08 cgd Exp $";
+__RCSID("$NetBSD: lose.c,v 1.9 2009/05/24 21:44:56 dholland Exp $");
 #endif
 #endif /* not lint */
 
-# include      "trek.h"
-# include      <setjmp.h>
+#include <stdio.h>
+#include <setjmp.h>
+#include <unistd.h>
+#include "trek.h"
+#include "getpar.h"
 
 /*
 **  PRINT OUT LOSER MESSAGES
@@ -52,8 +52,9 @@ static char rcsid[] = "$NetBSD: lose.c,v 1.3 1995/04/22 10:59:08 cgd Exp $";
 **     actions which need be taken are taken.
 */
 
-char   *Losemsg[] =
-{
+extern jmp_buf env;
+
+const char     *const Losemsg[] = {
        "You ran out of time",
        "You ran out of energy",
        "You have been destroyed",
@@ -69,17 +70,13 @@ char        *Losemsg[] =
        "Your last crew member died",
 };
 
-lose(why)
-int    why;
+void
+lose(int why)
 {
-       extern jmp_buf  env;
-
        Game.killed = 1;
        sleep(1);
        printf("\n%s\n", Losemsg[why - 1]);
-       switch (why)
-       {
-
+       switch (why) {
          case L_NOTIME:
                Game.killed = 0;
                break;