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

Diff Legend

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