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.9 by root, Sat Sep 16 22:24:13 2006 UTC vs.
Revision 1.34 by root, Sun Nov 15 19:13:01 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
82 72
83 /* Is this space blocked? Players with wizpass are immune to 73 /* Is this space blocked? Players with wizpass are immune to
84 * this condition. 74 * this condition.
85 */ 75 */
86 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])
87 return 0; 77 return 0;
88 78
79 // check tail movability
80 if (more && !more->move (dir, more->head))
81 return 0;
82
89 /* 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.
90 * 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
91 * breaking anything, but it might. 85 * breaking anything, but it might.
92 */ 86 */
93 if (op->more != NULL && !move_ob (op->more, dir, op->more->head))
94 return 0;
95
96 op->direction = dir; 87 direction = dir;
97 88
98 if (op->will_apply & 4) 89 if (will_apply & 4)
99 check_earthwalls (op, m, newx, newy); 90 check_earthwalls (this, pos.m, pos.x, pos.y);
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 remove_ob (op); 101 if (pos.m != map && contr)
127
128 /* we already have newx, newy, and m, so lets use them.
129 * In addition, this fixes potential crashes, because multipart object was
130 * on edge of map, +=x, +=y doesn't make correct coordinates.
131 */
132 for (tmp = op; tmp != NULL; tmp = tmp->more)
133 { 102 {
134 tmp->x += freearr_x[dir]; 103 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
135 tmp->y += freearr_y[dir]; 104 return 0;
136 tmp->map = get_map_from_coord (tmp->map, &tmp->x, &tmp->y); 105
106 remove ();
107
108 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (pos.m), ARG_INT (pos.x), ARG_INT (pos.y)))
109 return 0;
110
111 if (INVOKE_MAP (ENTER, pos.m, ARG_PLAYER (contr), ARG_INT (pos.x), ARG_INT (pos.y)))
112 return 0;
137 } 113 }
138 114
139 /* insert_ob_in_map will deal with any tiling issues */ 115 /* insert_ob_in_map will deal with any tiling issues */
140 insert_ob_in_map (op, m, originator, 0); 116 pos.insert (this, originator);
141 117
142 return 1; 118 return 1;
143} 119}
144
145 120
146/* 121/*
147 * transfer_ob(): Move an object (even linked objects) to another spot 122 * transfer_ob(): Move an object (even linked objects) to another spot
148 * on the same map. 123 * on the same map.
149 * 124 *
… …
167 i = find_first_free_spot (op, op->map, x, y); 142 i = find_first_free_spot (op, op->map, x, y);
168 143
169 if (i == -1) 144 if (i == -1)
170 return 0; /* No free spot */ 145 return 0; /* No free spot */
171 146
172 if (op->head != NULL)
173 op = op->head; 147 op = op->head_ ();
174 remove_ob (op); 148 op->remove ();
149
175 for (tmp = op; tmp != NULL; tmp = tmp->more) 150 for (object *tmp = op; tmp; tmp = tmp->more)
176 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x), 151 {
177 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 }
178 155
179 tmp = insert_ob_in_map (op, op->map, originator, 0); 156 op = insert_ob_in_map (op, op->map, originator, 0);
180 if (tmp) 157
181 return 0; 158 return !op;
182 else
183 return 1;
184} 159}
185 160
186/* 161/*
187 * Return value: 1 if object was destroyed, 0 otherwise. 162 * Return value: 1 if object was destroyed, 0 otherwise.
188 * Modified so that instead of passing the 'originator' that had no 163 * Modified so that instead of passing the 'originator' that had no
… …
196 * one of another type. 171 * one of another type.
197 */ 172 */
198int 173int
199teleport (object *teleporter, uint8 tele_type, object *user) 174teleport (object *teleporter, uint8 tele_type, object *user)
200{ 175{
201 object *altern; 176 if (!user)
202 int i, j, k, nrofalt = 0; 177 return 0;
178
203 object *other_teleporter, *tmp; 179 object *other_teleporter = 0;
204 maptile *m; 180 int nrofalt = 0;
205 sint16 sx, sy;
206 181
207 if (user == NULL)
208 return 0;
209 if (user->head != NULL)
210 user = user->head; 182 user = user->head_ ();
211 183
212 /* Find all other teleporters within range. This range 184 /* Find all other teleporters within range. This range
213 * should really be setable by some object attribute instead of 185 * should really be setable by some object attribute instead of
214 * using hard coded values. 186 * using hard coded values.
215 */ 187 */
216 for (i = -5; i < 6; i++) 188 unordered_mapwalk (teleporter, -5, -5, 5, 5)
217 for (j = -5; j < 6; j++)
218 { 189 {
219 if (i == 0 && j == 0) 190 mapspace &ms = m->at (nx, ny);
220 continue;
221 /* Perhaps this should be extended to support tiled maps */
222 if (OUT_OF_REAL_MAP (teleporter->map, teleporter->x + i, teleporter->y + j))
223 continue;
224 other_teleporter = get_map_ob (teleporter->map, teleporter->x + i, teleporter->y + j);
225 191
226 while (other_teleporter) 192 for (object *tmp = ms.top; tmp; tmp = tmp->below)
193 if (tmp->type == tele_type)
227 { 194 {
228 if (other_teleporter->type == tele_type) 195 if ((dx || dy) && !rndm (++nrofalt))
196 other_teleporter = tmp;
197
229 break; 198 break;
230 other_teleporter = other_teleporter->above;
231 } 199 }
232 if (other_teleporter && !(RANDOM () % ++nrofalt))
233 altern = other_teleporter;
234 } 200 }
235 201
236 if (!nrofalt) 202 if (!nrofalt)
237 { 203 {
238 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 ());
239 return 0; 206 return 0;
240 } 207 }
241 208
242 other_teleporter = altern;
243 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);
244 210
245 /* 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
246 * mat that the player is using, find someplace to move 212 * mat that the player is using, find someplace to move
247 * the player - otherwise, player can get trapped in the shops 213 * the player - otherwise, player can get trapped in the shops
248 * that appear in random dungeons. We basically just make 214 * that appear in random dungeons. We basically just make
249 * 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
250 * about is alive. 216 * about is alive.
251 */ 217 */
252 if (k == -1) 218 if (k == -1)
253 { 219 {
254 if (tele_type == SHOP_MAT && user->type == PLAYER) 220 if (tele_type == SHOP_MAT && user->is_player ())
255 { 221 {
256 for (k = 1; k < 9; k++) 222 for (k = 1; k < 9; k++)
257 { 223 {
224 maptile *m;
225 sint16 sx, sy;
226
258 if (get_map_flags (other_teleporter->map, &m, 227 if (get_map_flags (other_teleporter->map, &m,
259 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)
260 continue; 229 continue;
261 230
262 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)))
263 break; 232 break;
264
265 } 233 }
234
266 if (k == 9) 235 if (k == 9)
267 { 236 {
268 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",
269 &other_teleporter->name, other_teleporter->x, other_teleporter->y); 238 &other_teleporter->name, other_teleporter->x, other_teleporter->y);
270 return 0; 239 return 0;
… …
272 } 241 }
273 else 242 else
274 return 0; 243 return 0;
275 } 244 }
276 245
277 remove_ob (user); 246 return !other_teleporter->map->insert (
278 247 user, other_teleporter->x + freearr_x[k], other_teleporter->y + freearr_y[k]
279 /* Update location for the object */ 248 );
280 for (tmp = user; tmp != NULL; tmp = tmp->more)
281 {
282 tmp->x = other_teleporter->x + freearr_x[k] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x);
283 tmp->y = other_teleporter->y + freearr_y[k] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y);
284 }
285 tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0);
286 return (tmp == NULL);
287}
288
289void
290recursive_roll (object *op, int dir, object *pusher)
291{
292 if (!roll_ob (op, dir, pusher))
293 {
294 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You fail to push the %s.", query_name (op));
295 return;
296 }
297 (void) move_ob (pusher, dir, pusher);
298 new_draw_info_format (NDI_BLACK, 0, pusher, "You move the %s.", query_name (op));
299 return;
300} 249}
301 250
302/* 251/*
303 * This is a new version of blocked, this one handles objects 252 * This is a new version of blocked, this one handles objects
304 * 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.
305 * 254 *
306 * very new version handles also multipart objects 255 * very new version handles also multipart objects
307 * This is currently only used for the boulder roll code. 256 * This is currently only used for the boulder roll code.
308 * Returns 1 if object does not fit, 0 if it does. 257 * Returns 1 if object does not fit, 0 if it does.
309 */ 258 */
310 259static int
311int
312try_fit (object *op, maptile *m, int x, int y) 260try_fit (object *op, maptile *m, int x, int y)
313{ 261{
314 object *tmp, *more; 262 object *tmp, *more;
315 sint16 tx, ty; 263 sint16 tx, ty;
316 int mflags; 264 int mflags;
… …
327 mflags = get_map_flags (m, &m2, tx, ty, &tx, &ty); 275 mflags = get_map_flags (m, &m2, tx, ty, &tx, &ty);
328 276
329 if (mflags & P_OUT_OF_MAP) 277 if (mflags & P_OUT_OF_MAP)
330 return 1; 278 return 1;
331 279
332 for (tmp = get_map_ob (m2, tx, ty); tmp; tmp = tmp->above) 280 for (tmp = GET_MAP_OB (m2, tx, ty); tmp; tmp = tmp->above)
333 { 281 {
334 if (tmp->head == op || tmp == op) 282 if (tmp->head == op || tmp == op)
335 continue; 283 continue;
336 284
337 if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->type != DOOR)) 285 if ((QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->type != DOOR))
… …
348/* 296/*
349 * this is not perfect yet. 297 * this is not perfect yet.
350 * it does not roll objects behind multipart objects properly. 298 * it does not roll objects behind multipart objects properly.
351 * Support for rolling multipart objects is questionable. 299 * Support for rolling multipart objects is questionable.
352 */ 300 */
353 301static int
354int
355roll_ob (object *op, int dir, object *pusher) 302roll_ob (object *op, int dir, object *pusher)
356{ 303{
357 object *tmp;
358 sint16 x, y; 304 sint16 x, y;
359 int flags; 305 int flags;
360 maptile *m; 306 maptile *m;
361 MoveType move_block; 307 MoveType move_block;
362 308
… …
364 op = op->head; 310 op = op->head;
365 311
366 x = op->x + freearr_x[dir]; 312 x = op->x + freearr_x[dir];
367 y = op->y + freearr_y[dir]; 313 y = op->y + freearr_y[dir];
368 314
369 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))
370 return 0; 318 return 0;
371 319
372 m = op->map; 320 m = op->map;
373 flags = get_map_flags (m, &m, x, y, &x, &y); 321 flags = get_map_flags (m, &m, x, y, &x, &y);
374 322
… …
378 move_block = GET_MAP_MOVE_BLOCK (m, x, y); 326 move_block = GET_MAP_MOVE_BLOCK (m, x, y);
379 327
380 /* 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 */
381 if ((op->move_type & move_block) == op->move_type) 329 if ((op->move_type & move_block) == op->move_type)
382 { 330 {
383 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)
384 { 332 {
385 if (tmp->head == op) 333 if (tmp->head == op)
386 continue; 334 continue;
335
387 if (OB_MOVE_BLOCK (op, tmp) && !roll_ob (tmp, dir, pusher)) 336 if (OB_MOVE_BLOCK (op, tmp) && !roll_ob (tmp, dir, pusher))
388 return 0; 337 return 0;
389 } 338 }
390 } 339 }
340
391 if (try_fit (op, m, x, y)) 341 if (try_fit (op, m, x, y))
392 return 0; 342 return 0;
393 343
394 remove_ob (op); 344 op->move (dir);
395 for (tmp = op; tmp != NULL; tmp = tmp->more) 345
396 tmp->x += freearr_x[dir], tmp->y += freearr_y[dir];
397 insert_ob_in_map (op, op->map, pusher, 0);
398 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;
399} 361}
400 362
401/* returns 1 if pushing invokes a attack, 0 when not */ 363/* returns 1 if pushing invokes a attack, 0 when not */
402int 364int
403push_ob (object *who, int dir, object *pusher) 365push_ob (object *who, int dir, object *pusher)
… …
405 int str1, str2; 367 int str1, str2;
406 object *owner; 368 object *owner;
407 369
408 if (who->head != NULL) 370 if (who->head != NULL)
409 who = who->head; 371 who = who->head;
410 owner = get_owner (who); 372 owner = who->owner;
411 373
412 /* Wake up sleeping monsters that may be pushed */ 374 /* Wake up sleeping monsters that may be pushed */
413 CLEAR_FLAG (who, FLAG_SLEEP); 375 CLEAR_FLAG (who, FLAG_SLEEP);
414 376
415 /* player change place with his pets or summoned creature */ 377 /* player change place with his pets or summoned creature */
416 /* TODO: allow multi arch pushing. Can't be very difficult */ 378 /* TODO: allow multi arch pushing. Can't be very difficult */
417 if (who->more == NULL 379 if (who->more == NULL
418#ifdef COZY_SERVER
419 && ((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))
420#else
421 && owner == pusher 381 || owner == pusher)
422#endif
423 ) 382 )
424 { 383 {
425 int temp; 384 int temp;
426 maptile *m; 385 maptile *m;
427 386
428 remove_ob (who); 387 who->remove ();
429 remove_ob (pusher); 388 pusher->remove ();
430 temp = pusher->x; 389 temp = pusher->x;
431 pusher->x = who->x; 390 pusher->x = who->x;
432 who->x = temp; 391 who->x = temp;
433 392
434 temp = pusher->y; 393 temp = pusher->y;
… …
439 pusher->map = who->map; 398 pusher->map = who->map;
440 who->map = m; 399 who->map = m;
441 400
442 insert_ob_in_map (who, who->map, pusher, 0); 401 insert_ob_in_map (who, who->map, pusher, 0);
443 insert_ob_in_map (pusher, pusher->map, pusher, 0); 402 insert_ob_in_map (pusher, pusher->map, pusher, 0);
403
444 return 0; 404 return 0;
445 } 405 }
446
447 406
448 /* 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 */
449 /* 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 */
450 /* we so often become an enemy of friendly monsters... */ 409 /* we so often become an enemy of friendly monsters... */
451 /* 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 */
452
453 if (owner != pusher && pusher->type == PLAYER && who->type != PLAYER && 411 if (owner != pusher && pusher->type == PLAYER && who->type != PLAYER &&
454 !QUERY_FLAG (who, FLAG_FRIENDLY) && !QUERY_FLAG (who, FLAG_NEUTRAL)) 412 !QUERY_FLAG (who, FLAG_FRIENDLY) && !QUERY_FLAG (who, FLAG_NEUTRAL))
455 { 413 {
456 if (pusher->contr->run_on) /* only when we run */ 414 if (pusher->contr->run_on) /* only when we run */
457 { 415 {
458 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);
459 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 */
460 who->enemy = pusher; 418 who->enemy = pusher;
461 return 1; 419 return 1;
462 } 420 }
463 else 421 else
464 { 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);
465 new_draw_info_format (NDI_UNIQUE, 0, pusher, "You avoid attacking %s.", &who->name);
466 }
467 } 423 }
468 424
469 /* 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. */
470 if (QUERY_FLAG (who, FLAG_STAND_STILL)) 426 if (QUERY_FLAG (who, FLAG_STAND_STILL))
471 { 427 {
472 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);
473 return 0; 429 return 0;
474 } 430 }
475 431
476 /* This block is basically if you are pushing friendly but 432 /* This block is basically if you are pushing friendly but
477 * non pet creaturs. 433 * non pet creaturs.
… …
481 */ 437 */
482 438
483 str1 = (who->stats.Str > 0 ? who->stats.Str : who->level); 439 str1 = (who->stats.Str > 0 ? who->stats.Str : who->level);
484 str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level); 440 str2 = (pusher->stats.Str > 0 ? pusher->stats.Str : pusher->level);
485 if (QUERY_FLAG (who, FLAG_WIZ) || 441 if (QUERY_FLAG (who, FLAG_WIZ) ||
486 random_roll (str1, str1 / 2 + str1 * 2, who, PREFER_HIGH) >= 442 random_roll (str1, str1 * 5 / 2, who, PREFER_HIGH) >=
487 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))
488 { 444 {
489 if (who->type == PLAYER) 445 if (who->type == PLAYER)
490 {
491 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);
492 } 447
493 return 0; 448 return 0;
494 } 449 }
495 450
496 /* If we get here, the push succeeded. 451 /* If we get here, the push succeeded.
497 * Let everyone know the status. 452 * Let everyone know the status.

Diff Legend

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