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.18 by root, Thu May 17 14:14:55 2007 UTC vs.
Revision 1.28 by root, Sat Dec 27 02:31:19 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 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>
176 i = find_first_free_spot (op, op->map, x, y); 175 i = find_first_free_spot (op, op->map, x, y);
177 176
178 if (i == -1) 177 if (i == -1)
179 return 0; /* No free spot */ 178 return 0; /* No free spot */
180 179
181 if (op->head != NULL)
182 op = op->head; 180 op = op->head_ ();
183 op->remove (); 181 op->remove ();
182
184 for (tmp = op; tmp != NULL; tmp = tmp->more) 183 for (object *tmp = op; tmp; tmp = tmp->more)
184 {
185 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x), 185 tmp->x = x + freearr_x[i] + (!tmp->arch ? 0 : tmp->arch->x);
186 tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y); 186 tmp->y = y + freearr_y[i] + (!tmp->arch ? 0 : tmp->arch->y);
187 }
187 188
188 tmp = insert_ob_in_map (op, op->map, originator, 0); 189 op = insert_ob_in_map (op, op->map, originator, 0);
189 if (tmp) 190
190 return 0; 191 return !op;
191 else
192 return 1;
193} 192}
194 193
195/* 194/*
196 * Return value: 1 if object was destroyed, 0 otherwise. 195 * Return value: 1 if object was destroyed, 0 otherwise.
197 * Modified so that instead of passing the 'originator' that had no 196 * Modified so that instead of passing the 'originator' that had no
225 for (i = -5; i < 6; i++) 224 for (i = -5; i < 6; i++)
226 for (j = -5; j < 6; j++) 225 for (j = -5; j < 6; j++)
227 { 226 {
228 if (i == 0 && j == 0) 227 if (i == 0 && j == 0)
229 continue; 228 continue;
229
230 /* Perhaps this should be extended to support tiled maps */ 230 /* Perhaps this should be extended to support tiled maps */
231 if (OUT_OF_REAL_MAP (teleporter->map, teleporter->x + i, teleporter->y + j)) 231 if (OUT_OF_REAL_MAP (teleporter->map, teleporter->x + i, teleporter->y + j))
232 continue; 232 continue;
233
233 other_teleporter = GET_MAP_OB (teleporter->map, teleporter->x + i, teleporter->y + j); 234 other_teleporter = GET_MAP_OB (teleporter->map, teleporter->x + i, teleporter->y + j);
234 235
235 while (other_teleporter) 236 while (other_teleporter)
236 { 237 {
237 if (other_teleporter->type == tele_type) 238 if (other_teleporter->type == tele_type)
238 break; 239 break;
239 other_teleporter = other_teleporter->above; 240 other_teleporter = other_teleporter->above;
240 } 241 }
242
241 if (other_teleporter && !(RANDOM () % ++nrofalt)) 243 if (other_teleporter && !rndm (++nrofalt))
242 altern = other_teleporter; 244 altern = other_teleporter;
243 } 245 }
244 246
245 if (!nrofalt) 247 if (!nrofalt)
246 { 248 {
247 LOG (llevError, "No alternative teleporters around!\n"); 249 LOG (llevError, "%s: no alternative teleporters around (user %s).\n",
250 teleporter->debug_desc (), user->debug_desc ());
248 return 0; 251 return 0;
249 } 252 }
250 253
251 other_teleporter = altern; 254 other_teleporter = altern;
252 k = find_free_spot (user, other_teleporter->map, other_teleporter->x, other_teleporter->y, 1, 9); 255 k = find_free_spot (user, other_teleporter->map, other_teleporter->x, other_teleporter->y, 1, 9);
284 } 287 }
285 288
286 user->remove (); 289 user->remove ();
287 290
288 /* Update location for the object */ 291 /* Update location for the object */
289 for (tmp = user; tmp != NULL; tmp = tmp->more) 292 for (tmp = user; tmp; tmp = tmp->more)
290 { 293 {
291 tmp->x = other_teleporter->x + freearr_x[k] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x); 294 tmp->x = other_teleporter->x + freearr_x[k] + (tmp->arch ? tmp->arch->x : 0);
292 tmp->y = other_teleporter->y + freearr_y[k] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y); 295 tmp->y = other_teleporter->y + freearr_y[k] + (tmp->arch ? tmp->arch->y : 0);
293 } 296 }
297
294 tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0); 298 tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0);
295 return (tmp == NULL); 299 return !tmp;
296} 300}
297 301
298void 302void
299recursive_roll (object *op, int dir, object *pusher) 303recursive_roll (object *op, int dir, object *pusher)
300{ 304{
373 op = op->head; 377 op = op->head;
374 378
375 x = op->x + freearr_x[dir]; 379 x = op->x + freearr_x[dir];
376 y = op->y + freearr_y[dir]; 380 y = op->y + freearr_y[dir];
377 381
378 if (!QUERY_FLAG (op, FLAG_CAN_ROLL) || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW) > pusher->stats.Str)) 382 if (!QUERY_FLAG (op, FLAG_CAN_ROLL)
383 || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW)
384 > pusher->stats.Str))
379 return 0; 385 return 0;
380 386
381 m = op->map; 387 m = op->map;
382 flags = get_map_flags (m, &m, x, y, &x, &y); 388 flags = get_map_flags (m, &m, x, y, &x, &y);
383 389

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines