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.275 by root, Sun Dec 28 15:28:47 2008 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{
963 965
964void 966void
965object::do_destroy () 967object::do_destroy ()
966{ 968{
967 if (flag [FLAG_IS_LINKED]) 969 if (flag [FLAG_IS_LINKED])
968 remove_button_link (this); 970 remove_link ();
969 971
970 if (flag [FLAG_FRIENDLY]) 972 if (flag [FLAG_FRIENDLY])
971 remove_friendly_object (this); 973 remove_friendly_object (this);
972 974
973 remove (); 975 remove ();
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
1494/* this function inserts an object in the map, but if it 1500/* 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. 1501 * 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. 1502 * op is the object to insert it under: supplies x and the map.
1497 */ 1503 */
1498void 1504void
1499replace_insert_ob_in_map (const char *arch_string, object *op) 1505replace_insert_ob_in_map (shstr_tmp archname, object *op)
1500{ 1506{
1501 /* first search for itself and remove any old instances */ 1507 /* first search for itself and remove any old instances */
1502 1508
1503 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1509 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1504 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1510 if (tmp->arch->archname == archname) /* same archetype */
1505 tmp->destroy (); 1511 tmp->destroy ();
1506 1512
1507 object *tmp = arch_to_object (archetype::find (arch_string)); 1513 object *tmp = arch_to_object (archetype::find (archname));
1508 1514
1509 tmp->x = op->x; 1515 tmp->x = op->x;
1510 tmp->y = op->y; 1516 tmp->y = op->y;
1511 1517
1512 insert_ob_in_map (tmp, op->map, op, 0); 1518 insert_ob_in_map (tmp, op->map, op, 0);
2174 * This basically means that if direction is 15, then it could either go 2180 * 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. 2181 * 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 2182 * Moved from spell_util.c to object.c with the other related direction
2177 * functions. 2183 * functions.
2178 */ 2184 */
2179int reduction_dir[SIZEOFFREE][3] = { 2185const int reduction_dir[SIZEOFFREE][3] = {
2180 {0, 0, 0}, /* 0 */ 2186 {0, 0, 0}, /* 0 */
2181 {0, 0, 0}, /* 1 */ 2187 {0, 0, 0}, /* 1 */
2182 {0, 0, 0}, /* 2 */ 2188 {0, 0, 0}, /* 2 */
2183 {0, 0, 0}, /* 3 */ 2189 {0, 0, 0}, /* 3 */
2184 {0, 0, 0}, /* 4 */ 2190 {0, 0, 0}, /* 4 */
2322 return tmp; 2328 return tmp;
2323 2329
2324 return 0; 2330 return 0;
2325} 2331}
2326 2332
2327const shstr & 2333shstr_tmp
2328object::kv_get (const shstr &key) const 2334object::kv_get (shstr_tmp key) const
2329{ 2335{
2330 for (key_value *kv = key_values; kv; kv = kv->next) 2336 for (key_value *kv = key_values; kv; kv = kv->next)
2331 if (kv->key == key) 2337 if (kv->key == key)
2332 return kv->value; 2338 return kv->value;
2333 2339
2334 return shstr_null; 2340 return shstr ();
2335} 2341}
2336 2342
2337void 2343void
2338object::kv_set (const shstr &key, const shstr &value) 2344object::kv_set (shstr_tmp key, shstr_tmp value)
2339{ 2345{
2340 for (key_value *kv = key_values; kv; kv = kv->next) 2346 for (key_value *kv = key_values; kv; kv = kv->next)
2341 if (kv->key == key) 2347 if (kv->key == key)
2342 { 2348 {
2343 kv->value = value; 2349 kv->value = value;
2352 2358
2353 key_values = kv; 2359 key_values = kv;
2354} 2360}
2355 2361
2356void 2362void
2357object::kv_del (const shstr &key) 2363object::kv_del (shstr_tmp key)
2358{ 2364{
2359 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) 2365 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2360 if ((*kvp)->key == key) 2366 if ((*kvp)->key == key)
2361 { 2367 {
2362 key_value *kv = *kvp; 2368 key_value *kv = *kvp;
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;
2531// else if (!old_container->env && contr && contr->ns) 2537// else if (!old_container->env && contr && contr->ns)
2532// contr->ns->floorbox_reset (); 2538// contr->ns->floorbox_reset ();
2533} 2539}
2534 2540
2535object * 2541object *
2536object::force_find (const shstr name) 2542object::force_find (shstr_tmp name)
2537{ 2543{
2538 /* cycle through his inventory to look for the MARK we want to 2544 /* cycle through his inventory to look for the MARK we want to
2539 * place 2545 * place
2540 */ 2546 */
2541 for (object *tmp = inv; tmp; tmp = tmp->below) 2547 for (object *tmp = inv; tmp; tmp = tmp->below)
2544 2550
2545 return 0; 2551 return 0;
2546} 2552}
2547 2553
2548object * 2554object *
2549object::force_add (const shstr name, int duration) 2555object::force_add (shstr_tmp name, int duration)
2550{ 2556{
2551 if (object *force = force_find (name)) 2557 if (object *force = force_find (name))
2552 force->destroy (); 2558 force->destroy ();
2553 2559
2554 object *force = get_archetype (FORCE_NAME); 2560 object *force = get_archetype (FORCE_NAME);
2563 2569
2564 return insert (force); 2570 return insert (force);
2565} 2571}
2566 2572
2567void 2573void
2568object::play_sound (faceidx sound) 2574object::play_sound (faceidx sound) const
2569{ 2575{
2570 if (!sound) 2576 if (!sound)
2571 return; 2577 return;
2572 2578
2573 if (flag [FLAG_REMOVED]) 2579 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); 2580 map->play_sound (sound, x, y);
2581 else if (object *pl = in_player ())
2582 pl->contr->play_sound (sound);
2583}
2584
2585void
2586object::say_msg (const char *msg) const
2587{
2588 if (is_on_map ())
2589 map->say_msg (msg, x, y);
2590 else if (object *pl = in_player ())
2591 pl->contr->play_sound (sound);
2583} 2592}
2584 2593
2585void 2594void
2586object::make_noise () 2595object::make_noise ()
2587{ 2596{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines