BSD 4_3_Reno release

[unix-history] / usr / src / games / trek / play.c

diff --git a/usr/src/games/trek/play.c b/usr/src/games/trek/play.c
index 3bbb9c7..a33ea13 100644 (file)
--- a/usr/src/games/trek/play.c
+++ b/usr/src/games/trek/play.c
@@ -2,25 +2,28 @@
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms are permitted provided
+ * that: (1) source distributions retain this entire copyright notice and
+ * comment, and (2) distributions including binaries display the following
+ * acknowledgement:  ``This product includes software developed by the
+ * University of California, Berkeley and its contributors'' in the
+ * documentation or other materials provided with the distribution and in
+ * all advertising materials mentioning features or use of this software.
+ * 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.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)play.c     5.3 (Berkeley) 6/18/88";
+static char sccsid[] = "@(#)play.c     5.6 (Berkeley) 6/26/90";

 #endif /* not lint */
 
 # include      "trek.h"
 # include      "getpar.h"
 #endif /* not lint */
 
 # include      "trek.h"
 # include      "getpar.h"

+# include      <setjmp.h>

 
 /*
 **  INSTRUCTION READ AND MAIN PLAY LOOP
 
 /*
 **  INSTRUCTION READ AND MAIN PLAY LOOP


@@ -34,8 +37,8 @@ static char sccsid[] = "@(#)play.c    5.3 (Berkeley) 6/18/88";
 */
 extern int     abandon(), capture(), shield(), computer(), dcrept(),
                destruct(), dock(), help(), impulse(), lrscan(),
 */
 extern int     abandon(), capture(), shield(), computer(), dcrept(),
                destruct(), dock(), help(), impulse(), lrscan(),

-               warp(), dumpgame(), rest(), shell(), srscan(),
-               reset(), torped(), visual(), setwarp(), undock(), phaser();
+               warp(), dumpgame(), rest(), srscan(),
+               myreset(), torped(), visual(), setwarp(), undock(), phaser();

 
 struct cvntab  Comtab[] =
 {
 
 struct cvntab  Comtab[] =
 {


@@ -54,11 +57,10 @@ struct cvntab       Comtab[] =
        "ram",                  "",                     warp,           1,
        "dump",                 "",                     dumpgame,       0,
        "r",                    "est",                  rest,           0,
        "ram",                  "",                     warp,           1,
        "dump",                 "",                     dumpgame,       0,
        "r",                    "est",                  rest,           0,

-       "shell",                "",                     shell,          0,

        "sh",                   "ield",                 shield, 0,
        "s",                    "rscan",                srscan, 0,
        "st",                   "atus",                 srscan, -1,
        "sh",                   "ield",                 shield, 0,
        "s",                    "rscan",                srscan, 0,
        "st",                   "atus",                 srscan, -1,

-       "terminate",            "",                     reset,          0,
+       "terminate",            "",                     myreset,        0,

        "t",                    "orpedo",               torped, 0,
        "u",                    "ndock",                undock, 0,
        "v",                    "isual",                visual, 0,
        "t",                    "orpedo",               torped, 0,
        "u",                    "ndock",                undock, 0,
        "v",                    "isual",                visual, 0,


@@ -66,6 +68,13 @@ struct cvntab        Comtab[] =
        0
 };
 
        0
 };
 

+myreset()
+{
+       extern jmp_buf env;
+
+       longjmp(env, 1);
+}
+

 play()
 {
        struct cvntab           *r;
 play()
 {
        struct cvntab           *r;