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

Diff Legend

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