Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/games/battlestar Rename com#.c to command#.c to avoid confli...



details:   https://anonhg.NetBSD.org/src/rev/7659bac8bfdd
branches:  trunk
changeset: 516245:7659bac8bfdd
user:      tv <tv%NetBSD.org@localhost>
date:      Fri Oct 19 03:06:09 2001 +0000

description:
Rename com#.c to command#.c to avoid conflicts with those file basenames
on certain Microsoft host OS's.

diffstat:

 games/battlestar/Makefile   |    5 +-
 games/battlestar/com1.c     |  273 ----------------------------
 games/battlestar/com2.c     |  353 ------------------------------------
 games/battlestar/com3.c     |  321 ---------------------------------
 games/battlestar/com4.c     |  421 --------------------------------------------
 games/battlestar/com5.c     |  380 ---------------------------------------
 games/battlestar/com6.c     |  274 ----------------------------
 games/battlestar/com7.c     |  267 ---------------------------
 games/battlestar/command1.c |  273 ++++++++++++++++++++++++++++
 games/battlestar/command2.c |  353 ++++++++++++++++++++++++++++++++++++
 games/battlestar/command3.c |  321 +++++++++++++++++++++++++++++++++
 games/battlestar/command4.c |  421 ++++++++++++++++++++++++++++++++++++++++++++
 games/battlestar/command5.c |  380 +++++++++++++++++++++++++++++++++++++++
 games/battlestar/command6.c |  274 ++++++++++++++++++++++++++++
 games/battlestar/command7.c |  267 +++++++++++++++++++++++++++
 15 files changed, 2292 insertions(+), 2291 deletions(-)

diffs (truncated from 4649 to 300 lines):

diff -r e3289723da1e -r 7659bac8bfdd games/battlestar/Makefile
--- a/games/battlestar/Makefile Fri Oct 19 02:57:34 2001 +0000
+++ b/games/battlestar/Makefile Fri Oct 19 03:06:09 2001 +0000
@@ -1,8 +1,9 @@
-#      $NetBSD: Makefile,v 1.8 1998/02/18 22:37:30 jtc Exp $
+#      $NetBSD: Makefile,v 1.9 2001/10/19 03:06:09 tv Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
 PROG=  battlestar
-SRCS=  battlestar.c com1.c com2.c com3.c com4.c com5.c com6.c com7.c \
+SRCS=  battlestar.c command1.c command2.c command3.c command4.c \
+       command5.c command6.c command7.c \
        init.c cypher.c getcom.c parse.c room.c save.c fly.c misc.c \
        globals.c dayfile.c nightfile.c dayobjs.c nightobjs.c words.c
 MAN=   battlestar.6
diff -r e3289723da1e -r 7659bac8bfdd games/battlestar/com1.c
--- a/games/battlestar/com1.c   Fri Oct 19 02:57:34 2001 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,273 +0,0 @@
-/*     $NetBSD: com1.c,v 1.13 2000/09/24 09:41:53 jsm Exp $    */
-
-/*
- * Copyright (c) 1983, 1993
- *     The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)com1.c     8.2 (Berkeley) 4/28/95";
-#else
-__RCSID("$NetBSD: com1.c,v 1.13 2000/09/24 09:41:53 jsm Exp $");
-#endif
-#endif                         /* not lint */
-
-#include "extern.h"
-
-int
-moveplayer(thataway, token)
-       int     thataway, token;
-{
-       wordnumber++;
-       if ((!notes[CANTMOVE] && !notes[LAUNCHED]) ||
-           testbit(location[position].objects, LAND) ||
-           (fuel > 0 && notes[LAUNCHED])) {
-               if (thataway) {
-                       position = thataway;
-                       newway(token);
-                       ourtime++;
-               } else {
-                       puts("You can't go this way.");
-                       newway(token);
-                       whichway(location[position]);
-                       return (0);
-               }
-       } else {
-               if (notes[CANTMOVE] && !notes[LAUNCHED])
-                       puts("You aren't able to move; you better drop something.");
-               else
-                       puts("You are out of fuel; now you will rot in space forever!");
-       }
-       return (1);
-}
-
-void
-convert(tothis)                        /* Converts day to night and vice versa.            */
-       int     tothis;         /* Day objects are permanent.  Night objects
-                                * are added */
-{                              /* at dusk, and subtracted at dawn.              */
-       const struct objs *p;
-       unsigned int     i, j;
-
-       if (tothis == TONIGHT) {
-               for (i = 1; i <= NUMOFROOMS; i++)
-                       for (j = 0; j < NUMOFWORDS; j++)
-                               nightfile[i].objects[j] = dayfile[i].objects[j];
-               for (p = nightobjs; p->room != 0; p++)
-                       setbit(nightfile[p->room].objects, p->obj);
-               location = nightfile;
-       } else {
-               for (i = 1; i <= NUMOFROOMS; i++)
-                       for (j = 0; j < NUMOFWORDS; j++)
-                               dayfile[i].objects[j] = nightfile[i].objects[j];
-               for (p = nightobjs; p->room != 0; p++)
-                       clearbit(dayfile[p->room].objects, p->obj);
-               location = dayfile;
-       }
-}
-
-void
-news()
-{
-       int     n;
-       int     hurt;
-
-       if (ourtime > 30 && position < 32) {
-               puts("An explosion of shuddering magnitude splinters bulkheads and");
-               puts("ruptures the battlestar's hull.  You are sucked out into the");
-               puts("frozen void of space and killed.");
-               die();
-       }
-       if (ourtime > 20 && position < 32)
-               puts("Explosions rock the battlestar.");
-       if (ourtime > snooze) {
-               puts("You drop from exhaustion...");
-               zzz();
-       }
-       if (ourtime > snooze - 5)
-               puts("You're getting tired.");
-       if (ourtime > (rythmn + CYCLE)) {
-               if (location == nightfile) {
-                       convert(TODAY);
-                       if (OUTSIDE && ourtime - rythmn - CYCLE < 10) {
-                               puts("Dew lit sunbeams stretch out from a watery sunrise and herald the dawn.");
-                               puts("You awake from a misty dream-world into stark reality.");
-                               puts("It is day.");
-                       }
-               } else {
-                       convert(TONIGHT);
-                       clearbit(location[POOLS].objects, BATHGOD);
-                       if (OUTSIDE && ourtime - rythmn - CYCLE < 10) {
-                               puts("The dying sun sinks into the ocean, leaving a blood-stained sunset.");
-                               puts("The sky slowly fades from orange to violet to black.  A few stars");
-                               puts("flicker on, and it is night.");
-                               puts("The world seems completely different at night.");
-                       }
-               }
-               rythmn = ourtime - ourtime % CYCLE;
-       }
-       if (!wiz && !tempwiz)
-               if ((testbit(inven, TALISMAN) || testbit(wear, TALISMAN)) && (testbit(inven, MEDALION) || testbit(wear, MEDALION)) && (testbit(inven, AMULET) || testbit(wear, AMULET))) {
-                       tempwiz = 1;
-                       puts("The three amulets glow and reenforce each other in power.\nYou are now a wizard.");
-               }
-       if (testbit(location[position].objects, ELF)) {
-               printf("%s\n", objdes[ELF]);
-               fight(ELF, rnd(30));
-       }
-       if (testbit(location[position].objects, DARK)) {
-               printf("%s\n", objdes[DARK]);
-               fight(DARK, 100);
-       }
-       if (testbit(location[position].objects, WOODSMAN)) {
-               printf("%s\n", objdes[WOODSMAN]);
-               fight(WOODSMAN, 50);
-       }
-       switch (position) {
-
-       case 267:
-       case 257:               /* entering a cave */
-       case 274:
-       case 246:
-               notes[CANTSEE] = 1;
-               break;
-       case 160:
-       case 216:               /* leaving a cave */
-       case 230:
-       case 231:
-       case 232:
-               notes[CANTSEE] = 0;
-               break;
-       }
-       if (testbit(location[position].objects, GIRL))
-               meetgirl = 1;
-       if (meetgirl && CYCLE * 1.5 - ourtime < 10) {
-               setbit(location[GARDEN].objects, GIRLTALK);
-               setbit(location[GARDEN].objects, LAMPON);
-               setbit(location[GARDEN].objects, ROPE);
-       }
-       if (position == DOCK && (beenthere[position] || ourtime > CYCLE)) {
-               clearbit(location[DOCK].objects, GIRL);
-               clearbit(location[DOCK].objects, MAN);
-       }
-       if (meetgirl && ourtime - CYCLE * 1.5 > 10) {
-               clearbit(location[GARDEN].objects, GIRLTALK);
-               clearbit(location[GARDEN].objects, LAMPON);
-               clearbit(location[GARDEN].objects, ROPE);
-               meetgirl = 0;
-       }
-       if (testbit(location[position].objects, CYLON)) {
-               puts("Oh my God, you're being shot at by an alien spacecraft!");
-               printf("The targeting computer says we have %d seconds to attack!\n",
-                   ourclock);
-               fflush(stdout);
-               sleep(1);
-               if (!visual()) {
-                       hurt = rnd(NUMOFINJURIES);
-                       injuries[hurt] = 1;
-                       puts("Laser blasts sear the cockpit, and the alien veers off in a victory roll.");
-                       puts("The viper shudders under a terrible explosion.");
-                       printf("I'm afraid you have suffered %s.\n", ouch[hurt]);
-               } else
-                       clearbit(location[position].objects, CYLON);
-       }
-       if (injuries[SKULL] && injuries[INCISE] && injuries[NECK]) {
-               puts("I'm afraid you have suffered fatal injuries.");
-               die();
-       }
-       for (n = 0; n < NUMOFINJURIES; n++)
-               if (injuries[n] == 1) {
-                       injuries[n] = 2;
-                       if (WEIGHT > 5)
-                               WEIGHT -= 5;
-                       else
-                               WEIGHT = 0;
-               }
-       if (injuries[ARM] == 2) {
-               if (CUMBER > 5)
-                       CUMBER -= 5;
-               else
-                       CUMBER = 0;
-               injuries[ARM]++;
-       }
-       if (injuries[RIBS] == 2) {
-               if (CUMBER > 2)
-                       CUMBER -= 2;
-               else
-                       CUMBER = 0;
-               injuries[RIBS]++;
-       }
-       if (injuries[SPINE] == 2) {
-               WEIGHT = 0;
-               injuries[SPINE]++;
-       }
-       if (carrying > WEIGHT || encumber > CUMBER)
-               notes[CANTMOVE] = 1;
-       else
-               notes[CANTMOVE] = 0;
-}
-
-void
-crash()
-{
-       int     hurt1, hurt2;
-
-       fuel--;
-       if (!location[position].flyhere ||
-           (testbit(location[position].objects, LAND) && fuel <= 0)) {
-               if (!location[position].flyhere)
-                       puts("You're flying too low.  We're going to crash!");
-               else {
-                       puts("You're out of fuel.  We'll have to crash land!");
-                       if (!location[position].down) {
-                               puts("Your viper strikes the ground and explodes into fiery fragments.");
-                               puts("Thick black smoke billows up from the wreckage.");
-                               die();
-                       }
-                       position = location[position].down;
-               }
-               notes[LAUNCHED] = 0;
-               setbit(location[position].objects, CRASH);
-               ourtime += rnd(CYCLE / 4);
-               puts("The viper explodes into the ground and you lose consciousness...");
-               zzz();
-               hurt1 = rnd(NUMOFINJURIES - 2) + 2;
-               hurt2 = rnd(NUMOFINJURIES - 2) + 2;
-               injuries[hurt1] = 1;
-               injuries[hurt2] = 1;
-               injuries[0] = 1;/* abrasions */
-               injuries[1] = 1;/* lacerations */
-               printf("I'm afraid you have suffered %s and %s.\n",
-                   ouch[hurt1], ouch[hurt2]);
-       }
-}
diff -r e3289723da1e -r 7659bac8bfdd games/battlestar/com2.c
--- a/games/battlestar/com2.c   Fri Oct 19 02:57:34 2001 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,353 +0,0 @@
-/*     $NetBSD: com2.c,v 1.22 2001/06/02 17:30:28 christos Exp $       */
-
-/*
- * Copyright (c) 1983, 1993



Home | Main Index | Thread Index | Old Index