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.273 by root, Sat Dec 27 04:15:56 2008 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{
… …
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 ();
… …
1286 1286
1287 /* Ideally, the caller figures this out. However, it complicates a lot 1287 /* Ideally, the caller figures this out. However, it complicates a lot
1288 * of areas of callers (eg, anything that uses find_free_spot would now 1288 * of areas of callers (eg, anything that uses find_free_spot would now
1289 * need extra work 1289 * need extra work
1290 */ 1290 */
1291 maptile *newmap = m;
1291 if (!xy_normalise (m, op->x, op->y)) 1292 if (!xy_normalise (newmap, op->x, op->y))
1292 { 1293 {
1293 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found 1294 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1294 return 0; 1295 return 0;
1295 } 1296 }
1296 1297
1297 if (object *more = op->more) 1298 if (object *more = op->more)
1298 if (!insert_ob_in_map (more, m, originator, flag)) 1299 if (!insert_ob_in_map (more, m, originator, flag))
1299 return 0; 1300 return 0;
1300 1301
1301 CLEAR_FLAG (op, FLAG_REMOVED); 1302 op->flag [FLAG_REMOVED] = false;
1302 1303 op->env = 0;
1303 op->map = m; 1304 op->map = newmap;
1305
1304 mapspace &ms = op->ms (); 1306 mapspace &ms = op->ms ();
1305 1307
1306 /* this has to be done after we translate the coordinates. 1308 /* this has to be done after we translate the coordinates.
1307 */ 1309 */
1308 if (op->nrof && !(flag & INS_NO_MERGE)) 1310 if (op->nrof && !(flag & INS_NO_MERGE))
… …
1329 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");
1330 abort (); 1332 abort ();
1331 } 1333 }
1332 1334
1333 if (!originator->is_on_map ()) 1335 if (!originator->is_on_map ())
1336 {
1334 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",
1335 op->debug_desc (), originator->debug_desc ()); 1338 op->debug_desc (), originator->debug_desc ());
1339 abort ();
1340 }
1336 1341
1337 op->above = originator; 1342 op->above = originator;
1338 op->below = originator->below; 1343 op->below = originator->below;
1339 originator->below = op; 1344 originator->below = op;
1340 1345
… …
1493/* this function inserts an object in the map, but if it 1498/* this function inserts an object in the map, but if it
1494 * finds an object of its own type, it'll remove that one first. 1499 * finds an object of its own type, it'll remove that one first.
1495 * op is the object to insert it under: supplies x and the map. 1500 * op is the object to insert it under: supplies x and the map.
1496 */ 1501 */
1497void 1502void
1498replace_insert_ob_in_map (const char *arch_string, object *op) 1503replace_insert_ob_in_map (shstr_tmp archname, object *op)
1499{ 1504{
1500 /* first search for itself and remove any old instances */ 1505 /* first search for itself and remove any old instances */
1501 1506
1502 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1507 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1503 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1508 if (tmp->arch->archname == archname) /* same archetype */
1504 tmp->destroy (); 1509 tmp->destroy ();
1505 1510
1506 object *tmp = arch_to_object (archetype::find (arch_string)); 1511 object *tmp = arch_to_object (archetype::find (archname));
1507 1512
1508 tmp->x = op->x; 1513 tmp->x = op->x;
1509 tmp->y = op->y; 1514 tmp->y = op->y;
1510 1515
1511 insert_ob_in_map (tmp, op->map, op, 0); 1516 insert_ob_in_map (tmp, op->map, op, 0);
… …
2056 * there is capable of. 2061 * there is capable of.
2057 */ 2062 */
2058int 2063int
2059find_dir (maptile *m, int x, int y, object *exclude) 2064find_dir (maptile *m, int x, int y, object *exclude)
2060{ 2065{
2061 int i, max = SIZEOFFREE, mflags; 2066 int max = SIZEOFFREE, mflags;
2062
2063 sint16 nx, ny;
2064 object *tmp;
2065 maptile *mp;
2066
2067 MoveType blocked, move_type; 2067 MoveType move_type;
2068 2068
2069 if (exclude && exclude->head_ () != exclude) 2069 if (exclude && exclude->head_ () != exclude)
2070 { 2070 {
2071 exclude = exclude->head; 2071 exclude = exclude->head;
2072 move_type = exclude->move_type; 2072 move_type = exclude->move_type;
… …
2075 { 2075 {
2076 /* If we don't have anything, presume it can use all movement types. */ 2076 /* If we don't have anything, presume it can use all movement types. */
2077 move_type = MOVE_ALL; 2077 move_type = MOVE_ALL;
2078 } 2078 }
2079 2079
2080 for (i = 1; i < max; i++) 2080 for (int i = 1; i < max; i++)
2081 { 2081 {
2082 mp = m; 2082 mapxy pos (m, x, y);
2083 nx = x + freearr_x[i]; 2083 pos.move (i);
2084 ny = y + freearr_y[i];
2085 2084
2086 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2085 if (!pos.normalise ())
2087
2088 if (mflags & P_OUT_OF_MAP)
2089 max = maxfree[i]; 2086 max = maxfree[i];
2090 else 2087 else
2091 { 2088 {
2092 mapspace &ms = mp->at (nx, ny); 2089 mapspace &ms = *pos;
2093 2090
2094 blocked = ms.move_block;
2095
2096 if ((move_type & blocked) == move_type) 2091 if ((move_type & ms.move_block) == move_type)
2097 max = maxfree[i]; 2092 max = maxfree [i];
2098 else if (mflags & P_IS_ALIVE) 2093 else if (ms.flags () & P_IS_ALIVE)
2099 { 2094 {
2100 for (tmp = ms.bot; tmp; tmp = tmp->above) 2095 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2101 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ()) 2096 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2102 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) 2097 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2103 break;
2104
2105 if (tmp)
2106 return freedir[i]; 2098 return freedir [i];
2107 } 2099 }
2108 } 2100 }
2109 } 2101 }
2110 2102
2111 return 0; 2103 return 0;
… …
2186 * This basically means that if direction is 15, then it could either go 2178 * This basically means that if direction is 15, then it could either go
2187 * direction 4, 14, or 16 to get back to where we are. 2179 * direction 4, 14, or 16 to get back to where we are.
2188 * Moved from spell_util.c to object.c with the other related direction 2180 * Moved from spell_util.c to object.c with the other related direction
2189 * functions. 2181 * functions.
2190 */ 2182 */
2191int reduction_dir[SIZEOFFREE][3] = { 2183const int reduction_dir[SIZEOFFREE][3] = {
2192 {0, 0, 0}, /* 0 */ 2184 {0, 0, 0}, /* 0 */
2193 {0, 0, 0}, /* 1 */ 2185 {0, 0, 0}, /* 1 */
2194 {0, 0, 0}, /* 2 */ 2186 {0, 0, 0}, /* 2 */
2195 {0, 0, 0}, /* 3 */ 2187 {0, 0, 0}, /* 3 */
2196 {0, 0, 0}, /* 4 */ 2188 {0, 0, 0}, /* 4 */
… …
2334 return tmp; 2326 return tmp;
2335 2327
2336 return 0; 2328 return 0;
2337} 2329}
2338 2330
2339const shstr & 2331shstr_tmp
2340object::kv_get (const shstr &key) const 2332object::kv_get (shstr_tmp key) const
2341{ 2333{
2342 for (key_value *kv = key_values; kv; kv = kv->next) 2334 for (key_value *kv = key_values; kv; kv = kv->next)
2343 if (kv->key == key) 2335 if (kv->key == key)
2344 return kv->value; 2336 return kv->value;
2345 2337
2346 return shstr_null; 2338 return shstr ();
2347} 2339}
2348 2340
2349void 2341void
2350object::kv_set (const shstr &key, const shstr &value) 2342object::kv_set (shstr_tmp key, shstr_tmp value)
2351{ 2343{
2352 for (key_value *kv = key_values; kv; kv = kv->next) 2344 for (key_value *kv = key_values; kv; kv = kv->next)
2353 if (kv->key == key) 2345 if (kv->key == key)
2354 { 2346 {
2355 kv->value = value; 2347 kv->value = value;
… …
2364 2356
2365 key_values = kv; 2357 key_values = kv;
2366} 2358}
2367 2359
2368void 2360void
2369object::kv_del (const shstr &key) 2361object::kv_del (shstr_tmp key)
2370{ 2362{
2371 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) 2363 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2372 if ((*kvp)->key == key) 2364 if ((*kvp)->key == key)
2373 { 2365 {
2374 key_value *kv = *kvp; 2366 key_value *kv = *kvp;
… …
2505 container = 0; 2497 container = 0;
2506 2498
2507 // 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
2508 esrv_update_item (UPD_FLAGS, this, old_container); 2500 esrv_update_item (UPD_FLAGS, this, old_container);
2509 2501
2510 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 ());
2511 play_sound (sound_find ("chest_close")); 2503 play_sound (sound_find ("chest_close"));
2512 } 2504 }
2513 2505
2514 if (new_container) 2506 if (new_container)
2515 { 2507 {
… …
2525 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2517 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2526 new_container->insert (closer); 2518 new_container->insert (closer);
2527 } 2519 }
2528#endif 2520#endif
2529 2521
2530 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 ());
2531 2523
2532 // 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
2533 esrv_send_item (this, new_container); 2525 esrv_send_item (this, new_container);
2534 2526
2535 new_container->flag [FLAG_APPLIED] = true; 2527 new_container->flag [FLAG_APPLIED] = true;
… …
2543// else if (!old_container->env && contr && contr->ns) 2535// else if (!old_container->env && contr && contr->ns)
2544// contr->ns->floorbox_reset (); 2536// contr->ns->floorbox_reset ();
2545} 2537}
2546 2538
2547object * 2539object *
2548object::force_find (const shstr name) 2540object::force_find (shstr_tmp name)
2549{ 2541{
2550 /* cycle through his inventory to look for the MARK we want to 2542 /* cycle through his inventory to look for the MARK we want to
2551 * place 2543 * place
2552 */ 2544 */
2553 for (object *tmp = inv; tmp; tmp = tmp->below) 2545 for (object *tmp = inv; tmp; tmp = tmp->below)
… …
2556 2548
2557 return 0; 2549 return 0;
2558} 2550}
2559 2551
2560object * 2552object *
2561object::force_add (const shstr name, int duration) 2553object::force_add (shstr_tmp name, int duration)
2562{ 2554{
2563 if (object *force = force_find (name)) 2555 if (object *force = force_find (name))
2564 force->destroy (); 2556 force->destroy ();
2565 2557
2566 object *force = get_archetype (FORCE_NAME); 2558 object *force = get_archetype (FORCE_NAME);
… …
2575 2567
2576 return insert (force); 2568 return insert (force);
2577} 2569}
2578 2570
2579void 2571void
2580object::play_sound (faceidx sound) 2572object::play_sound (faceidx sound) const
2581{ 2573{
2582 if (!sound) 2574 if (!sound)
2583 return; 2575 return;
2584 2576
2585 if (flag [FLAG_REMOVED]) 2577 if (is_on_map ())
2586 return;
2587
2588 if (env)
2589 {
2590 if (object *pl = in_player ())
2591 pl->contr->play_sound (sound);
2592 }
2593 else
2594 map->play_sound (sound, x, y); 2578 map->play_sound (sound, x, y);
2579 else if (object *pl = in_player ())
2580 pl->contr->play_sound (sound);
2581}
2582
2583void
2584object::say_msg (const char *msg) const
2585{
2586 if (is_on_map ())
2587 map->say_msg (msg, x, y);
2588 else if (object *pl = in_player ())
2589 pl->contr->play_sound (sound);
2595} 2590}
2596 2591
2597void 2592void
2598object::make_noise () 2593object::make_noise ()
2599{ 2594{

Diff Legend

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