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

Diff Legend

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