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.29 by root, Sun Dec 28 06:59:27 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#ifndef __CEXTRACT__ 25#ifndef __CEXTRACT__
27# include <sproto.h> 26# include <sproto.h>
28#endif
29
30#ifdef COZY_SERVER
31// use a ptotoype
32extern int same_party (partylist *a, partylist *b);
33#endif 27#endif
34 28
35/* 29/*
36 * move_object() tries to move object op in the direction "dir". 30 * move_object() tries to move object op in the direction "dir".
37 * If it fails (something blocks the passage), it returns 0, 31 * If it fails (something blocks the passage), it returns 0,
41 */ 35 */
42 36
43int 37int
44move_object (object *op, int dir) 38move_object (object *op, int dir)
45{ 39{
46 return move_ob (op, dir, op); 40 return op->move (dir);
47} 41}
48
49 42
50/* object op is trying to move in direction dir. 43/* object op is trying to move in direction dir.
51 * originator is typically the same as op, but 44 * originator is typically the same as op, but
52 * can be different if originator is causing op to 45 * can be different if originator is causing op to
53 * move (originator is pushing op) 46 * move (originator is pushing op)
57 * very similiar to move_object. 50 * very similiar to move_object.
58 */ 51 */
59int 52int
60move_ob (object *op, int dir, object *originator) 53move_ob (object *op, int dir, object *originator)
61{ 54{
55 return op->move (dir, originator);
56}
57
58int
59object::move (int dir, object *originator)
60{
62 sint16 newx = op->x + freearr_x[dir]; 61 sint16 newx = x + freearr_x[dir];
63 sint16 newy = op->y + freearr_y[dir]; 62 sint16 newy = y + freearr_y[dir];
64 object *tmp; 63 object *tmp;
65 maptile *m; 64 maptile *m;
66 int mflags; 65 int mflags;
67 66
68 if (op == NULL)
69 {
70 LOG (llevError, "Trying to move NULL.\n");
71 return 0;
72 }
73
74 m = op->map; 67 m = 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 */
81 return 0; 74 return 0;
82 75
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) && !QUERY_FLAG (op, FLAG_WIZPASS)) 79 if (blocked_link (this, m, newx, newy) && !flag [FLAG_WIZPASS])
87 return 0; 80 return 0;
88 81
89 /* 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.
90 * 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
91 * breaking anything, but it might. 84 * breaking anything, but it might.
92 */ 85 */
93 if (op->more && !move_ob (op->more, dir, op->more->head)) 86 if (more && !more->move (dir, more->head))
94 return 0; 87 return 0;
95 88
96 op->direction = dir; 89 direction = dir;
97 90
98 if (op->will_apply & 4) 91 if (will_apply & 4)
99 check_earthwalls (op, m, newx, newy); 92 check_earthwalls (this, m, newx, newy);
100 93
101 if (op->will_apply & 8) 94 if (will_apply & 8)
102 check_doors (op, m, newx, newy); 95 check_doors (this, 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 if (flag [FLAG_REMOVED])//D remove or fix?
114 if (QUERY_FLAG (op, FLAG_REMOVED))
115 { 107 {
116 LOG (llevDebug, "move_object: monster has been removed - will not process further\n"); 108 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 */ 109 /* Was not successful, but don't want to try and move again */
118 return 1; 110 return 1;
119 } 111 }
120 112
121 /* If this is a tail portion, just want to tell caller that move is 113 /* 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 114 * ok - the caller will deal with actual object removal/insertion
123 */ 115 */
124 if (op->head) 116 if (head)
125 return 1; 117 return 1;
126 118
127 if (m != op->map && op->contr) 119 if (m != map && contr)
128 { 120 {
129 if (INVOKE_MAP (LEAVE, op->map, ARG_PLAYER (op->contr))) 121 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
130 return 0; 122 return 0;
131 123
132 op->remove (); 124 remove ();
133 125
134 if (INVOKE_PLAYER (MAP_CHANGE, op->contr, ARG_MAP (m), ARG_INT (newx), ARG_INT (newy))) 126 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (m), ARG_INT (newx), ARG_INT (newy)))
135 return 0; 127 return 0;
136 128
137 if (INVOKE_MAP (ENTER, m, ARG_PLAYER (op->contr), ARG_INT (newx), ARG_INT (newy))) 129 if (INVOKE_MAP (ENTER, m, ARG_PLAYER (contr), ARG_INT (newx), ARG_INT (newy)))
138 return 0; 130 return 0;
139 } 131 }
140 else 132 else
141 op->remove (); 133 remove ();
142 134
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) 135 for (tmp = this; tmp; tmp = tmp->more)
148 { 136 {
149 tmp->x += freearr_x[dir]; 137 tmp->x += freearr_x[dir];
150 tmp->y += freearr_y[dir]; 138 tmp->y += freearr_y[dir];
151 tmp->map = get_map_from_coord (tmp->map, &tmp->x, &tmp->y); 139 xy_normalise (tmp->map, tmp->x, tmp->y);
152 } 140 }
153 141
154 /* insert_ob_in_map will deal with any tiling issues */ 142 /* insert_ob_in_map will deal with any tiling issues */
155 insert_ob_in_map (op, m, originator, 0); 143 insert_ob_in_map (this, map, originator, 0);
156 144
157 return 1; 145 return 1;
158} 146}
159 147
160 148
182 i = find_first_free_spot (op, op->map, x, y); 170 i = find_first_free_spot (op, op->map, x, y);
183 171
184 if (i == -1) 172 if (i == -1)
185 return 0; /* No free spot */ 173 return 0; /* No free spot */
186 174
187 if (op->head != NULL)
188 op = op->head; 175 op = op->head_ ();
189 op->remove (); 176 op->remove ();
177
190 for (tmp = op; tmp != NULL; tmp = tmp->more) 178 for (object *tmp = op; tmp; tmp = tmp->more)
179 {
191 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x), 180 tmp->x = x + freearr_x[i] + (!tmp->arch ? 0 : tmp->arch->x);
192 tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y); 181 tmp->y = y + freearr_y[i] + (!tmp->arch ? 0 : tmp->arch->y);
182 }
193 183
194 tmp = insert_ob_in_map (op, op->map, originator, 0); 184 op = insert_ob_in_map (op, op->map, originator, 0);
195 if (tmp) 185
196 return 0; 186 return !op;
197 else
198 return 1;
199} 187}
200 188
201/* 189/*
202 * Return value: 1 if object was destroyed, 0 otherwise. 190 * Return value: 1 if object was destroyed, 0 otherwise.
203 * Modified so that instead of passing the 'originator' that had no 191 * Modified so that instead of passing the 'originator' that had no
231 for (i = -5; i < 6; i++) 219 for (i = -5; i < 6; i++)
232 for (j = -5; j < 6; j++) 220 for (j = -5; j < 6; j++)
233 { 221 {
234 if (i == 0 && j == 0) 222 if (i == 0 && j == 0)
235 continue; 223 continue;
224
236 /* Perhaps this should be extended to support tiled maps */ 225 /* Perhaps this should be extended to support tiled maps */
237 if (OUT_OF_REAL_MAP (teleporter->map, teleporter->x + i, teleporter->y + j)) 226 if (OUT_OF_REAL_MAP (teleporter->map, teleporter->x + i, teleporter->y + j))
238 continue; 227 continue;
228
239 other_teleporter = GET_MAP_OB (teleporter->map, teleporter->x + i, teleporter->y + j); 229 other_teleporter = GET_MAP_OB (teleporter->map, teleporter->x + i, teleporter->y + j);
240 230
241 while (other_teleporter) 231 while (other_teleporter)
242 { 232 {
243 if (other_teleporter->type == tele_type) 233 if (other_teleporter->type == tele_type)
244 break; 234 break;
245 other_teleporter = other_teleporter->above; 235 other_teleporter = other_teleporter->above;
246 } 236 }
237
247 if (other_teleporter && !(RANDOM () % ++nrofalt)) 238 if (other_teleporter && !rndm (++nrofalt))
248 altern = other_teleporter; 239 altern = other_teleporter;
249 } 240 }
250 241
251 if (!nrofalt) 242 if (!nrofalt)
252 { 243 {
253 LOG (llevError, "No alternative teleporters around!\n"); 244 LOG (llevError, "%s: no alternative teleporters around (user %s).\n",
245 teleporter->debug_desc (), user->debug_desc ());
254 return 0; 246 return 0;
255 } 247 }
256 248
257 other_teleporter = altern; 249 other_teleporter = altern;
258 k = find_free_spot (user, other_teleporter->map, other_teleporter->x, other_teleporter->y, 1, 9); 250 k = find_free_spot (user, other_teleporter->map, other_teleporter->x, other_teleporter->y, 1, 9);
290 } 282 }
291 283
292 user->remove (); 284 user->remove ();
293 285
294 /* Update location for the object */ 286 /* Update location for the object */
295 for (tmp = user; tmp != NULL; tmp = tmp->more) 287 for (tmp = user; tmp; tmp = tmp->more)
296 { 288 {
297 tmp->x = other_teleporter->x + freearr_x[k] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x); 289 tmp->x = other_teleporter->x + freearr_x[k] + (tmp->arch ? tmp->arch->x : 0);
298 tmp->y = other_teleporter->y + freearr_y[k] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y); 290 tmp->y = other_teleporter->y + freearr_y[k] + (tmp->arch ? tmp->arch->y : 0);
299 } 291 }
292
300 tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0); 293 tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0);
301 return (tmp == NULL); 294 return !tmp;
302} 295}
303 296
304void 297void
305recursive_roll (object *op, int dir, object *pusher) 298recursive_roll (object *op, int dir, object *pusher)
306{ 299{
379 op = op->head; 372 op = op->head;
380 373
381 x = op->x + freearr_x[dir]; 374 x = op->x + freearr_x[dir];
382 y = op->y + freearr_y[dir]; 375 y = op->y + freearr_y[dir];
383 376
384 if (!QUERY_FLAG (op, FLAG_CAN_ROLL) || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW) > pusher->stats.Str)) 377 if (!QUERY_FLAG (op, FLAG_CAN_ROLL)
378 || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW)
379 > pusher->stats.Str))
385 return 0; 380 return 0;
386 381
387 m = op->map; 382 m = op->map;
388 flags = get_map_flags (m, &m, x, y, &x, &y); 383 flags = get_map_flags (m, &m, x, y, &x, &y);
389 384
428 CLEAR_FLAG (who, FLAG_SLEEP); 423 CLEAR_FLAG (who, FLAG_SLEEP);
429 424
430 /* player change place with his pets or summoned creature */ 425 /* player change place with his pets or summoned creature */
431 /* TODO: allow multi arch pushing. Can't be very difficult */ 426 /* TODO: allow multi arch pushing. Can't be very difficult */
432 if (who->more == NULL 427 if (who->more == NULL
433#ifdef COZY_SERVER
434 && ((owner && owner->contr && pusher->contr && same_party (owner->contr->party, pusher->contr->party)) || owner == pusher) 428 && ((owner && owner->contr && pusher->contr && same_party (owner->contr->party, pusher->contr->party))
435#else
436 && owner == pusher 429 || owner == pusher)
437#endif
438 ) 430 )
439 { 431 {
440 int temp; 432 int temp;
441 maptile *m; 433 maptile *m;
442 434

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines