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.15 by pippijn, Mon Jan 15 21:06:20 2007 UTC vs.
Revision 1.31 by root, Wed Sep 2 22:52:36 2009 UTC

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

Diff Legend

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