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.7 by root, Sun Sep 10 15:59:57 2006 UTC vs.
Revision 1.31 by root, Wed Sep 2 22:52:36 2009 UTC

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

Diff Legend

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