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

Diff Legend

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