]>
Commit | Line | Data |
---|---|---|
e14900ec JB |
1 | --- bsdgames-2.17.orig/backgammon/backgammon/move.c |
2 | +++ bsdgames-2.17/backgammon/backgammon/move.c | |
3 | @@ -152,6 +152,9 @@ | |
4 | trymove(0, 0); | |
5 | pickmove(); | |
6 | ||
7 | + if (d0) | |
8 | + swap; | |
9 | + | |
10 | /* print move */ | |
11 | writel(" and moves "); | |
12 | for (i = 0; i < mvlim; i++) { | |
13 | --- bsdgames-2.17.orig/backgammon/common_source/allow.c | |
14 | +++ bsdgames-2.17/backgammon/common_source/allow.c | |
15 | @@ -83,8 +83,10 @@ | |
16 | p[i--] = bar; | |
17 | if (p[i] != bar) | |
18 | continue; | |
19 | - else | |
20 | + else if (d0) | |
21 | break; | |
22 | + swap; | |
23 | + continue; | |
24 | } | |
25 | if (d0 || m == 4) | |
26 | break; | |
27 | --- bsdgames-2.17.orig/backgammon/teachgammon/ttext1.c | |
28 | +++ bsdgames-2.17/backgammon/teachgammon/ttext1.c | |
29 | @@ -94,7 +94,7 @@ | |
30 | "\n Although not indicated on the board, the players' homes are", | |
31 | "located just to the right of the board. A player's men are placed", | |
32 | "there when they are removed from the board. The board you just", | |
33 | - "saw was in it's initial position. All games start with the board", | |
34 | + "saw was in its initial position. All games start with the board", | |
35 | "looking like this. Notice that red's pieces are represented by the", | |
36 | "letter 'r' and white's pieces are represented by the letter 'w'.", | |
37 | "Also, a position may have zero or more pieces on it, e.g. posi-", | |
38 | --- bsdgames-2.17.orig/backgammon/teachgammon/ttext2.c | |
39 | +++ bsdgames-2.17/backgammon/teachgammon/ttext2.c | |
40 | @@ -65,7 +65,7 @@ | |
41 | "points in a row) are difficult to form, many points nestled close-", | |
42 | "ly together produce a formidable barrier. Also, while it is good", | |
43 | "to move back men forward, doing so lessens the opportunity for you", | |
44 | - "to hit men. Finally, remember that once the two player's have", | |
45 | + "to hit men. Finally, remember that once the two players have", | |
46 | "passed each other on the board, there is no chance of either team", | |
47 | "being hit, so the game reduces to a race off the board. Addi-", | |
48 | "tional hints on strategy are presented in the practice game.", | |
49 | --- bsdgames-2.17.orig/dm/dm.c | |
50 | +++ bsdgames-2.17/dm/dm.c | |
51 | @@ -134,19 +134,19 @@ | |
52 | while (fgets(lbuf, sizeof(lbuf), cfp)) | |
53 | switch (*lbuf) { | |
54 | case 'b': /* badtty */ | |
55 | - if (sscanf(lbuf, "%s%s", f1, f2) != 2 || | |
56 | + if (sscanf(lbuf, "%39s%39s", f1, f2) != 2 || | |
57 | strcasecmp(f1, "badtty")) | |
58 | break; | |
59 | c_tty(f2); | |
60 | break; | |
61 | case 'g': /* game */ | |
62 | - if (sscanf(lbuf, "%s%s%s%s%s", | |
63 | + if (sscanf(lbuf, "%39s%39s%39s%39s%39s", | |
64 | f1, f2, f3, f4, f5) != 5 || strcasecmp(f1, "game")) | |
65 | break; | |
66 | c_game(f2, f3, f4, f5); | |
67 | break; | |
68 | case 't': /* time */ | |
69 | - if (sscanf(lbuf, "%s%s%s%s", f1, f2, f3, f4) != 4 || | |
70 | + if (sscanf(lbuf, "%39s%39s%39s%39s", f1, f2, f3, f4) != 4 || | |
71 | strcasecmp(f1, "time")) | |
72 | break; | |
73 | c_day(f2, f3, f4); | |
74 | --- bsdgames-2.17.orig/gomoku/gomoku.6 | |
75 | +++ bsdgames-2.17/gomoku/gomoku.6 | |
76 | @@ -45,7 +45,7 @@ | |
77 | .Op Ar inputfile | |
78 | .Sh DESCRIPTION | |
79 | .Nm | |
80 | -is a two player game were the object is to get 5 in a row horizontally, | |
81 | +is a two player game where the object is to get 5 in a row horizontally, | |
82 | vertically or diagonally on a 19 by 19 grid. | |
83 | By convention, black always moves first. | |
84 | With no arguments, | |
85 | --- bsdgames-2.17.orig/hack/Makefrag | |
86 | +++ bsdgames-2.17/hack/Makefrag | |
87 | @@ -56,7 +56,8 @@ | |
88 | $(INSTALL_SCORE_GAME) hack/hack $(INSTALL_PREFIX)$(GAMESDIR)/hack | |
89 | $(HIDE_GAME) hack | |
90 | $(INSTALL_HACK_DIR) $(INSTALL_PREFIX)$(HACK_DIR) | |
91 | - set -e; for f in data help hh rumors; do $(INSTALL_DATA) hack/$$f $(INSTALL_PREFIX)$(HACK_DIR)/$$f; done | |
92 | + install -d $(INSTALL_PREFIX)/usr/share/games/bsdgames/hack | |
93 | + set -e; for f in data help hh rumors; do $(INSTALL_DATA) hack/$$f $(INSTALL_PREFIX)/usr/share/games/bsdgames/hack/$$f; done | |
94 | $(INSTALL_SCORE_FILE) $(HACK_DIR)/perm | |
95 | $(INSTALL_SCORE_FILE) $(HACK_DIR)/record | |
96 | $(INSTALL_MANUAL) hack/hack.6 | |
97 | --- bsdgames-2.17.orig/hack/config.h | |
98 | +++ bsdgames-2.17/hack/config.h | |
99 | @@ -88,13 +88,18 @@ | |
100 | /* #define PYRAMID_BUG */ /* avoid a bug on the Pyramid */ | |
101 | /* #define NOWAITINCLUDE */ /* neither <wait.h> nor <sys/wait.h> exists */ | |
102 | ||
103 | -#define WIZARD "bruno" /* the person allowed to use the -D option */ | |
104 | +/* | |
105 | + * Debian mods: use root for WIZARD, and move files that are static to | |
106 | + * /usr/share/ -- JEH | |
107 | + */ | |
108 | +#define WIZARD "root" /* the person allowed to use the -D option */ | |
109 | +#define SHAREDIR "/usr/share/games/bsdgames/hack/" | |
110 | #define RECORD "record"/* the file containing the list of topscorers */ | |
111 | #define NEWS "news" /* the file containing the latest hack news */ | |
112 | -#define HELP "help" /* the file containing a description of the commands */ | |
113 | -#define SHELP "hh" /* abbreviated form of the same */ | |
114 | -#define RUMORFILE "rumors" /* a file with fortune cookies */ | |
115 | -#define DATAFILE "data" /* a file giving the meaning of symbols used */ | |
116 | +#define HELP SHAREDIR "help" /* the file containing a description of the commands */ | |
117 | +#define SHELP SHAREDIR "hh" /* abbreviated form of the same */ | |
118 | +#define RUMORFILE SHAREDIR "rumors" /* a file with fortune cookies */ | |
119 | +#define DATAFILE SHAREDIR "data" /* a file giving the meaning of symbols used */ | |
120 | #define FMASK 0660 /* file creation mask */ | |
121 | #define HLOCK "perm" /* an empty file used for locking purposes */ | |
122 | #define LLOCK "safelock" /* link to previous */ | |
123 | --- bsdgames-2.17.orig/hunt/hunt/hunt.c | |
124 | +++ bsdgames-2.17/hunt/hunt/hunt.c | |
125 | @@ -394,7 +394,8 @@ | |
126 | ||
127 | vec_cnt = 0; | |
128 | for (ip = ifp; ip; ip = ip->ifa_next) | |
129 | - if ((ip->ifa_addr->sa_family == AF_INET) && | |
130 | + if (ip->ifa_addr && | |
131 | + (ip->ifa_addr->sa_family == AF_INET) && | |
132 | (ip->ifa_flags & IFF_BROADCAST)) | |
133 | vec_cnt++; | |
134 | ||
135 | @@ -405,7 +406,8 @@ | |
136 | ||
137 | vec_cnt = 0; | |
138 | for (ip = ifp; ip; ip = ip->ifa_next) | |
139 | - if ((ip->ifa_addr->sa_family == AF_INET) && | |
140 | + if (ip->ifa_addr && | |
141 | + (ip->ifa_addr->sa_family == AF_INET) && | |
142 | (ip->ifa_flags & IFF_BROADCAST)) | |
143 | memcpy(&(*vector)[vec_cnt++], ip->ifa_broadaddr, | |
144 | sizeof(struct sockaddr_in)); | |
145 | --- bsdgames-2.17.orig/sail/pl_main.c | |
146 | +++ bsdgames-2.17/sail/pl_main.c | |
147 | @@ -219,7 +219,7 @@ | |
148 | printf("\nInitial broadside %s (grape, chain, round, double): ", | |
149 | n ? "right" : "left"); | |
150 | fflush(stdout); | |
151 | - scanf("%s", buf); | |
152 | + scanf("%9s", buf); | |
153 | switch (*buf) { | |
154 | case 'g': | |
155 | load = L_GRAPE; |