copy in from cvs; cvs2svn fucked up big time

git-svn-id: file:///srv/svn/joey/trunk/src/packages/bsdgames@9775 a4a2c43b-8ac3-0310-8836-e0e880c912e2
This commit is contained in:
joey
2003-12-19 19:12:08 +00:00
parent 351c8ca204
commit 51eabc017b
310 changed files with 7852 additions and 5005 deletions

View File

@@ -1,4 +1,4 @@
/* $NetBSD: dr_4.c,v 1.6 1997/10/13 21:03:37 christos Exp $ */
/* $NetBSD: dr_4.c,v 1.12 2001/02/05 01:10:09 christos Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -38,16 +38,15 @@
#if 0
static char sccsid[] = "@(#)dr_4.c 8.2 (Berkeley) 4/28/95";
#else
__RCSID("$NetBSD: dr_4.c,v 1.6 1997/10/13 21:03:37 christos Exp $");
__RCSID("$NetBSD: dr_4.c,v 1.12 2001/02/05 01:10:09 christos Exp $");
#endif
#endif /* not lint */
#include "extern.h"
#include <stdlib.h>
#include "extern.h"
void
ungrap(from, to)
struct ship *from, *to;
ungrap(struct ship *from, struct ship *to)
{
int k;
char friend;
@@ -56,7 +55,7 @@ struct ship *from, *to;
return;
friend = capship(from)->nationality == capship(to)->nationality;
while (--k >= 0) {
if (friend || die() < 3) {
if (friend || dieroll() < 3) {
cleangrapple(from, to, 0);
makesignal(from, "ungrappling $$", to);
}
@@ -64,12 +63,11 @@ struct ship *from, *to;
}
void
grap(from, to)
struct ship *from, *to;
grap(struct ship *from, struct ship *to)
{
if (capship(from)->nationality != capship(to)->nationality && die() > 2)
if (capship(from)->nationality != capship(to)->nationality && dieroll() > 2)
return;
Write(W_GRAP, from, 0, to->file->index, 0, 0, 0);
Write(W_GRAP, to, 0, from->file->index, 0, 0, 0);
Write(W_GRAP, from, to->file->index, 0, 0, 0);
Write(W_GRAP, to, from->file->index, 0, 0, 0);
makesignal(from, "grappled with $$", to);
}