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

Diff Legend

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