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

Diff Legend

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