From ca4b6a43b196d117bf8be882a3d2f0771d1f0249 Mon Sep 17 00:00:00 2001 From: joerg Date: Thu, 20 Dec 2012 22:05:05 +0000 Subject: Add some void love. --- games/spider/distinfo | 8 ++-- games/spider/patches/patch-ac | 42 ++++++++++++++--- games/spider/patches/patch-gfx.c | 90 ++++++++++++++++++++++++++++++++++++ games/spider/patches/patch-globals_h | 19 ++++++-- games/spider/patches/patch-spider.c | 24 ++++++++++ 5 files changed, 171 insertions(+), 12 deletions(-) create mode 100644 games/spider/patches/patch-gfx.c create mode 100644 games/spider/patches/patch-spider.c (limited to 'games') diff --git a/games/spider/distinfo b/games/spider/distinfo index 95ce8784f2a..efe57c37893 100644 --- a/games/spider/distinfo +++ b/games/spider/distinfo @@ -1,9 +1,11 @@ -$NetBSD: distinfo,v 1.5 2012/06/18 04:19:09 dholland Exp $ +$NetBSD: distinfo,v 1.6 2012/12/20 22:05:05 joerg Exp $ SHA1 (spider.tar.gz) = 384c43857b8a7322ba1c80bc37513415f75db482 RMD160 (spider.tar.gz) = aedcf3e18eeefd98f475b2c2408f49b99f4f9ef0 Size (spider.tar.gz) = 95318 bytes SHA1 (patch-aa) = 204b8d75f8583fe71f89f18dfdd1774cd2042b2f SHA1 (patch-ab) = 1ae99ebe79d79beee3bd0ebd62998f62c6fca51e -SHA1 (patch-ac) = eba9502b078037755027b0095155fb9b0e4c7c8b -SHA1 (patch-globals_h) = 15aebc22aa9f182af977c20adb5f73e4da468f02 +SHA1 (patch-ac) = 4981717724342ed18988a8ec9581a8c396bba694 +SHA1 (patch-gfx.c) = bc771427668f949fe9f4daefb7ca2e1f970c9dee +SHA1 (patch-globals_h) = d59270182377c83021d9119fab66e1e975870c10 +SHA1 (patch-spider.c) = edadb3017109f5434befd457e411b61bc47bcc01 diff --git a/games/spider/patches/patch-ac b/games/spider/patches/patch-ac index ba0fa61f897..8b49482d3e9 100644 --- a/games/spider/patches/patch-ac +++ b/games/spider/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.1 2006/08/02 16:04:33 kristerw Exp $ +$NetBSD: patch-ac,v 1.2 2012/12/20 22:05:05 joerg Exp $ ---- movelog.c.orig 2006-08-02 17:55:55.000000000 +0200 -+++ movelog.c 2006-08-02 17:57:51.000000000 +0200 -@@ -33,6 +33,9 @@ +--- movelog.c.orig 1991-09-28 17:46:17.000000000 +0000 ++++ movelog.c +@@ -33,6 +35,9 @@ int deck_index = 0; extern int cheat_count; @@ -12,7 +12,16 @@ $NetBSD: patch-ac,v 1.1 2006/08/02 16:04:33 kristerw Exp $ make_deck_cache() { CardPtr tmp; -@@ -299,8 +302,7 @@ +@@ -93,7 +98,7 @@ Bool *exposed; + *exposed = (val >= 14); + } + +-undo() ++void undo(void) + { + int val; + int from, dest, num_cards; +@@ -299,8 +304,7 @@ Rank *rank; } static int @@ -22,7 +31,28 @@ $NetBSD: patch-ac,v 1.1 2006/08/02 16:04:33 kristerw Exp $ { int val; -@@ -787,8 +789,7 @@ +@@ -572,9 +576,7 @@ int val; + } + } + +-write_file(fname, confirmer) +-char *fname; +-Bool (*confirmer)(); ++void write_file(char *fname, Bool (*confirmer)()) + { + FILE *fp; + char buf[512]; +@@ -739,8 +741,7 @@ char *fname; + } + } + +-read_file(fname) +-char *fname; ++void read_file(char fname) + { + FILE *fp; + char buf[1024], buf2[1024]; +@@ -787,8 +788,7 @@ char *dp; } static int diff --git a/games/spider/patches/patch-gfx.c b/games/spider/patches/patch-gfx.c new file mode 100644 index 00000000000..9af93801760 --- /dev/null +++ b/games/spider/patches/patch-gfx.c @@ -0,0 +1,90 @@ +$NetBSD: patch-gfx.c,v 1.1 2012/12/20 22:05:06 joerg Exp $ + +--- gfx.c.orig 1991-09-28 17:46:10.000000000 +0000 ++++ gfx.c +@@ -115,6 +115,11 @@ static int back_delta_x, back_delta_y; / + static Bool card_is_clipped; /* optimizer for card drawing */ + #endif + ++static void draw_did(Suit suit, int x, int y); ++static void draw_eight_pips(Suit suit, int x, int y); ++static void draw_six_pips(Suit suit, int x, int y); ++static void draw_center_pip(Suit suit, int x, int y); ++ + gfx_init(d, scr) + Display *d; + int scr; +@@ -566,8 +571,7 @@ force_redraw() + * + * REMIND -- spread the deck a bit to show that there's more + */ +-redraw_deck(x, y, w, h) +-int x, y, w, h; ++void redraw_deck(int x, int y, int w, int h) + { + CardPtr tmp; + +@@ -599,8 +603,7 @@ CardPtr tmp; + } + + +-redraw_card_piles(x, y, w, h) +-int x, y, w, h; ++void redraw_card_piles(int x, int y, int w, int h) + { + int i; + CardPtr tmp; +@@ -641,8 +644,7 @@ CardPtr tmp; + } + + +-redraw_card_stacks(x, y, w, h) +-int x, y, w, h; ++void redraw_card_stacks(int x, int y, int w, int h) + { + int i; + CardPtr tmp; +@@ -1011,9 +1013,7 @@ int w, h; + * + * location is for center of pip + */ +-draw_did(suit, x, y) +-Suit suit; +-int x,y; ++static void draw_did(Suit suit, int x, int y) + { + int w, h; + +@@ -1051,9 +1051,7 @@ int w, h; + /* + * draws big center pip + */ +-draw_center_pip(suit, x, y) +-Suit suit; +-int x,y; ++static void draw_center_pip(Suit suit, int x, int y) + { + int w, h; + +@@ -1110,9 +1108,7 @@ int x,y; + draw_did(suit, x + CARD_COL3_X, y + CARD_ROW5_Y); + } + +-draw_six_pips(suit, x, y) +-Suit suit; +-int x, y; ++static void draw_six_pips(Suit suit, int x, int y) + { + draw_pip(suit, x + CARD_COL1_X, y + CARD_ROW1_Y); + +@@ -1129,9 +1125,7 @@ int x, y; + draw_did(suit, x + CARD_COL3_X, y + CARD_ROW5_Y); + } + +-draw_eight_pips(suit, x, y) +-Suit suit; +-int x,y; ++static void draw_eight_pips(Suit suit, int x, int y) + { + draw_pip(suit, x + CARD_COL1_X, y + CARD_ROW1_Y); + diff --git a/games/spider/patches/patch-globals_h b/games/spider/patches/patch-globals_h index 060adec3a05..1a8b2980c27 100644 --- a/games/spider/patches/patch-globals_h +++ b/games/spider/patches/patch-globals_h @@ -1,9 +1,9 @@ -$NetBSD: patch-globals_h,v 1.1 2012/06/18 04:19:09 dholland Exp $ +$NetBSD: patch-globals_h,v 1.2 2012/12/20 22:05:06 joerg Exp $ - use standard headers - don't provide own malloc declarations ---- globals.h~ 1991-09-28 17:46:20.000000000 +0000 +--- globals.h.orig 1991-09-28 17:46:20.000000000 +0000 +++ globals.h @@ -10,6 +10,8 @@ * @@ -14,7 +14,20 @@ $NetBSD: patch-globals_h,v 1.1 2012/06/18 04:19:09 dholland Exp $ /* * spider global variables */ -@@ -95,7 +97,3 @@ void do_expand(); +@@ -92,10 +94,16 @@ void button_release(); + void do_expand(); + #endif KITLESS + ++void read_file(char fname); ++void write_file(char *fname, Bool (*confirmer)()); ++void undo(void); ++ ++void redraw_card_stacks(int x, int y, int w, int h); ++void redraw_deck(int x, int y, int w, int h); ++void redraw_card_piles(int x, int y, int w, int h); ++void deal_next_hand(Bool log); ++void expand(CardList list); ++ #ifdef XAW Bool can_get_help_files(); #endif diff --git a/games/spider/patches/patch-spider.c b/games/spider/patches/patch-spider.c new file mode 100644 index 00000000000..8df3adfe8c0 --- /dev/null +++ b/games/spider/patches/patch-spider.c @@ -0,0 +1,24 @@ +$NetBSD: patch-spider.c,v 1.1 2012/12/20 22:05:06 joerg Exp $ + +--- spider.c.orig 2012-12-20 18:05:35.000000000 +0000 ++++ spider.c +@@ -218,8 +218,7 @@ int num; + /* + * deal hand of 10 + */ +-deal_next_hand(log) +-Bool log; ++void deal_next_hand(Bool log) + { + int i; + CardPtr tmp; +@@ -936,8 +935,7 @@ char buf[128]; + /* + * print cards in list + */ +-expand(list) +-CardList list; ++void expand(CardList list) + { + CardPtr tmp, last; + char buf[512], buf2[10]; -- cgit v1.2.3