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.2 by root, Thu Aug 17 20:23:31 2006 UTC vs.
Revision 1.37 by root, Fri Mar 26 00:53:26 2010 UTC

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

Diff Legend

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