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.20 by root, Mon Jun 4 13:04:00 2007 UTC vs.
Revision 1.30 by root, Sun Dec 28 15:28:47 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors 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>
… …
32 * If it fails (something blocks the passage), it returns 0, 31 * If it fails (something blocks the passage), it returns 0,
33 * otherwise 1. 32 * otherwise 1.
34 * This is an improvement from the previous move_ob(), which 33 * This is an improvement from the previous move_ob(), which
35 * removed and inserted objects even if they were unable to move. 34 * removed and inserted objects even if they were unable to move.
36 */ 35 */
37
38int 36int
39move_object (object *op, int dir) 37move_object (object *op, int dir)
40{ 38{
41 return move_ob (op, dir, op); 39 return op->move (dir);
42} 40}
43 41
44/* object op is trying to move in direction dir. 42/* object op is trying to move in direction dir.
45 * originator is typically the same as op, but 43 * originator is typically the same as op, but
46 * can be different if originator is causing op to 44 * can be different if originator is causing op to
… …
51 * very similiar to move_object. 49 * very similiar to move_object.
52 */ 50 */
53int 51int
54move_ob (object *op, int dir, object *originator) 52move_ob (object *op, int dir, object *originator)
55{ 53{
54 return op->move (dir, originator);
55}
56
57int
58object::move (int dir, object *originator)
59{
56 sint16 newx = op->x + freearr_x[dir]; 60 sint16 newx = x + freearr_x[dir];
57 sint16 newy = op->y + freearr_y[dir]; 61 sint16 newy = y + freearr_y[dir];
58 object *tmp;
59 maptile *m;
60 int mflags;
61 62
62 if (op == NULL) 63 mapxy pos (this);
63 { 64 pos.move (dir);
64 LOG (llevError, "Trying to move NULL.\n");
65 return 0;
66 }
67 65
68 m = op->map;
69 mflags = get_map_flags (m, &m, newx, newy, &newx, &newy);
70
71 /* If the space the player is trying to is out of the map, 66 /* If the space the object is moving to is out of the map,
72 * bail now - we know it can't work. 67 * bail now - we know it can't work.
73 */ 68 */
74 if (mflags & P_OUT_OF_MAP) 69 if (!pos.normalise ())
75 return 0; 70 return 0;
76 71
77 /* Is this space blocked? Players with wizpass are immune to 72 /* Is this space blocked? Players with wizpass are immune to
78 * this condition. 73 * this condition.
79 */ 74 */
80 if (blocked_link (op, m, newx, newy) && !QUERY_FLAG (op, FLAG_WIZPASS)) 75 if (blocked_link (this, pos.m, pos.x, pos.y) && !flag [FLAG_WIZPASS])
81 return 0; 76 return 0;
82 77
78 // check tail movability
79 if (more && !more->move (dir, more->head))
80 return 0;
81
83 /* 0.94.2 - we need to set the direction for the new animation code. 82 /* 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 83 * it uses it to figure out face to use - I can't see it
85 * breaking anything, but it might. 84 * breaking anything, but it might.
86 */ 85 */
87 if (op->more && !move_ob (op->more, dir, op->more->head))
88 return 0;
89
90 op->direction = dir; 86 direction = dir;
91 87
92 if (op->will_apply & 4) 88 if (will_apply & 4)
93 check_earthwalls (op, m, newx, newy); 89 check_earthwalls (this, pos.m, pos.x, pos.y);
94 90
95 if (op->will_apply & 8) 91 if (will_apply & 8)
96 check_doors (op, m, newx, newy); 92 check_doors (this, pos.m, pos.x, pos.y);
97
98 /* 0.94.1 - I got a stack trace that showed it crash with remove_ob trying
99 * to remove a removed object, and this function was the culprit. A possible
100 * guess I have is that check_doors above ran into a trap, killing the
101 * monster.
102 *
103 * Unfortunately, it doesn't appear that the calling functions of move_object
104 * deal very well with op being killed, so all this might do is just
105 * migrate the problem someplace else.
106 */
107
108 if (QUERY_FLAG (op, FLAG_REMOVED))
109 {
110 LOG (llevDebug, "move_object: monster has been removed - will not process further\n");
111 /* Was not successful, but don't want to try and move again */
112 return 1;
113 }
114 93
115 /* If this is a tail portion, just want to tell caller that move is 94 /* If this is a tail portion, just want to tell caller that move is
116 * ok - the caller will deal with actual object removal/insertion 95 * ok - the caller will deal with actual object removal/insertion
117 */ 96 */
118 if (op->head) 97 if (head)
119 return 1; 98 return 1;
120 99
121 if (m != op->map && op->contr) 100 if (pos.m != map && contr)
122 { 101 {
123 if (INVOKE_MAP (LEAVE, op->map, ARG_PLAYER (op->contr))) 102 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
124 return 0; 103 return 0;
125 104
126 op->remove (); 105 remove ();
127 106
128 if (INVOKE_PLAYER (MAP_CHANGE, op->contr, ARG_MAP (m), ARG_INT (newx), ARG_INT (newy))) 107 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (pos.m), ARG_INT (pos.x), ARG_INT (pos.y)))
129 return 0; 108 return 0;
130 109
131 if (INVOKE_MAP (ENTER, m, ARG_PLAYER (op->contr), ARG_INT (newx), ARG_INT (newy))) 110 if (INVOKE_MAP (ENTER, pos.m, ARG_PLAYER (contr), ARG_INT (pos.x), ARG_INT (pos.y)))
132 return 0; 111 return 0;
133 } 112 }
134 else
135 op->remove ();
136
137 /* we already have newx, newy, and m, so lets use them.
138 * In addition, this fixes potential crashes, because multipart object was
139 * on edge of map, +=x, +=y doesn't make correct coordinates.
140 */
141 for (tmp = op; tmp != NULL; tmp = tmp->more)
142 {
143 tmp->x += freearr_x[dir];
144 tmp->y += freearr_y[dir];
145 tmp->map = get_map_from_coord (tmp->map, &tmp->x, &tmp->y);
146 }
147 113
148 /* insert_ob_in_map will deal with any tiling issues */ 114 /* insert_ob_in_map will deal with any tiling issues */
149 insert_ob_in_map (op, m, originator, 0); 115 pos.insert (this, originator);
150 116
151 return 1; 117 return 1;
152} 118}
153
154 119
155/* 120/*
156 * transfer_ob(): Move an object (even linked objects) to another spot 121 * transfer_ob(): Move an object (even linked objects) to another spot
157 * on the same map. 122 * on the same map.
158 * 123 *
… …
176 i = find_first_free_spot (op, op->map, x, y); 141 i = find_first_free_spot (op, op->map, x, y);
177 142
178 if (i == -1) 143 if (i == -1)
179 return 0; /* No free spot */ 144 return 0; /* No free spot */
180 145
181 if (op->head != NULL)
182 op = op->head; 146 op = op->head_ ();
183 op->remove (); 147 op->remove ();
148
184 for (tmp = op; tmp != NULL; tmp = tmp->more) 149 for (object *tmp = op; tmp; tmp = tmp->more)
185 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->x), 150 {
151 tmp->x = x + freearr_x[i] + tmp->arch->x;
186 tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->y); 152 tmp->y = y + freearr_y[i] + tmp->arch->y;
153 }
187 154
188 tmp = insert_ob_in_map (op, op->map, originator, 0); 155 op = insert_ob_in_map (op, op->map, originator, 0);
189 if (tmp) 156
190 return 0; 157 return !op;
191 else
192 return 1;
193} 158}
194 159
195/* 160/*
196 * Return value: 1 if object was destroyed, 0 otherwise. 161 * Return value: 1 if object was destroyed, 0 otherwise.
197 * Modified so that instead of passing the 'originator' that had no 162 * Modified so that instead of passing the 'originator' that had no
… …
205 * one of another type. 170 * one of another type.
206 */ 171 */
207int 172int
208teleport (object *teleporter, uint8 tele_type, object *user) 173teleport (object *teleporter, uint8 tele_type, object *user)
209{ 174{
210 object *altern; 175 if (!user)
211 int i, j, k, nrofalt = 0; 176 return 0;
177
212 object *other_teleporter, *tmp; 178 object *other_teleporter = 0;
213 maptile *m; 179 int nrofalt = 0;
214 sint16 sx, sy;
215 180
216 if (user == NULL)
217 return 0;
218 if (user->head != NULL)
219 user = user->head; 181 user = user->head_ ();
220 182
221 /* Find all other teleporters within range. This range 183 /* Find all other teleporters within range. This range
222 * should really be setable by some object attribute instead of 184 * should really be setable by some object attribute instead of
223 * using hard coded values. 185 * using hard coded values.
224 */ 186 */
225 for (i = -5; i < 6; i++) 187 unordered_mapwalk (teleporter, -5, -5, 5, 5)
226 for (j = -5; j < 6; j++)
227 { 188 {
228 if (i == 0 && j == 0) 189 mapspace &ms = m->at (nx, ny);
229 continue;
230 /* Perhaps this should be extended to support tiled maps */
231 if (OUT_OF_REAL_MAP (teleporter->map, teleporter->x + i, teleporter->y + j))
232 continue;
233 other_teleporter = GET_MAP_OB (teleporter->map, teleporter->x + i, teleporter->y + j);
234 190
235 while (other_teleporter) 191 for (object *tmp = ms.top; tmp; tmp = tmp->below)
192 if (tmp->type == tele_type)
236 { 193 {
237 if (other_teleporter->type == tele_type) 194 if ((dx || dy) && !rndm (++nrofalt))
195 other_teleporter = tmp;
196
238 break; 197 break;
239 other_teleporter = other_teleporter->above;
240 } 198 }
241 if (other_teleporter && !(RANDOM () % ++nrofalt))
242 altern = other_teleporter;
243 } 199 }
244 200
245 if (!nrofalt) 201 if (!nrofalt)
246 { 202 {
247 LOG (llevError, "No alternative teleporters around!\n"); 203 LOG (llevError, "%s: no alternative teleporters around (user %s).\n",
204 teleporter->debug_desc (), user->debug_desc ());
248 return 0; 205 return 0;
249 } 206 }
250 207
251 other_teleporter = altern;
252 k = find_free_spot (user, other_teleporter->map, other_teleporter->x, other_teleporter->y, 1, 9); 208 int k = find_free_spot (user, other_teleporter->map, other_teleporter->x, other_teleporter->y, 1, 9);
253 209
254 /* if k==-1, unable to find a free spot. If this is shop 210 /* if k==-1, unable to find a free spot. If this is shop
255 * mat that the player is using, find someplace to move 211 * mat that the player is using, find someplace to move
256 * the player - otherwise, player can get trapped in the shops 212 * the player - otherwise, player can get trapped in the shops
257 * that appear in random dungeons. We basically just make 213 * that appear in random dungeons. We basically just make
258 * sure the space isn't no pass (eg wall), and don't care 214 * sure the space isn't no pass (eg wall), and don't care
259 * about is alive. 215 * about is alive.
260 */ 216 */
261 if (k == -1) 217 if (k == -1)
262 { 218 {
263 if (tele_type == SHOP_MAT && user->type == PLAYER) 219 if (tele_type == SHOP_MAT && user->is_player ())
264 { 220 {
265 for (k = 1; k < 9; k++) 221 for (k = 1; k < 9; k++)
266 { 222 {
223 maptile *m;
224 sint16 sx, sy;
225
267 if (get_map_flags (other_teleporter->map, &m, 226 if (get_map_flags (other_teleporter->map, &m,
268 other_teleporter->x + freearr_x[k], other_teleporter->y + freearr_y[k], &sx, &sy) & P_OUT_OF_MAP) 227 other_teleporter->x + freearr_x[k], other_teleporter->y + freearr_y[k], &sx, &sy) & P_OUT_OF_MAP)
269 continue; 228 continue;
270 229
271 if (!OB_TYPE_MOVE_BLOCK (user, GET_MAP_MOVE_BLOCK (m, sx, sy))) 230 if (!OB_TYPE_MOVE_BLOCK (user, GET_MAP_MOVE_BLOCK (m, sx, sy)))
272 break; 231 break;
273
274 } 232 }
233
275 if (k == 9) 234 if (k == 9)
276 { 235 {
277 LOG (llevError, "Shop mat %s (%d, %d) is in solid rock?\n", 236 LOG (llevError, "Shop mat %s (%d, %d) is in solid rock?\n",
278 &other_teleporter->name, other_teleporter->x, other_teleporter->y); 237 &other_teleporter->name, other_teleporter->x, other_teleporter->y);
279 return 0; 238 return 0;
… …
281 } 240 }
282 else 241 else
283 return 0; 242 return 0;
284 } 243 }
285 244
286 user->remove (); 245 return !other_teleporter->map->insert (
287 246 user, other_teleporter->x + freearr_x[k], other_teleporter->y + freearr_y[k]
288 /* Update location for the object */ 247 );
289 for (tmp = user; tmp != NULL; tmp = tmp->more)
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 }
294 tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0);
295 return (tmp == NULL);
296} 248}
297 249
298void 250void
299recursive_roll (object *op, int dir, object *pusher) 251recursive_roll (object *op, int dir, object *pusher)
300{ 252{
… …
357/* 309/*
358 * this is not perfect yet. 310 * this is not perfect yet.
359 * it does not roll objects behind multipart objects properly. 311 * it does not roll objects behind multipart objects properly.
360 * Support for rolling multipart objects is questionable. 312 * Support for rolling multipart objects is questionable.
361 */ 313 */
362
363int 314int
364roll_ob (object *op, int dir, object *pusher) 315roll_ob (object *op, int dir, object *pusher)
365{ 316{
366 object *tmp;
367 sint16 x, y; 317 sint16 x, y;
368 int flags; 318 int flags;
369 maptile *m; 319 maptile *m;
370 MoveType move_block; 320 MoveType move_block;
371 321
… …
373 op = op->head; 323 op = op->head;
374 324
375 x = op->x + freearr_x[dir]; 325 x = op->x + freearr_x[dir];
376 y = op->y + freearr_y[dir]; 326 y = op->y + freearr_y[dir];
377 327
378 if (!QUERY_FLAG (op, FLAG_CAN_ROLL) || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW) > pusher->stats.Str)) 328 if (!QUERY_FLAG (op, FLAG_CAN_ROLL)
329 || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW)
330 > pusher->stats.Str))
379 return 0; 331 return 0;
380 332
381 m = op->map; 333 m = op->map;
382 flags = get_map_flags (m, &m, x, y, &x, &y); 334 flags = get_map_flags (m, &m, x, y, &x, &y);
383 335
… …
387 move_block = GET_MAP_MOVE_BLOCK (m, x, y); 339 move_block = GET_MAP_MOVE_BLOCK (m, x, y);
388 340
389 /* If the target space is not blocked, no need to look at the objects on it */ 341 /* If the target space is not blocked, no need to look at the objects on it */
390 if ((op->move_type & move_block) == op->move_type) 342 if ((op->move_type & move_block) == op->move_type)
391 { 343 {
392 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 344 for (object *tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
393 { 345 {
394 if (tmp->head == op) 346 if (tmp->head == op)
395 continue; 347 continue;
348
396 if (OB_MOVE_BLOCK (op, tmp) && !roll_ob (tmp, dir, pusher)) 349 if (OB_MOVE_BLOCK (op, tmp) && !roll_ob (tmp, dir, pusher))
397 return 0; 350 return 0;
398 } 351 }
399 } 352 }
353
400 if (try_fit (op, m, x, y)) 354 if (try_fit (op, m, x, y))
401 return 0; 355 return 0;
402 356
403 op->remove (); 357 op->move (dir);
404 for (tmp = op; tmp != NULL; tmp = tmp->more) 358
405 tmp->x += freearr_x[dir], tmp->y += freearr_y[dir];
406 insert_ob_in_map (op, op->map, pusher, 0);
407 return 1; 359 return 1;
408} 360}
409 361
410/* returns 1 if pushing invokes a attack, 0 when not */ 362/* returns 1 if pushing invokes a attack, 0 when not */
411int 363int
… …
445 pusher->map = who->map; 397 pusher->map = who->map;
446 who->map = m; 398 who->map = m;
447 399
448 insert_ob_in_map (who, who->map, pusher, 0); 400 insert_ob_in_map (who, who->map, pusher, 0);
449 insert_ob_in_map (pusher, pusher->map, pusher, 0); 401 insert_ob_in_map (pusher, pusher->map, pusher, 0);
402
450 return 0; 403 return 0;
451 } 404 }
452 405
453 /* We want ONLY become enemy of evil, unaggressive monster. We must RUN in them */ 406 /* We want ONLY become enemy of evil, unaggressive monster. We must RUN in them */
454 /* In original we have here a unaggressive check only - that was the reason why */ 407 /* In original we have here a unaggressive check only - that was the reason why */

Diff Legend

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