1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
|
Description: A few typos corrected to remove lintian warnings.
Author: Chris Carr <rantingman@gmail.com>
Forwarded: not yet
diff -urN angband-3.5.1-orig/src/borg/borg1.c angband-3.5.1/src/borg/borg1.c
--- angband-3.5.1-orig/src/borg/borg1.c 2015-01-17 13:03:02.000000000 +0000
+++ angband-3.5.1/src/borg/borg1.c 2015-01-18 19:41:22.648518645 +0000
@@ -492,7 +492,7 @@
int morgy_panel_x;
int borg_target_y;
-int borg_target_x; /* Current targetted location */
+int borg_target_x; /* Current targeted location */
int c_x; /* Current location (X) */
int c_y; /* Current location (Y) */
diff -urN angband-3.5.1-orig/src/borg/borg1.h angband-3.5.1/src/borg/borg1.h
--- angband-3.5.1-orig/src/borg/borg1.h 2015-01-17 13:03:02.000000000 +0000
+++ angband-3.5.1/src/borg/borg1.h 2015-01-18 19:41:08.756517859 +0000
@@ -1032,7 +1032,7 @@
extern int morgy_panel_x;
extern int borg_target_y;
-extern int borg_target_x; /* Current targetted location */
+extern int borg_target_x; /* Current targeted location */
extern int c_x; /* Current location (X) */
extern int c_y; /* Current location (Y) */
diff -urN angband-3.5.1-orig/src/borg/borg6.c angband-3.5.1/src/borg/borg6.c
--- angband-3.5.1-orig/src/borg/borg6.c 2015-01-17 13:03:02.000000000 +0000
+++ angband-3.5.1/src/borg/borg6.c 2015-01-18 19:40:51.780516900 +0000
@@ -4972,7 +4972,7 @@
}
else
{
- borg_note(format("# Targetting location (%d,%d)", y, x));
+ borg_note(format("# Targeting location (%d,%d)", y, x));
}
/* Target mode */
@@ -5030,7 +5030,7 @@
monster_race *r_ptr;
borg_kill *kill;
- borg_note(format("# Perhaps wall near targetted location (%d,%d)", y, x));
+ borg_note(format("# Perhaps wall near targeted location (%d,%d)", y, x));
/* Determine "path" */
n_x = c_x;
@@ -6133,7 +6133,7 @@
/* Bounds Check */
if (!cave_in_bounds_fully(cave, y2, x2)) break;
- /* Get the grid of the targetted monster */
+ /* Get the grid of the targeted monster */
ag = &borg_grids[y2][x2];
kill = &borg_kills[ag->kill];
r_ptr = &r_info[kill->r_idx];
@@ -6173,7 +6173,7 @@
if (!rad && ag->kill) return (n);
/* The missile path can be complicated. There are several checks
- * which need to be made. First we assume that we targetting
+ * which need to be made. First we assume that we targeting
* a monster. That monster could be known from either sight or
* ESP. If the entire pathway from us to the monster is known,
* then there is no concern. But if the borg is shooting through
@@ -6540,7 +6540,7 @@
/* Skip useless attacks */
if (n <= 0) continue;
- /* The game forbids targetting the outside walls */
+ /* The game forbids targeting the outside walls */
if (x == 0 || y == 0 || x == DUNGEON_WID-1 || y == DUNGEON_HGT-1)
continue;
@@ -11302,7 +11302,7 @@
/* choose, then target a bad guy.
* Damage will be the danger to my grid which the monster creates.
- * We are targetting the single most dangerous monster.
+ * We are targeting the single most dangerous monster.
* p2 will be the original danger (p1) minus the danger from the most dangerous
* monster eliminated.
* ie: if we are fighting only a single monster who is generating 500 danger and we
diff -urN angband-3.5.1-orig/src/borg/borg9.c angband-3.5.1/src/borg/borg9.c
--- angband-3.5.1-orig/src/borg/borg9.c 2015-01-17 13:03:02.000000000 +0000
+++ angband-3.5.1/src/borg/borg9.c 2015-01-18 19:36:39.724502650 +0000
@@ -949,7 +949,7 @@
/* Flush our key-buffer */
borg_flush();
- /* If we were casting a targetted spell and failed */
+ /* If we were casting a targeted spell and failed */
/* it does not mean we can't target that location */
successful_target = 0;
@@ -5518,7 +5518,7 @@
Term_putstr(42, i, -1, TERM_WHITE, "Command 'a' displays avoidances.");
Term_putstr(2, i++, -1, TERM_WHITE, "Command 'k' displays monster info.");
Term_putstr(42, i, -1, TERM_WHITE, "Command 't' displays object info.");
- Term_putstr(2, i++, -1, TERM_WHITE, "Command '%' displays targetting flow.");
+ Term_putstr(2, i++, -1, TERM_WHITE, "Command '%' displays targeting flow.");
Term_putstr(42, i, -1, TERM_WHITE, "Command '#' displays danger grid.");
Term_putstr(2, i++, -1, TERM_WHITE, "Command '_' Regional Fear info.");
Term_putstr(42, i, -1, TERM_WHITE, "Command 'p' Borg Power.");
@@ -5796,7 +5796,7 @@
case 'f':
case 'F':
{
- msg("Command No Longer Usefull");
+ msg("Command No Longer Useful");
break;
}
}
@@ -5947,7 +5947,7 @@
break;
}
- /* Display Feature of a targetted grid */
+ /* Display Feature of a targeted grid */
case 'G':
{
int y = 1;
@@ -6034,7 +6034,7 @@
}
- /* Display Info of a targetted grid */
+ /* Display Info of a targeted grid */
case 'I':
{
int y = 1;
@@ -6219,7 +6219,7 @@
}
- msg("Borg's Targetting Path");
+ msg("Borg's Targeting Path");
message_flush();
/* Determine "path" */
@@ -6233,7 +6233,7 @@
- msg("Actual Targetting Path");
+ msg("Actual Targeting Path");
message_flush();
/* Redraw map */
diff -urN angband-3.5.1-orig/src/main.c angband-3.5.1/src/main.c
--- angband-3.5.1-orig/src/main.c 2015-01-17 13:03:02.000000000 +0000
+++ angband-3.5.1/src/main.c 2015-01-18 19:36:58.836503731 +0000
@@ -213,7 +213,7 @@
}
}
- quit_fmt("Unrecognised -d paramater %s", path);
+ quit_fmt("Unrecognised -d parameter %s", path);
}
diff -urN angband-3.5.1-orig/src/win/include/zlib.h angband-3.5.1/src/win/include/zlib.h
--- angband-3.5.1-orig/src/win/include/zlib.h 2015-01-17 13:03:03.000000000 +0000
+++ angband-3.5.1/src/win/include/zlib.h 2015-01-18 19:37:14.728504629 +0000
@@ -869,7 +869,7 @@
See inflateBack() for the usage of these routines.
inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
- the paramaters are invalid, Z_MEM_ERROR if the internal state could not
+ the parameters are invalid, Z_MEM_ERROR if the internal state could not
be allocated, or Z_VERSION_ERROR if the version of the library does not
match the version of the header file.
*/
|
