From 8b58b8a3da4d5591c8f696d9d81c0ec6ddb0fbd0 Mon Sep 17 00:00:00 2001 From: dholland Date: Sat, 23 Feb 2008 19:49:21 +0000 Subject: Rename ->last_card to ->top_card to match OpenBSD (and also to make somewhat more sense...) --- monop/cards.c | 10 +++++----- monop/deck.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/monop/cards.c b/monop/cards.c index 0064c4ae..5768a359 100644 --- a/monop/cards.c +++ b/monop/cards.c @@ -1,4 +1,4 @@ -/* $NetBSD: cards.c,v 1.18 2008/02/23 19:09:00 dholland Exp $ */ +/* $NetBSD: cards.c,v 1.19 2008/02/23 19:49:21 dholland Exp $ */ /* * Copyright (c) 1980, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)cards.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: cards.c,v 1.18 2008/02/23 19:09:00 dholland Exp $"); +__RCSID("$NetBSD: cards.c,v 1.19 2008/02/23 19:49:21 dholland Exp $"); #endif #endif /* not lint */ @@ -106,7 +106,7 @@ set_up(dp) /* convert offsets from big-endian byte order */ for (i = 0; i < dp->num_cards; i++) BE64TOH(dp->offsets[i]); - dp->last_card = 0; + dp->top_card = 0; dp->gojf_used = FALSE; for (i = 0; i < dp->num_cards; i++) { off_t temp; @@ -132,8 +132,8 @@ get_card(dp) OWN *op; do { - fseek(deckf, dp->offsets[dp->last_card], SEEK_SET); - dp->last_card = ++(dp->last_card) % dp->num_cards; + fseek(deckf, dp->offsets[dp->top_card], SEEK_SET); + dp->top_card = ++(dp->top_card) % dp->num_cards; type_maj = getc(deckf); } while (dp->gojf_used && type_maj == GOJF); type_min = getc(deckf); diff --git a/monop/deck.h b/monop/deck.h index a5d5159a..93b9c0bb 100644 --- a/monop/deck.h +++ b/monop/deck.h @@ -1,4 +1,4 @@ -/* $NetBSD: deck.h,v 1.6 2003/08/07 09:37:27 agc Exp $ */ +/* $NetBSD: deck.h,v 1.7 2008/02/23 19:49:21 dholland Exp $ */ /* * Copyright (c) 1980, 1993 @@ -40,7 +40,7 @@ struct dk_st { /* deck description structure */ int num_cards; /* number of cards in deck */ - int last_card; /* number of last card picked */ + int top_card; /* number of last card picked */ bool gojf_used; /* set if gojf card out of deck */ off_t *offsets; /* offsets for start of cards */ }; -- cgit v1.2.3-56-ge451