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.19 by root, Mon May 28 21:28:36 2007 UTC vs.
Revision 1.20 by root, Mon Jun 4 13:04:00 2007 UTC

180 180
181 if (op->head != NULL) 181 if (op->head != NULL)
182 op = op->head; 182 op = op->head;
183 op->remove (); 183 op->remove ();
184 for (tmp = op; tmp != NULL; tmp = tmp->more) 184 for (tmp = op; tmp != NULL; tmp = tmp->more)
185 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x), 185 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 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 == NULL ? 0 : tmp->arch->y);
187 187
188 tmp = insert_ob_in_map (op, op->map, originator, 0); 188 tmp = insert_ob_in_map (op, op->map, originator, 0);
189 if (tmp) 189 if (tmp)
190 return 0; 190 return 0;
191 else 191 else
286 user->remove (); 286 user->remove ();
287 287
288 /* Update location for the object */ 288 /* Update location for the object */
289 for (tmp = user; tmp != NULL; tmp = tmp->more) 289 for (tmp = user; tmp != NULL; tmp = tmp->more)
290 { 290 {
291 tmp->x = other_teleporter->x + freearr_x[k] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x); 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->clone.y); 292 tmp->y = other_teleporter->y + freearr_y[k] + (tmp->arch == NULL ? 0 : tmp->arch->y);
293 } 293 }
294 tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0); 294 tmp = insert_ob_in_map (user, other_teleporter->map, NULL, 0);
295 return (tmp == NULL); 295 return (tmp == NULL);
296} 296}
297 297

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines