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.286 by root, Wed Sep 2 16:54:20 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
328 // the player inventory itself is always visible 328 // the player inventory itself is always visible
329 if (env->is_player ()) 329 if (env->is_player ())
330 return env; 330 return env;
331 331
332 // else a player could have our env open 332 // else a player could have our env open
333 object *envest = env->outer_env (); 333 object *envest = env->outer_env_or_self ();
334 334
335 // the player itself is always on a map, so we will find him here 335 // the player itself is always on a map, so we will find him here
336 // even if our inv is in a player. 336 // even if our inv is in a player.
337 if (envest->is_on_map ()) 337 if (envest->is_on_map ())
338 if (object *pl = envest->ms ().player ()) 338 if (object *pl = envest->ms ().player ())
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{
831{ 831{
832 /* If already on active list, don't do anything */ 832 /* If already on active list, don't do anything */
833 if (active) 833 if (active)
834 return; 834 return;
835 835
836 if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
837 if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
838
839 if (has_active_speed ()) 836 if (has_active_speed ())
837 {
838 if (flag [FLAG_FREED])
839 LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
840
840 actives.insert (this); 841 actives.insert (this);
842 }
841} 843}
842 844
843void 845void
844object::activate_recursive () 846object::activate_recursive ()
845{ 847{
1297 1299
1298 if (object *more = op->more) 1300 if (object *more = op->more)
1299 if (!insert_ob_in_map (more, m, originator, flag)) 1301 if (!insert_ob_in_map (more, m, originator, flag))
1300 return 0; 1302 return 0;
1301 1303
1302 CLEAR_FLAG (op, FLAG_REMOVED); 1304 op->flag [FLAG_REMOVED] = false;
1303 1305 op->env = 0;
1304 op->map = newmap; 1306 op->map = newmap;
1307
1305 mapspace &ms = op->ms (); 1308 mapspace &ms = op->ms ();
1306 1309
1307 /* this has to be done after we translate the coordinates. 1310 /* this has to be done after we translate the coordinates.
1308 */ 1311 */
1309 if (op->nrof && !(flag & INS_NO_MERGE)) 1312 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"); 1333 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1331 abort (); 1334 abort ();
1332 } 1335 }
1333 1336
1334 if (!originator->is_on_map ()) 1337 if (!originator->is_on_map ())
1338 {
1335 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", 1339 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 ()); 1340 op->debug_desc (), originator->debug_desc ());
1341 abort ();
1342 }
1337 1343
1338 op->above = originator; 1344 op->above = originator;
1339 op->below = originator->below; 1345 op->below = originator->below;
1340 originator->below = op; 1346 originator->below = op;
1341 1347
2493 container = 0; 2499 container = 0;
2494 2500
2495 // client needs item update to make it work, client bug requires this to be separate 2501 // client needs item update to make it work, client bug requires this to be separate
2496 esrv_update_item (UPD_FLAGS, this, old_container); 2502 esrv_update_item (UPD_FLAGS, this, old_container);
2497 2503
2498 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2504 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2499 play_sound (sound_find ("chest_close")); 2505 play_sound (sound_find ("chest_close"));
2500 } 2506 }
2501 2507
2502 if (new_container) 2508 if (new_container)
2503 { 2509 {
2513 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2519 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2514 new_container->insert (closer); 2520 new_container->insert (closer);
2515 } 2521 }
2516#endif 2522#endif
2517 2523
2518 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2524 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2519 2525
2520 // make sure the container is available, client bug requires this to be separate 2526 // make sure the container is available, client bug requires this to be separate
2521 esrv_send_item (this, new_container); 2527 esrv_send_item (this, new_container);
2522 2528
2523 new_container->flag [FLAG_APPLIED] = true; 2529 new_container->flag [FLAG_APPLIED] = true;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines