… | |
… | |
1494 | /* this function inserts an object in the map, but if it |
1494 | /* 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. |
1495 | * 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. |
1496 | * op is the object to insert it under: supplies x and the map. |
1497 | */ |
1497 | */ |
1498 | void |
1498 | void |
1499 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1499 | replace_insert_ob_in_map (shstr_tmp archname, object *op) |
1500 | { |
1500 | { |
1501 | /* first search for itself and remove any old instances */ |
1501 | /* first search for itself and remove any old instances */ |
1502 | |
1502 | |
1503 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1503 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1504 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1504 | if (tmp->arch->archname == archname) /* same archetype */ |
1505 | tmp->destroy (); |
1505 | tmp->destroy (); |
1506 | |
1506 | |
1507 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1507 | object *tmp = arch_to_object (archetype::find (archname)); |
1508 | |
1508 | |
1509 | tmp->x = op->x; |
1509 | tmp->x = op->x; |
1510 | tmp->y = op->y; |
1510 | tmp->y = op->y; |
1511 | |
1511 | |
1512 | insert_ob_in_map (tmp, op->map, op, 0); |
1512 | insert_ob_in_map (tmp, op->map, op, 0); |
… | |
… | |
2057 | * there is capable of. |
2057 | * there is capable of. |
2058 | */ |
2058 | */ |
2059 | int |
2059 | int |
2060 | find_dir (maptile *m, int x, int y, object *exclude) |
2060 | find_dir (maptile *m, int x, int y, object *exclude) |
2061 | { |
2061 | { |
2062 | int i, max = SIZEOFFREE, mflags; |
2062 | int max = SIZEOFFREE, mflags; |
2063 | |
|
|
2064 | sint16 nx, ny; |
|
|
2065 | object *tmp; |
|
|
2066 | maptile *mp; |
|
|
2067 | |
|
|
2068 | MoveType blocked, move_type; |
2063 | MoveType move_type; |
2069 | |
2064 | |
2070 | if (exclude && exclude->head_ () != exclude) |
2065 | if (exclude && exclude->head_ () != exclude) |
2071 | { |
2066 | { |
2072 | exclude = exclude->head; |
2067 | exclude = exclude->head; |
2073 | move_type = exclude->move_type; |
2068 | move_type = exclude->move_type; |
… | |
… | |
2076 | { |
2071 | { |
2077 | /* If we don't have anything, presume it can use all movement types. */ |
2072 | /* If we don't have anything, presume it can use all movement types. */ |
2078 | move_type = MOVE_ALL; |
2073 | move_type = MOVE_ALL; |
2079 | } |
2074 | } |
2080 | |
2075 | |
2081 | for (i = 1; i < max; i++) |
2076 | for (int i = 1; i < max; i++) |
2082 | { |
2077 | { |
2083 | mp = m; |
2078 | mapxy pos (m, x, y); |
2084 | nx = x + freearr_x[i]; |
2079 | pos.move (i); |
2085 | ny = y + freearr_y[i]; |
|
|
2086 | |
2080 | |
2087 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
2081 | if (!pos.normalise ()) |
2088 | |
|
|
2089 | if (mflags & P_OUT_OF_MAP) |
|
|
2090 | max = maxfree[i]; |
2082 | max = maxfree[i]; |
2091 | else |
2083 | else |
2092 | { |
2084 | { |
2093 | mapspace &ms = mp->at (nx, ny); |
2085 | mapspace &ms = *pos; |
2094 | |
2086 | |
2095 | blocked = ms.move_block; |
|
|
2096 | |
|
|
2097 | if ((move_type & blocked) == move_type) |
2087 | if ((move_type & ms.move_block) == move_type) |
2098 | max = maxfree[i]; |
2088 | max = maxfree [i]; |
2099 | else if (mflags & P_IS_ALIVE) |
2089 | else if (ms.flags () & P_IS_ALIVE) |
2100 | { |
2090 | { |
2101 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
2091 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
2102 | if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ()) |
2092 | if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ()) |
2103 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2093 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2104 | break; |
|
|
2105 | |
|
|
2106 | if (tmp) |
|
|
2107 | return freedir[i]; |
2094 | return freedir [i]; |
2108 | } |
2095 | } |
2109 | } |
2096 | } |
2110 | } |
2097 | } |
2111 | |
2098 | |
2112 | return 0; |
2099 | return 0; |
… | |
… | |
2335 | return tmp; |
2322 | return tmp; |
2336 | |
2323 | |
2337 | return 0; |
2324 | return 0; |
2338 | } |
2325 | } |
2339 | |
2326 | |
2340 | const shstr & |
2327 | shstr_tmp |
2341 | object::kv_get (const shstr &key) const |
2328 | object::kv_get (shstr_tmp key) const |
2342 | { |
2329 | { |
2343 | for (key_value *kv = key_values; kv; kv = kv->next) |
2330 | for (key_value *kv = key_values; kv; kv = kv->next) |
2344 | if (kv->key == key) |
2331 | if (kv->key == key) |
2345 | return kv->value; |
2332 | return kv->value; |
2346 | |
2333 | |
2347 | return shstr_null; |
2334 | return shstr (); |
2348 | } |
2335 | } |
2349 | |
2336 | |
2350 | void |
2337 | void |
2351 | object::kv_set (const shstr &key, const shstr &value) |
2338 | object::kv_set (shstr_tmp key, shstr_tmp value) |
2352 | { |
2339 | { |
2353 | for (key_value *kv = key_values; kv; kv = kv->next) |
2340 | for (key_value *kv = key_values; kv; kv = kv->next) |
2354 | if (kv->key == key) |
2341 | if (kv->key == key) |
2355 | { |
2342 | { |
2356 | kv->value = value; |
2343 | kv->value = value; |
… | |
… | |
2365 | |
2352 | |
2366 | key_values = kv; |
2353 | key_values = kv; |
2367 | } |
2354 | } |
2368 | |
2355 | |
2369 | void |
2356 | void |
2370 | object::kv_del (const shstr &key) |
2357 | object::kv_del (shstr_tmp key) |
2371 | { |
2358 | { |
2372 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
2359 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
2373 | if ((*kvp)->key == key) |
2360 | if ((*kvp)->key == key) |
2374 | { |
2361 | { |
2375 | key_value *kv = *kvp; |
2362 | key_value *kv = *kvp; |
… | |
… | |
2544 | // else if (!old_container->env && contr && contr->ns) |
2531 | // else if (!old_container->env && contr && contr->ns) |
2545 | // contr->ns->floorbox_reset (); |
2532 | // contr->ns->floorbox_reset (); |
2546 | } |
2533 | } |
2547 | |
2534 | |
2548 | object * |
2535 | object * |
2549 | object::force_find (const shstr name) |
2536 | object::force_find (shstr_tmp name) |
2550 | { |
2537 | { |
2551 | /* cycle through his inventory to look for the MARK we want to |
2538 | /* cycle through his inventory to look for the MARK we want to |
2552 | * place |
2539 | * place |
2553 | */ |
2540 | */ |
2554 | for (object *tmp = inv; tmp; tmp = tmp->below) |
2541 | for (object *tmp = inv; tmp; tmp = tmp->below) |
… | |
… | |
2557 | |
2544 | |
2558 | return 0; |
2545 | return 0; |
2559 | } |
2546 | } |
2560 | |
2547 | |
2561 | object * |
2548 | object * |
2562 | object::force_add (const shstr name, int duration) |
2549 | object::force_add (shstr_tmp name, int duration) |
2563 | { |
2550 | { |
2564 | if (object *force = force_find (name)) |
2551 | if (object *force = force_find (name)) |
2565 | force->destroy (); |
2552 | force->destroy (); |
2566 | |
2553 | |
2567 | object *force = get_archetype (FORCE_NAME); |
2554 | object *force = get_archetype (FORCE_NAME); |