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.21 by root, Sun Jul 1 05:00:20 2007 UTC vs.
Revision 1.27 by root, Sun Sep 7 09:22: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 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 3 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,
… …
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, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * 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>
22 */ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#ifndef __CEXTRACT__ 25#ifndef __CEXTRACT__
26# include <sproto.h> 26# include <sproto.h>
… …
175 i = find_first_free_spot (op, op->map, x, y); 175 i = find_first_free_spot (op, op->map, x, y);
176 176
177 if (i == -1) 177 if (i == -1)
178 return 0; /* No free spot */ 178 return 0; /* No free spot */
179 179
180 if (op->head != NULL)
181 op = op->head; 180 op = op->head_ ();
182 op->remove (); 181 op->remove ();
182
183 for (tmp = op; tmp != NULL; tmp = tmp->more) 183 for (object *tmp = op; tmp; tmp = tmp->more)
184 {
184 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->x), 185 tmp->x = x + freearr_x[i] + (!tmp->arch ? 0 : tmp->arch->x);
185 tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->y); 186 tmp->y = y + freearr_y[i] + (!tmp->arch ? 0 : tmp->arch->y);
187 }
186 188
187 tmp = insert_ob_in_map (op, op->map, originator, 0); 189 op = insert_ob_in_map (op, op->map, originator, 0);
188 if (tmp) 190
189 return 0; 191 return !op;
190 else
191 return 1;
192} 192}
193 193
194/* 194/*
195 * Return value: 1 if object was destroyed, 0 otherwise. 195 * Return value: 1 if object was destroyed, 0 otherwise.
196 * Modified so that instead of passing the 'originator' that had no 196 * Modified so that instead of passing the 'originator' that had no
… …
241 altern = other_teleporter; 241 altern = other_teleporter;
242 } 242 }
243 243
244 if (!nrofalt) 244 if (!nrofalt)
245 { 245 {
246 LOG (llevError, "No alternative teleporters around!\n"); 246 LOG (llevError, "%s: no alternative teleporters around (user %s).\n",
247 teleporter->debug_desc (), user->debug_desc ());
247 return 0; 248 return 0;
248 } 249 }
249 250
250 other_teleporter = altern; 251 other_teleporter = altern;
251 k = find_free_spot (user, other_teleporter->map, other_teleporter->x, other_teleporter->y, 1, 9); 252 k = find_free_spot (user, other_teleporter->map, other_teleporter->x, other_teleporter->y, 1, 9);
… …
283 } 284 }
284 285
285 user->remove (); 286 user->remove ();
286 287
287 /* Update location for the object */ 288 /* Update location for the object */
288 for (tmp = user; tmp != NULL; tmp = tmp->more) 289 for (tmp = user; tmp; tmp = tmp->more)
289 { 290 {
290 tmp->x = other_teleporter->x + freearr_x[k] + (tmp->arch == NULL ? 0 : tmp->arch->x); 291 tmp->x = other_teleporter->x + freearr_x[k] + (tmp->arch ? tmp->arch->x : 0);
291 tmp->y = other_teleporter->y + freearr_y[k] + (tmp->arch == NULL ? 0 : tmp->arch->y); 292 tmp->y = other_teleporter->y + freearr_y[k] + (tmp->arch ? tmp->arch->y : 0);
292 } 293 }
294
293 tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0); 295 tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0);
294 return (tmp == NULL); 296 return !tmp;
295} 297}
296 298
297void 299void
298recursive_roll (object *op, int dir, object *pusher) 300recursive_roll (object *op, int dir, object *pusher)
299{ 301{
… …
372 op = op->head; 374 op = op->head;
373 375
374 x = op->x + freearr_x[dir]; 376 x = op->x + freearr_x[dir];
375 y = op->y + freearr_y[dir]; 377 y = op->y + freearr_y[dir];
376 378
377 if (!QUERY_FLAG (op, FLAG_CAN_ROLL) || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW) > pusher->stats.Str)) 379 if (!QUERY_FLAG (op, FLAG_CAN_ROLL)
380 || (op->weight && random_roll (0, op->weight / 50000 - 1, pusher, PREFER_LOW)
381 > pusher->stats.Str))
378 return 0; 382 return 0;
379 383
380 m = op->map; 384 m = op->map;
381 flags = get_map_flags (m, &m, x, y, &x, &y); 385 flags = get_map_flags (m, &m, x, y, &x, &y);
382 386

Diff Legend

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