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.28 by root, Sat Dec 27 02:31:19 2008 UTC vs.
Revision 1.46 by root, Mon Oct 29 23:55:55 2012 UTC

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

Diff Legend

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