ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/move.C
(Generate patch)

Comparing deliantra/server/server/move.C (file contents):
Revision 1.24 by root, Tue May 6 16:55:26 2008 UTC vs.
Revision 1.44 by root, Tue Jan 3 11:25:36 2012 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#ifndef __CEXTRACT__ 26#ifndef __CEXTRACT__
26# include <sproto.h> 27# include <sproto.h>
27#endif 28#endif
28 29
29/*
30 * move_object() tries to move object op in the direction "dir".
31 * If it fails (something blocks the passage), it returns 0,
32 * otherwise 1.
33 * This is an improvement from the previous move_ob(), which
34 * removed and inserted objects even if they were unable to move.
35 */
36
37int 30int
38move_object (object *op, int dir)
39{
40 return move_ob (op, dir, op);
41}
42
43/* object op is trying to move in direction dir.
44 * originator is typically the same as op, but
45 * can be different if originator is causing op to
46 * move (originator is pushing op)
47 * returns 0 if the object is not able to move to the
48 * desired space, 1 otherwise (in which case we also
49 * move the object accordingly. This function is
50 * very similiar to move_object.
51 */
52int
53move_ob (object *op, int dir, object *originator) 31object::move (int dir, object *originator)
54{ 32{
55 sint16 newx = op->x + freearr_x[dir]; 33 sint16 newx = x + freearr_x[dir];
56 sint16 newy = op->y + freearr_y[dir]; 34 sint16 newy = y + freearr_y[dir];
57 object *tmp;
58 maptile *m;
59 int mflags;
60 35
61 if (op == NULL) 36 mapxy pos (this);
62 { 37 pos.move (dir);
63 LOG (llevError, "Trying to move NULL.\n");
64 return 0;
65 }
66 38
67 m = op->map;
68 mflags = get_map_flags (m, &m, newx, newy, &newx, &newy);
69
70 /* If the space the player is trying to is out of the map, 39 /* If the space the object is moving to is out of the map,
71 * bail now - we know it can't work. 40 * bail now - we know it can't work.
72 */ 41 */
73 if (mflags & P_OUT_OF_MAP) 42 if (!pos.normalise ())
74 return 0; 43 return 0;
75 44
76 /* Is this space blocked? Players with wizpass are immune to 45 /* Is this space blocked? Players with wizpass are immune to
77 * this condition. 46 * this condition.
78 */ 47 */
79 if (blocked_link (op, m, newx, newy) && !QUERY_FLAG (op, FLAG_WIZPASS)) 48 if (blocked_link (this, pos.m, pos.x, pos.y) && !flag [FLAG_WIZPASS])
80 return 0; 49 return 0;
81 50
51 // check tail movability
52 if (more && !more->move (dir, more->head))
53 return 0;
54
82 /* 0.94.2 - we need to set the direction for the new animation code. 55 /* we need to set the direction for the new animation code.
83 * it uses it to figure out face to use - I can't see it 56 * it uses it to figure out face to use - I can't see it
84 * breaking anything, but it might. 57 * breaking anything, but it might.
85 */ 58 */
86 if (op->more && !move_ob (op->more, dir, op->more->head))
87 return 0;
88
89 op->direction = dir; 59 direction = dir;
90 60
91 if (op->will_apply & 4) 61 if (will_apply & 4)
92 check_earthwalls (op, m, newx, newy); 62 check_earthwalls (this, pos.m, pos.x, pos.y);
93 63
94 if (op->will_apply & 8) 64 if (will_apply & 8)
95 check_doors (op, m, newx, newy); 65 check_doors (this, pos.m, pos.x, pos.y);
96
97 /* 0.94.1 - I got a stack trace that showed it crash with remove_ob trying
98 * to remove a removed object, and this function was the culprit. A possible
99 * guess I have is that check_doors above ran into a trap, killing the
100 * monster.
101 *
102 * Unfortunately, it doesn't appear that the calling functions of move_object
103 * deal very well with op being killed, so all this might do is just
104 * migrate the problem someplace else.
105 */
106
107 if (QUERY_FLAG (op, FLAG_REMOVED))
108 {
109 LOG (llevDebug, "move_object: monster has been removed - will not process further\n");
110 /* Was not successful, but don't want to try and move again */
111 return 1;
112 }
113 66
114 /* If this is a tail portion, just want to tell caller that move is 67 /* If this is a tail portion, just want to tell caller that move is
115 * ok - the caller will deal with actual object removal/insertion 68 * ok - the caller will deal with actual object removal/insertion
116 */ 69 */
117 if (op->head) 70 if (head)
118 return 1; 71 return 1;
119 72
120 if (m != op->map && op->contr) 73 if (pos.m != map && contr)
121 { 74 {
122 if (INVOKE_MAP (LEAVE, op->map, ARG_PLAYER (op->contr))) 75 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
123 return 0; 76 return 0;
124 77
125 op->remove (); 78 remove ();
126 79
80 pos.m->activate ();
81
127 if (INVOKE_PLAYER (MAP_CHANGE, op->contr, ARG_MAP (m), ARG_INT (newx), ARG_INT (newy))) 82 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (pos.m), ARG_INT (pos.x), ARG_INT (pos.y)))
128 return 0; 83 return 0;
129 84
130 if (INVOKE_MAP (ENTER, m, ARG_PLAYER (op->contr), ARG_INT (newx), ARG_INT (newy))) 85 if (INVOKE_MAP (ENTER, pos.m, ARG_PLAYER (contr), ARG_INT (pos.x), ARG_INT (pos.y)))
131 return 0; 86 return 0;
132 } 87 }
133 else
134 op->remove ();
135
136 /* we already have newx, newy, and m, so lets use them.
137 * In addition, this fixes potential crashes, because multipart object was
138 * on edge of map, +=x, +=y doesn't make correct coordinates.
139 */
140 for (tmp = op; tmp != NULL; tmp = tmp->more)
141 {
142 tmp->x += freearr_x[dir];
143 tmp->y += freearr_y[dir];
144 tmp->map = get_map_from_coord (tmp->map, &tmp->x, &tmp->y);
145 }
146 88
147 /* insert_ob_in_map will deal with any tiling issues */ 89 /* insert_ob_in_map will deal with any tiling issues */
148 insert_ob_in_map (op, m, originator, 0); 90 pos.insert (this, originator);
149 91
150 return 1; 92 return 1;
151} 93}
152
153 94
154/* 95/*
155 * transfer_ob(): Move an object (even linked objects) to another spot 96 * transfer_ob(): Move an object (even linked objects) to another spot
156 * on the same map. 97 * on the same map.
157 * 98 *
… …
175 i = find_first_free_spot (op, op->map, x, y); 116 i = find_first_free_spot (op, op->map, x, y);
176 117
177 if (i == -1) 118 if (i == -1)
178 return 0; /* No free spot */ 119 return 0; /* No free spot */
179 120
180 if (op->head != NULL)
181 op = op->head; 121 op = op->head_ ();
182 op->remove (); 122 op->remove ();
123
183 for (tmp = op; tmp != NULL; tmp = tmp->more) 124 for (object *tmp = op; tmp; tmp = tmp->more)
184 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->x), 125 {
126 tmp->x = x + freearr_x[i] + tmp->arch->x;
185 tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->y); 127 tmp->y = y + freearr_y[i] + tmp->arch->y;
128 }
186 129
187 tmp = insert_ob_in_map (op, op->map, originator, 0); 130 op = insert_ob_in_map (op, op->map, originator, 0);
188 if (tmp) 131
189 return 0; 132 return !op;
190 else
191 return 1;
192} 133}
193 134
194/* 135/*
195 * Return value: 1 if object was destroyed, 0 otherwise. 136 * Return value: 1 if object was destroyed, 0 otherwise.
196 * Modified so that instead of passing the 'originator' that had no 137 * Modified so that instead of passing the 'originator' that had no
… …
204 * one of another type. 145 * one of another type.
205 */ 146 */
206int 147int
207teleport (object *teleporter, uint8 tele_type, object *user) 148teleport (object *teleporter, uint8 tele_type, object *user)
208{ 149{
209 object *altern; 150 if (!user)
210 int i, j, k, nrofalt = 0; 151 return 0;
152
211 object *other_teleporter, *tmp; 153 object *other_teleporter = 0;
212 maptile *m; 154 int nrofalt = 0;
213 sint16 sx, sy;
214 155
215 if (user == NULL)
216 return 0;
217 if (user->head != NULL)
218 user = user->head; 156 user = user->head_ ();
219 157
220 /* Find all other teleporters within range. This range 158 /* Find all other teleporters within range. This range
221 * should really be setable by some object attribute instead of 159 * should really be setable by some object attribute instead of
222 * using hard coded values. 160 * using hard coded values.
223 */ 161 */
224 for (i = -5; i < 6; i++) 162 unordered_mapwalk (mapwalk_buf, teleporter, -5, -5, 5, 5)
225 for (j = -5; j < 6; j++)
226 { 163 {
227 if (i == 0 && j == 0) 164 mapspace &ms = m->at (nx, ny);
228 continue;
229 /* Perhaps this should be extended to support tiled maps */
230 if (OUT_OF_REAL_MAP (teleporter->map, teleporter->x + i, teleporter->y + j))
231 continue;
232 other_teleporter = GET_MAP_OB (teleporter->map, teleporter->x + i, teleporter->y + j);
233 165
234 while (other_teleporter) 166 for (object *tmp = ms.top; tmp; tmp = tmp->below)
167 if (tmp->type == tele_type)
235 { 168 {
236 if (other_teleporter->type == tele_type) 169 if ((dx || dy) && !rndm (++nrofalt))
170 other_teleporter = tmp;
171
237 break; 172 break;
238 other_teleporter = other_teleporter->above;
239 } 173 }
240 if (other_teleporter && !(RANDOM () % ++nrofalt))
241 altern = other_teleporter;
242 } 174 }
243 175
244 if (!nrofalt) 176 if (!nrofalt)
245 { 177 {
246 LOG (llevError, "%s: no alternative teleporters around (user %s).\n", 178 LOG (llevError, "%s: no alternative teleporters around (user %s).\n",
247 teleporter->debug_desc (), user->debug_desc ()); 179 teleporter->debug_desc (), user->debug_desc ());
248 return 0; 180 return 0;
249 } 181 }
250 182
251 other_teleporter = altern;
252 k = find_free_spot (user, other_teleporter->map, other_teleporter->x, other_teleporter->y, 1, 9); 183 int k = find_free_spot (user, other_teleporter->map, other_teleporter->x, other_teleporter->y, 1, SIZEOFFREE1 + 1);
253 184
254 /* if k==-1, unable to find a free spot. If this is shop 185 /* if k==-1, unable to find a free spot. If this is shop
255 * mat that the player is using, find someplace to move 186 * mat that the player is using, find someplace to move
256 * the player - otherwise, player can get trapped in the shops 187 * the player - otherwise, player can get trapped in the shops
257 * that appear in random dungeons. We basically just make 188 * that appear in random dungeons. We basically just make
258 * sure the space isn't no pass (eg wall), and don't care 189 * sure the space isn't no pass (eg wall), and don't care
259 * about is alive. 190 * about is alive.
260 */ 191 */
261 if (k == -1) 192 if (k == -1)
262 { 193 {
263 if (tele_type == SHOP_MAT && user->type == PLAYER) 194 if (tele_type == SHOP_MAT && user->is_player ())
264 { 195 {
265 for (k = 1; k < 9; k++) 196 for (k = 1; k < 9; k++)
266 { 197 {
198 maptile *m;
199 sint16 sx, sy;
200
267 if (get_map_flags (other_teleporter->map, &m, 201 if (get_map_flags (other_teleporter->map, &m,
268 other_teleporter->x + freearr_x[k], other_teleporter->y + freearr_y[k], &sx, &sy) & P_OUT_OF_MAP) 202 other_teleporter->x + freearr_x[k], other_teleporter->y + freearr_y[k], &sx, &sy) & P_OUT_OF_MAP)
269 continue; 203 continue;
270 204
271 if (!OB_TYPE_MOVE_BLOCK (user, GET_MAP_MOVE_BLOCK (m, sx, sy))) 205 if (!OB_TYPE_MOVE_BLOCK (user, GET_MAP_MOVE_BLOCK (m, sx, sy)))
272 break; 206 break;
273
274 } 207 }
208
275 if (k == 9) 209 if (k == 9)
276 { 210 {
277 LOG (llevError, "Shop mat %s (%d, %d) is in solid rock?\n", 211 LOG (llevError, "Shop mat %s (%d, %d) is in solid rock?\n",
278 &other_teleporter->name, other_teleporter->x, other_teleporter->y); 212 &other_teleporter->name, other_teleporter->x, other_teleporter->y);
279 return 0; 213 return 0;
… …
281 } 215 }
282 else 216 else
283 return 0; 217 return 0;
284 } 218 }
285 219
286 user->remove (); 220 return !other_teleporter->map->insert (
287 221 user, other_teleporter->x + freearr_x[k], other_teleporter->y + freearr_y[k]
288 /* Update location for the object */ 222 );
289 for (tmp = user; tmp != NULL; tmp = tmp->more)
290 {
291 tmp->x = other_teleporter->x + freearr_x[k] + (tmp->arch == NULL ? 0 : tmp->arch->x);
292 tmp->y = other_teleporter->y + freearr_y[k] + (tmp->arch == NULL ? 0 : tmp->arch->y);
293 }
294 tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0);
295 return (tmp == NULL);
296}
297
298void
299recursive_roll (object *op, int dir, object *pusher)
300{
301 if (!roll_ob (op, dir, pusher))
302 {
303 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You fail to push the %s.", query_name (op));
304 return;
305 }
306 (void) move_ob (pusher, dir, pusher);
307 new_draw_info_format (NDI_BLACK, 0, pusher, "You move the %s.", query_name (op));
308 return;
309} 223}
310 224
311/* 225/*
312 * This is a new version of blocked, this one handles objects 226 * This is a new version of blocked, this one handles objects
313 * that can be passed through by monsters with the CAN_PASS_THRU defined. 227 * that can be passed through by monsters with the CAN_PASS_THRU defined.
314 * 228 *
315 * very new version handles also multipart objects 229 * very new version handles also multipart objects
316 * This is currently only used for the boulder roll code. 230 * This is currently only used for the boulder roll code.
317 * Returns 1 if object does not fit, 0 if it does. 231 * Returns 1 if object does not fit, 0 if it does.
318 */ 232 */
319 233static int
320int
321try_fit (object *op, maptile *m, int x, int y) 234try_fit (object *op, maptile *m, int x, int y)
322{ 235{
323 object *tmp, *more; 236 object *tmp, *more;
324 sint16 tx, ty; 237 sint16 tx, ty;
325 int mflags; 238 int mflags;
… …
341 for (tmp = GET_MAP_OB (m2, tx, ty); tmp; tmp = tmp->above) 254 for (tmp = GET_MAP_OB (m2, tx, ty); tmp; tmp = tmp->above)
342 { 255 {
343 if (tmp->head == op || tmp == op) 256 if (tmp->head == op || tmp == op)
344 continue; 257 continue;
345 258
346 if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->type != DOOR)) 259 if ((tmp->flag [FLAG_ALIVE] && tmp->type != DOOR))
347 return 1; 260 return 1;
348 261
349 if (OB_MOVE_BLOCK (op, tmp)) 262 if (OB_MOVE_BLOCK (op, tmp))
350 return 1; 263 return 1;
351 264
… …
357/* 270/*
358 * this is not perfect yet. 271 * this is not perfect yet.
359 * it does not roll objects behind multipart objects properly. 272 * it does not roll objects behind multipart objects properly.
360 * Support for rolling multipart objects is questionable. 273 * Support for rolling multipart objects is questionable.
361 */ 274 */
362 275static int
363int
364roll_ob (object *op, int dir, object *pusher) 276roll_ob (object *op, int dir, object *pusher)
365{ 277{
366 object *tmp;
367 sint16 x, y; 278 sint16 x, y;
368 int flags; 279 int flags;
369 maptile *m; 280 maptile *m;
370 MoveType move_block; 281 MoveType move_block;
371 282
… …
373 op = op->head; 284 op = op->head;
374 285
375 x = op->x + freearr_x[dir]; 286 x = op->x + freearr_x[dir];
376 y = op->y + freearr_y[dir]; 287 y = op->y + freearr_y[dir];
377 288
378 if (!QUERY_FLAG (op, FLAG_CAN_ROLL) || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW) > pusher->stats.Str)) 289 if (!op->flag [FLAG_CAN_ROLL]
290 || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW)
291 > pusher->stats.Str))
379 return 0; 292 return 0;
380 293
381 m = op->map; 294 m = op->map;
382 flags = get_map_flags (m, &m, x, y, &x, &y); 295 flags = get_map_flags (m, &m, x, y, &x, &y);
383 296
… …
387 move_block = GET_MAP_MOVE_BLOCK (m, x, y); 300 move_block = GET_MAP_MOVE_BLOCK (m, x, y);
388 301
389 /* If the target space is not blocked, no need to look at the objects on it */ 302 /* If the target space is not blocked, no need to look at the objects on it */
390 if ((op->move_type & move_block) == op->move_type) 303 if ((op->move_type & move_block) == op->move_type)
391 { 304 {
392 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 305 for (object *tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
393 { 306 {
394 if (tmp->head == op) 307 if (tmp->head == op)
395 continue; 308 continue;
309
396 if (OB_MOVE_BLOCK (op, tmp) && !roll_ob (tmp, dir, pusher)) 310 if (OB_MOVE_BLOCK (op, tmp) && !roll_ob (tmp, dir, pusher))
397 return 0; 311 return 0;
398 } 312 }
399 } 313 }
314
400 if (try_fit (op, m, x, y)) 315 if (try_fit (op, m, x, y))
401 return 0; 316 return 0;
402 317
403 op->remove (); 318 op->move (dir);
404 for (tmp = op; tmp != NULL; tmp = tmp->more) 319
405 tmp->x += freearr_x[dir], tmp->y += freearr_y[dir];
406 insert_ob_in_map (op, op->map, pusher, 0);
407 return 1; 320 return 1;
321}
322
323void
324recursive_roll (object *op, int dir, object *pusher)
325{
326 if (!roll_ob (op, dir, pusher))
327 {
328 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You fail to push the %s.", query_name (op));
329 return;
330 }
331
332 pusher->move (dir);
333 new_draw_info_format (NDI_BLACK, 0, pusher, "You move the %s.", query_name (op));
334 return;
408} 335}
409 336
410/* returns 1 if pushing invokes a attack, 0 when not */ 337/* returns 1 if pushing invokes a attack, 0 when not */
411int 338int
412push_ob (object *who, int dir, object *pusher) 339push_ob (object *who, int dir, object *pusher)
… …
417 if (who->head != NULL) 344 if (who->head != NULL)
418 who = who->head; 345 who = who->head;
419 owner = who->owner; 346 owner = who->owner;
420 347
421 /* Wake up sleeping monsters that may be pushed */ 348 /* Wake up sleeping monsters that may be pushed */
422 CLEAR_FLAG (who, FLAG_SLEEP); 349 who->clr_flag (FLAG_SLEEP);
423 350
424 /* player change place with his pets or summoned creature */ 351 /* player change place with his pets or summoned creature */
425 /* TODO: allow multi arch pushing. Can't be very difficult */ 352 /* TODO: allow multi arch pushing. Can't be very difficult */
426 if (who->more == NULL 353 if (who->more == NULL
427 && ((owner && owner->contr && pusher->contr && same_party (owner->contr->party, pusher->contr->party)) 354 && ((owner && owner->contr && pusher->contr && same_party (owner->contr->party, pusher->contr->party))
… …
445 pusher->map = who->map; 372 pusher->map = who->map;
446 who->map = m; 373 who->map = m;
447 374
448 insert_ob_in_map (who, who->map, pusher, 0); 375 insert_ob_in_map (who, who->map, pusher, 0);
449 insert_ob_in_map (pusher, pusher->map, pusher, 0); 376 insert_ob_in_map (pusher, pusher->map, pusher, 0);
377
450 return 0; 378 return 0;
451 } 379 }
452 380
453 /* We want ONLY become enemy of evil, unaggressive monster. We must RUN in them */ 381 /* We want ONLY become enemy of evil, unaggressive monster. We must RUN in them */
454 /* In original we have here a unaggressive check only - that was the reason why */ 382 /* In original we have here a unaggressive check only - that was the reason why */
455 /* we so often become an enemy of friendly monsters... */ 383 /* we so often become an enemy of friendly monsters... */
456 /* funny: was they set to unaggressive 0 (= not so nice) they don't attack */ 384 /* funny: was they set to unaggressive 0 (= not so nice) they don't attack */
457 if (owner != pusher && pusher->type == PLAYER && who->type != PLAYER && 385 if (owner != pusher && pusher->type == PLAYER && who->type != PLAYER &&
458 !QUERY_FLAG (who, FLAG_FRIENDLY) && !QUERY_FLAG (who, FLAG_NEUTRAL)) 386 !who->flag [FLAG_FRIENDLY] && !who->flag [FLAG_NEUTRAL])
459 { 387 {
460 if (pusher->contr->run_on) /* only when we run */ 388 if (pusher->contr->run_on) /* only when we run */
461 { 389 {
462 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You start to attack %s!!", &who->name); 390 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You start to attack %s!!", &who->name);
463 CLEAR_FLAG (who, FLAG_UNAGGRESSIVE); /* the sucker don't like you anymore */ 391 who->clr_flag (FLAG_UNAGGRESSIVE); /* the sucker don't like you anymore */
464 who->enemy = pusher; 392 who->enemy = pusher;
465 return 1; 393 return 1;
466 } 394 }
467 else 395 else
468 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You avoid attacking %s.", &who->name); 396 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You avoid attacking %s. H<You have to run if you wish to attack unnagressive NPCs.>", &who->name);
469 } 397 }
470 398
471 /* now, lets test stand still. we NEVER can push stand_still monsters. */ 399 /* now, let's test stand still. we NEVER can push stand_still monsters. */
472 if (QUERY_FLAG (who, FLAG_STAND_STILL)) 400 if (who->flag [FLAG_STAND_STILL])
473 { 401 {
474 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You can't push %s.", &who->name); 402 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You can't push %s. H<You simply can't.>", &who->name);
475 return 0; 403 return 0;
476 } 404 }
477 405
478 /* This block is basically if you are pushing friendly but 406 /* This block is basically if you are pushing friendly but
479 * non pet creaturs. 407 * non pet creaturs.
… …
482 * this pushes the other person away - its not a swap. 410 * this pushes the other person away - its not a swap.
483 */ 411 */
484 412
485 str1 = (who->stats.Str > 0 ? who->stats.Str : who->level); 413 str1 = (who->stats.Str > 0 ? who->stats.Str : who->level);
486 str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level); 414 str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level);
487 if (QUERY_FLAG (who, FLAG_WIZ) || 415 if (who->flag [FLAG_WIZ] ||
488 random_roll (str1, str1 * 5 / 2, who, PREFER_HIGH) >= 416 random_roll (str1, str1 * 5 / 2, who, PREFER_HIGH) >=
489 random_roll (str2, str2 * 5 / 2, pusher, PREFER_HIGH) || !move_object (who, dir)) 417 random_roll (str2, str2 * 5 / 2, pusher, PREFER_HIGH) || !who->move (dir))
490 { 418 {
491 if (who->type == PLAYER) 419 if (who->type == PLAYER)
492 new_draw_info_format (NDI_UNIQUE, 0, who, "%s tried to push you.", &pusher->name); 420 new_draw_info_format (NDI_UNIQUE, 0, who, "%s tried to push you.", &pusher->name);
493 421
494 return 0; 422 return 0;
… …
496 424
497 /* If we get here, the push succeeded. 425 /* If we get here, the push succeeded.
498 * Let everyone know the status. 426 * Let everyone know the status.
499 */ 427 */
500 if (who->type == PLAYER) 428 if (who->type == PLAYER)
501 {
502 new_draw_info_format (NDI_UNIQUE, 0, who, "%s pushed you.", &pusher->name); 429 new_draw_info_format (NDI_UNIQUE, 0, who, "%s pushed you.", &pusher->name);
503 } 430
504 if (pusher->type == PLAYER) 431 if (pusher->type == PLAYER)
505 {
506 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You pushed %s back.", &who->name); 432 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You pushed %s back.", &who->name);
507 }
508 433
509 return 1; 434 return 1;
510} 435}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines