ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.280 by root, Thu Jan 8 19:23:44 2009 UTC vs.
Revision 1.282 by root, Tue Feb 17 03:53:31 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra 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
1330 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1330 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1331 abort (); 1331 abort ();
1332 } 1332 }
1333 1333
1334 if (!originator->is_on_map ()) 1334 if (!originator->is_on_map ())
1335 {
1335 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", 1336 LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1336 op->debug_desc (), originator->debug_desc ()); 1337 op->debug_desc (), originator->debug_desc ());
1338 abort ();
1339 }
1337 1340
1338 op->above = originator; 1341 op->above = originator;
1339 op->below = originator->below; 1342 op->below = originator->below;
1340 originator->below = op; 1343 originator->below = op;
1341 1344
2493 container = 0; 2496 container = 0;
2494 2497
2495 // client needs item update to make it work, client bug requires this to be separate 2498 // client needs item update to make it work, client bug requires this to be separate
2496 esrv_update_item (UPD_FLAGS, this, old_container); 2499 esrv_update_item (UPD_FLAGS, this, old_container);
2497 2500
2498 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2501 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2499 play_sound (sound_find ("chest_close")); 2502 play_sound (sound_find ("chest_close"));
2500 } 2503 }
2501 2504
2502 if (new_container) 2505 if (new_container)
2503 { 2506 {
2513 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2516 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2514 new_container->insert (closer); 2517 new_container->insert (closer);
2515 } 2518 }
2516#endif 2519#endif
2517 2520
2518 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2521 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2519 2522
2520 // make sure the container is available, client bug requires this to be separate 2523 // make sure the container is available, client bug requires this to be separate
2521 esrv_send_item (this, new_container); 2524 esrv_send_item (this, new_container);
2522 2525
2523 new_container->flag [FLAG_APPLIED] = true; 2526 new_container->flag [FLAG_APPLIED] = true;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines