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.284 by root, Sat Jun 27 08:35:03 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
792 792
793object::object () 793object::object ()
794{ 794{
795 SET_FLAG (this, FLAG_REMOVED); 795 SET_FLAG (this, FLAG_REMOVED);
796 796
797 expmul = 1.0; 797 //expmul = 1.0; declared const for the time being
798 face = blank_face; 798 face = blank_face;
799} 799}
800 800
801object::~object () 801object::~object ()
802{ 802{
1297 1297
1298 if (object *more = op->more) 1298 if (object *more = op->more)
1299 if (!insert_ob_in_map (more, m, originator, flag)) 1299 if (!insert_ob_in_map (more, m, originator, flag))
1300 return 0; 1300 return 0;
1301 1301
1302 CLEAR_FLAG (op, FLAG_REMOVED); 1302 op->flag [FLAG_REMOVED] = false;
1303 1303 op->env = 0;
1304 op->map = newmap; 1304 op->map = newmap;
1305
1305 mapspace &ms = op->ms (); 1306 mapspace &ms = op->ms ();
1306 1307
1307 /* this has to be done after we translate the coordinates. 1308 /* this has to be done after we translate the coordinates.
1308 */ 1309 */
1309 if (op->nrof && !(flag & INS_NO_MERGE)) 1310 if (op->nrof && !(flag & INS_NO_MERGE))
1330 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1331 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1331 abort (); 1332 abort ();
1332 } 1333 }
1333 1334
1334 if (!originator->is_on_map ()) 1335 if (!originator->is_on_map ())
1336 {
1335 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", 1337 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 ()); 1338 op->debug_desc (), originator->debug_desc ());
1339 abort ();
1340 }
1337 1341
1338 op->above = originator; 1342 op->above = originator;
1339 op->below = originator->below; 1343 op->below = originator->below;
1340 originator->below = op; 1344 originator->below = op;
1341 1345
2493 container = 0; 2497 container = 0;
2494 2498
2495 // client needs item update to make it work, client bug requires this to be separate 2499 // client needs item update to make it work, client bug requires this to be separate
2496 esrv_update_item (UPD_FLAGS, this, old_container); 2500 esrv_update_item (UPD_FLAGS, this, old_container);
2497 2501
2498 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2502 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2499 play_sound (sound_find ("chest_close")); 2503 play_sound (sound_find ("chest_close"));
2500 } 2504 }
2501 2505
2502 if (new_container) 2506 if (new_container)
2503 { 2507 {
2513 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2517 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2514 new_container->insert (closer); 2518 new_container->insert (closer);
2515 } 2519 }
2516#endif 2520#endif
2517 2521
2518 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2522 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2519 2523
2520 // make sure the container is available, client bug requires this to be separate 2524 // make sure the container is available, client bug requires this to be separate
2521 esrv_send_item (this, new_container); 2525 esrv_send_item (this, new_container);
2522 2526
2523 new_container->flag [FLAG_APPLIED] = true; 2527 new_container->flag [FLAG_APPLIED] = true;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines