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.276 by root, Wed Dec 31 18:07:41 2008 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
… …
963 963
964void 964void
965object::do_destroy () 965object::do_destroy ()
966{ 966{
967 if (flag [FLAG_IS_LINKED]) 967 if (flag [FLAG_IS_LINKED])
968 remove_button_link (this); 968 remove_link ();
969 969
970 if (flag [FLAG_FRIENDLY]) 970 if (flag [FLAG_FRIENDLY])
971 remove_friendly_object (this); 971 remove_friendly_object (this);
972 972
973 remove (); 973 remove ();
… …
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
… …
1494/* this function inserts an object in the map, but if it 1497/* this function inserts an object in the map, but if it
1495 * finds an object of its own type, it'll remove that one first. 1498 * finds an object of its own type, it'll remove that one first.
1496 * op is the object to insert it under: supplies x and the map. 1499 * op is the object to insert it under: supplies x and the map.
1497 */ 1500 */
1498void 1501void
1499replace_insert_ob_in_map (const char *arch_string, object *op) 1502replace_insert_ob_in_map (shstr_tmp archname, object *op)
1500{ 1503{
1501 /* first search for itself and remove any old instances */ 1504 /* first search for itself and remove any old instances */
1502 1505
1503 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1506 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1504 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1507 if (tmp->arch->archname == archname) /* same archetype */
1505 tmp->destroy (); 1508 tmp->destroy ();
1506 1509
1507 object *tmp = arch_to_object (archetype::find (arch_string)); 1510 object *tmp = arch_to_object (archetype::find (archname));
1508 1511
1509 tmp->x = op->x; 1512 tmp->x = op->x;
1510 tmp->y = op->y; 1513 tmp->y = op->y;
1511 1514
1512 insert_ob_in_map (tmp, op->map, op, 0); 1515 insert_ob_in_map (tmp, op->map, op, 0);
… …
2174 * This basically means that if direction is 15, then it could either go 2177 * This basically means that if direction is 15, then it could either go
2175 * direction 4, 14, or 16 to get back to where we are. 2178 * direction 4, 14, or 16 to get back to where we are.
2176 * Moved from spell_util.c to object.c with the other related direction 2179 * Moved from spell_util.c to object.c with the other related direction
2177 * functions. 2180 * functions.
2178 */ 2181 */
2179int reduction_dir[SIZEOFFREE][3] = { 2182const int reduction_dir[SIZEOFFREE][3] = {
2180 {0, 0, 0}, /* 0 */ 2183 {0, 0, 0}, /* 0 */
2181 {0, 0, 0}, /* 1 */ 2184 {0, 0, 0}, /* 1 */
2182 {0, 0, 0}, /* 2 */ 2185 {0, 0, 0}, /* 2 */
2183 {0, 0, 0}, /* 3 */ 2186 {0, 0, 0}, /* 3 */
2184 {0, 0, 0}, /* 4 */ 2187 {0, 0, 0}, /* 4 */
… …
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;
… …
2563 2566
2564 return insert (force); 2567 return insert (force);
2565} 2568}
2566 2569
2567void 2570void
2568object::play_sound (faceidx sound) 2571object::play_sound (faceidx sound) const
2569{ 2572{
2570 if (!sound) 2573 if (!sound)
2571 return; 2574 return;
2572 2575
2573 if (flag [FLAG_REMOVED]) 2576 if (is_on_map ())
2574 return;
2575
2576 if (env)
2577 {
2578 if (object *pl = in_player ())
2579 pl->contr->play_sound (sound);
2580 }
2581 else
2582 map->play_sound (sound, x, y); 2577 map->play_sound (sound, x, y);
2578 else if (object *pl = in_player ())
2579 pl->contr->play_sound (sound);
2580}
2581
2582void
2583object::say_msg (const char *msg) const
2584{
2585 if (is_on_map ())
2586 map->say_msg (msg, x, y);
2587 else if (object *pl = in_player ())
2588 pl->contr->play_sound (sound);
2583} 2589}
2584 2590
2585void 2591void
2586object::make_noise () 2592object::make_noise ()
2587{ 2593{

Diff Legend

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