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,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
4 | * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2002 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992 Frank Tore Johansen |
6 | * Copyright (©) 1992 Frank Tore Johansen |
7 | * |
7 | * |
8 | * Deliantra is free software: you can redistribute it and/or modify it under |
8 | * Deliantra is free software: you can redistribute it and/or modify it under |
9 | * the terms of the Affero GNU General Public License as published by the |
9 | * the terms of the Affero GNU General Public License as published by the |
10 | * Free Software Foundation, either version 3 of the License, or (at your |
10 | * Free Software Foundation, either version 3 of the License, or (at your |
11 | * option) any later version. |
11 | * option) any later version. |
12 | * |
12 | * |
13 | * This program is distributed in the hope that it will be useful, |
13 | * This program is distributed in the hope that it will be useful, |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | * GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
17 | * |
17 | * |
18 | * You should have received a copy of the Affero GNU General Public License |
18 | * You should have received a copy of the Affero GNU General Public License |
19 | * and the GNU General Public License along with this program. If not, see |
19 | * and the GNU General Public License along with this program. If not, see |
20 | * <http://www.gnu.org/licenses/>. |
20 | * <http://www.gnu.org/licenses/>. |
21 | * |
21 | * |
22 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | * The authors can be reached via e-mail to <support@deliantra.net> |
23 | */ |
23 | */ |
24 | |
24 | |
25 | //+GPL |
25 | //+GPL |
|
|
26 | |
|
|
27 | #include <algorithm> |
|
|
28 | #include <functional> |
26 | |
29 | |
27 | #include <global.h> |
30 | #include <global.h> |
28 | #include <sproto.h> |
31 | #include <sproto.h> |
29 | #include <sounds.h> |
32 | #include <sounds.h> |
30 | #include <living.h> |
33 | #include <living.h> |
31 | #include <object.h> |
34 | #include <object.h> |
32 | #include <spells.h> |
35 | #include <spells.h> |
33 | #include <skills.h> |
36 | #include <skills.h> |
34 | |
37 | |
35 | #include <algorithm> |
|
|
36 | #include <functional> |
|
|
37 | |
|
|
38 | playervec players; |
38 | playervec players; |
39 | |
39 | |
40 | /* This loads the first map an puts the player on it. */ |
40 | /* This loads the first map an puts the player on it. */ |
41 | static void |
41 | static void |
42 | set_first_map (object *op) |
42 | set_first_map (object *op) |
… | |
… | |
181 | player::set_object (object *op) |
181 | player::set_object (object *op) |
182 | { |
182 | { |
183 | ob = observe = viewpoint = op; |
183 | ob = observe = viewpoint = op; |
184 | ob->contr = this; /* this aren't yet in archetype */ |
184 | ob->contr = this; /* this aren't yet in archetype */ |
185 | |
185 | |
186 | ob->speed = 1.0f; |
186 | ob->speed = 1.0f; // object still inactive, keep it that way |
187 | ob->speed_left = 0.5f; |
187 | ob->speed_left = 0.5f; |
188 | |
188 | |
189 | ob->direction = 5; /* So player faces south */ |
189 | ob->direction = 5; /* So player faces south */ |
190 | } |
190 | } |
191 | |
191 | |
… | |
… | |
373 | */ |
373 | */ |
374 | int |
374 | int |
375 | path_to_player (object *mon, object *pl, unsigned mindiff) |
375 | path_to_player (object *mon, object *pl, unsigned mindiff) |
376 | { |
376 | { |
377 | rv_vector rv; |
377 | rv_vector rv; |
378 | int dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked; |
378 | int dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES; |
379 | |
379 | |
380 | get_rangevector (mon, pl, &rv, 0); |
380 | get_rangevector (mon, pl, &rv, 0); |
381 | |
381 | |
382 | if (rv.distance < mindiff) |
382 | if (rv.distance < mindiff) |
383 | return 0; |
383 | return 0; |
… | |
… | |
536 | } |
536 | } |
537 | } |
537 | } |
538 | |
538 | |
539 | /* Here we remove duplicated skills (as duplicated spell objects have |
539 | /* Here we remove duplicated skills (as duplicated spell objects have |
540 | * _very_ confusing effects for players), which could for instance be |
540 | * _very_ confusing effects for players), which could for instance be |
541 | * generated by bad treasurelists. - elmex |
541 | * generated by multiple treasurelists specifying the same skills. |
542 | */ |
542 | */ |
543 | if (op->type == SKILL) |
543 | if (op->type == SKILL) |
544 | { |
544 | { |
545 | for (object *tmp = op->below; tmp; tmp = tmp->below) |
545 | for (object *tmp = op->below; tmp; tmp = tmp->below) |
546 | if (tmp->type == op->type && tmp->name == op->name) |
546 | if (tmp->type == op->type && tmp->name == op->name) |
547 | { |
547 | { |
548 | op->destroy (); |
548 | op->destroy (); |
549 | LOG (llevError, |
|
|
550 | "give_initial_items: Removing duplicate skill %s\n", &tmp->name); |
|
|
551 | break; |
549 | break; |
552 | } |
550 | } |
553 | |
551 | |
554 | if (op->nrof > 1) |
552 | if (op->nrof > 1) |
555 | op->nrof = 1; |
553 | op->nrof = 1; |
… | |
… | |
734 | */ |
732 | */ |
735 | if (*first_map_ext_path) |
733 | if (*first_map_ext_path) |
736 | ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y); |
734 | ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y); |
737 | else |
735 | else |
738 | LOG (llevDebug, "first_map_ext_path not set\n"); |
736 | LOG (llevDebug, "first_map_ext_path not set\n"); |
|
|
737 | } |
|
|
738 | |
|
|
739 | /* |
|
|
740 | * Returns true if the given player is a legal class. |
|
|
741 | * The function to add and remove class-bonuses to the stats doesn't |
|
|
742 | * check if the stat becomes negative, thus this function |
|
|
743 | * merely checks that all stats are 1 or more, and returns |
|
|
744 | * false otherwise. |
|
|
745 | */ |
|
|
746 | static int |
|
|
747 | allowed_class (const object *op) |
|
|
748 | { |
|
|
749 | return op->stats.Dex > 0 |
|
|
750 | && op->stats.Str > 0 |
|
|
751 | && op->stats.Con > 0 |
|
|
752 | && op->stats.Int > 0 |
|
|
753 | && op->stats.Wis > 0 |
|
|
754 | && op->stats.Pow > 0 |
|
|
755 | && op->stats.Cha > 0; |
739 | } |
756 | } |
740 | |
757 | |
741 | void |
758 | void |
742 | player::chargen_race_next () |
759 | player::chargen_race_next () |
743 | { |
760 | { |
… | |
… | |
1445 | #endif |
1462 | #endif |
1446 | |
1463 | |
1447 | SET_ANIMATION (arrow, arrow->direction); |
1464 | SET_ANIMATION (arrow, arrow->direction); |
1448 | |
1465 | |
1449 | /* update the speed */ |
1466 | /* update the speed */ |
1450 | arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f |
|
|
1451 | + bow->stats.dam / 7.f; |
|
|
1452 | |
1467 | |
1453 | arrow->set_speed (max (arrow->speed, 2.f)); |
|
|
1454 | arrow->speed_left = 0; |
1468 | arrow->speed_left = 0; |
|
|
1469 | arrow->set_speed (max (2.f, |
|
|
1470 | ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f |
|
|
1471 | + bow->stats.dam / 7.f |
|
|
1472 | )); |
1455 | |
1473 | |
1456 | int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc; |
1474 | int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc; |
1457 | |
1475 | |
1458 | if (op->type == PLAYER) |
1476 | if (op->type == PLAYER) |
1459 | { |
1477 | { |
… | |
… | |
1480 | arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM); |
1498 | arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM); |
1481 | |
1499 | |
1482 | arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC); |
1500 | arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC); |
1483 | arrow->move_type = MOVE_FLY_LOW; |
1501 | arrow->move_type = MOVE_FLY_LOW; |
1484 | arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; |
1502 | arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; |
|
|
1503 | arrow->set_flag (FLAG_NO_PICK); |
1485 | |
1504 | |
1486 | op->play_sound (sound_find ("fire_arrow")); |
1505 | op->play_sound (sound_find ("fire_arrow")); |
1487 | m->insert (arrow, sx, sy, op); |
1506 | m->insert (arrow, sx, sy, op); |
1488 | |
1507 | |
1489 | if (!arrow->destroyed ()) |
1508 | if (!arrow->destroyed ()) |
… | |
… | |
1592 | |
1611 | |
1593 | if (item->type == WAND) |
1612 | if (item->type == WAND) |
1594 | { |
1613 | { |
1595 | if (!(--item->stats.food)) |
1614 | if (!(--item->stats.food)) |
1596 | { |
1615 | { |
1597 | object *tmp; |
|
|
1598 | |
|
|
1599 | if (item->arch) |
1616 | if (item->arch) |
1600 | { |
1617 | { |
1601 | item->clr_flag (FLAG_ANIMATE); |
1618 | item->clr_flag (FLAG_ANIMATE); |
1602 | item->face = item->arch->face; |
1619 | item->face = item->arch->face; |
1603 | item->set_speed (0); |
1620 | item->set_speed (0); |
… | |
… | |
1866 | || mon->flag [FLAG_CAN_ROLL]) |
1883 | || mon->flag [FLAG_CAN_ROLL]) |
1867 | && mon != op) |
1884 | && mon != op) |
1868 | break; |
1885 | break; |
1869 | } |
1886 | } |
1870 | |
1887 | |
1871 | if (!mon) /* This happens anytime the player tries to move */ |
1888 | /* no monster == player tries to move into a wall or so */ |
1872 | return false; /* into a wall */ |
1889 | if (!mon) |
|
|
1890 | { |
|
|
1891 | for (object *ob = m->at (nx, ny).top; ob; ob = ob->below) |
|
|
1892 | if (op->move_type & ob->move_block) |
|
|
1893 | { |
|
|
1894 | if (ob->move_block == MOVE_ALL) |
|
|
1895 | move_into_wall (op, ob); |
|
|
1896 | else |
|
|
1897 | { |
|
|
1898 | if (op->contr->ns->bumpmsg) |
|
|
1899 | { |
|
|
1900 | op->play_sound (sound_find ("blocked_move")); |
|
|
1901 | |
|
|
1902 | op->statusmsg (ob->invisible |
|
|
1903 | ? "Something blocks you." |
|
|
1904 | : format ("Something blocks you from entering the %s.", query_name (ob)) |
|
|
1905 | ); |
|
|
1906 | } |
|
|
1907 | } |
|
|
1908 | |
|
|
1909 | break; |
|
|
1910 | } |
|
|
1911 | |
|
|
1912 | return false; |
|
|
1913 | } |
1873 | |
1914 | |
1874 | mon = mon->head_ (); |
1915 | mon = mon->head_ (); |
1875 | |
1916 | |
1876 | if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) |
1917 | if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) |
1877 | if (op->contr->weapon_sp_left > 0.f) |
1918 | if (op->contr->weapon_sp_left > 0.f) |
… | |
… | |
1992 | } |
2033 | } |
1993 | |
2034 | |
1994 | bool |
2035 | bool |
1995 | move_player (object *op, int dir) |
2036 | move_player (object *op, int dir) |
1996 | { |
2037 | { |
1997 | if (!op->map || op->map->in_memory != MAP_ACTIVE) |
2038 | if (!op->map || op->map->state != MAP_ACTIVE) |
1998 | return 0; |
2039 | return 0; |
1999 | |
2040 | |
2000 | /* Sanity check: make sure dir is valid */ |
2041 | /* Sanity check: make sure dir is valid */ |
2001 | if (dir < 0 || dir > 8) |
2042 | if (dir < 0 || dir > 8) |
2002 | { |
2043 | { |
… | |
… | |
2143 | void |
2184 | void |
2144 | do_some_living (object *op) |
2185 | do_some_living (object *op) |
2145 | { |
2186 | { |
2146 | int last_food = op->stats.food; |
2187 | int last_food = op->stats.food; |
2147 | int gen_hp, gen_sp, gen_grace; |
2188 | int gen_hp, gen_sp, gen_grace; |
2148 | int over_hp, over_sp, over_grace; |
|
|
2149 | int i; |
|
|
2150 | int rate_hp = 1200; |
2189 | int rate_hp = 1200; |
2151 | int rate_sp = 2500; |
2190 | int rate_sp = 2500; |
2152 | int rate_grace = 2000; |
2191 | int rate_grace = 2000; |
2153 | const int max_hp = 1; |
2192 | const int max_hp = 1; |
2154 | const int max_sp = 1; |
2193 | const int max_sp = 1; |
2155 | const int max_grace = 1; |
2194 | const int max_grace = 1; |
2156 | |
2195 | |
|
|
2196 | #if 0 |
2157 | if (op->contr->hidden) |
2197 | if (op->contr->hidden) |
2158 | { |
2198 | { |
2159 | op->invisible = 1000; |
2199 | op->invisible = 1000; |
2160 | /* the socket code flashes the player visible/invisible |
2200 | /* the socket code flashes the player visible/invisible |
2161 | * depending on the value of invisible, so we need to |
2201 | * depending on the value of invisible, so we need to |
2162 | * alternate it here for it to work correctly. |
2202 | * alternate it here for it to work correctly. |
2163 | */ |
2203 | */ |
2164 | if (pticks & 2) |
2204 | if (server_tick & 2) |
2165 | op->invisible--; |
2205 | op->invisible--; |
2166 | } |
2206 | } |
|
|
2207 | else |
|
|
2208 | #endif |
2167 | else if (op->invisible && !(op->flag [FLAG_MAKE_INVIS])) |
2209 | if (op->invisible && !(op->flag [FLAG_MAKE_INVIS])) |
2168 | { |
2210 | { |
2169 | if (!op->invisible--) |
2211 | if (!op->invisible--) |
2170 | { |
2212 | { |
2171 | make_visible (op); |
2213 | make_visible (op); |
2172 | new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out."); |
2214 | new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out."); |
… | |
… | |
2206 | if (--op->last_grace < 0) |
2248 | if (--op->last_grace < 0) |
2207 | { |
2249 | { |
2208 | if (op->stats.grace < op->stats.maxgrace / 2) |
2250 | if (op->stats.grace < op->stats.maxgrace / 2) |
2209 | op->stats.grace++; /* no penalty in food for regaining grace */ |
2251 | op->stats.grace++; /* no penalty in food for regaining grace */ |
2210 | |
2252 | |
|
|
2253 | int temp = gen_grace < 20 ? 30 : gen_grace + 10; |
|
|
2254 | |
2211 | if (max_grace > 1) |
2255 | if (max_grace > 1) |
2212 | { |
2256 | { |
2213 | over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace; |
2257 | int over_grace = temp / rate_grace; |
|
|
2258 | |
2214 | if (over_grace > 0) |
2259 | if (over_grace > 0) |
2215 | { |
2260 | { |
2216 | op->stats.sp += over_grace |
2261 | op->stats.sp += over_grace + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > (temp % rate_grace)) ? -1 : 0; |
2217 | + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0; |
|
|
2218 | op->last_grace = 0; |
2262 | op->last_grace = 0; |
2219 | } |
2263 | } |
2220 | else |
2264 | else |
2221 | { |
2265 | op->last_grace = rate_grace / temp; |
2222 | op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); |
|
|
2223 | } |
|
|
2224 | } |
2266 | } |
2225 | else |
2267 | else |
2226 | { |
2268 | op->last_grace = rate_grace / temp; |
2227 | op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); |
2269 | |
2228 | } |
|
|
2229 | /* wearing stuff doesn't detract from grace generation. */ |
2270 | /* wearing stuff doesn't detract from grace generation. */ |
2230 | } |
2271 | } |
2231 | |
2272 | |
2232 | if (op->stats.food > 0) |
2273 | if (op->stats.food > 0) |
2233 | { |
2274 | { |
… | |
… | |
2252 | } |
2293 | } |
2253 | } |
2294 | } |
2254 | |
2295 | |
2255 | if (max_sp > 1) |
2296 | if (max_sp > 1) |
2256 | { |
2297 | { |
2257 | over_sp = (gen_sp + 10) / rate_sp; |
2298 | int over_sp = (gen_sp + 10) / rate_sp; |
2258 | if (over_sp > 0) |
2299 | if (over_sp > 0) |
2259 | { |
2300 | { |
2260 | if (op->stats.sp < op->stats.maxsp) |
2301 | if (op->stats.sp < op->stats.maxsp) |
2261 | { |
2302 | { |
2262 | op->stats.sp += over_sp > max_sp ? max_sp : over_sp; |
2303 | op->stats.sp += over_sp > max_sp ? max_sp : over_sp; |
… | |
… | |
2294 | else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) |
2335 | else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) |
2295 | op->stats.food = last_food; |
2336 | op->stats.food = last_food; |
2296 | } |
2337 | } |
2297 | } |
2338 | } |
2298 | |
2339 | |
|
|
2340 | int temp = gen_hp < 20 ? 30 : gen_hp + 10; |
|
|
2341 | |
2299 | if (max_hp > 1) |
2342 | if (max_hp > 1) |
2300 | { |
2343 | { |
2301 | over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp; |
2344 | int over_hp = temp / rate_hp; |
2302 | |
2345 | |
2303 | if (over_hp > 0) |
2346 | if (over_hp > 0) |
2304 | { |
2347 | { |
2305 | op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; |
2348 | op->stats.sp += over_hp + (random_roll (0, rate_hp - 1, op, PREFER_HIGH) > (temp % rate_hp)) ? -1 : 0; |
2306 | op->last_heal = 0; |
2349 | op->last_heal = 0; |
2307 | } |
2350 | } |
2308 | else |
2351 | else |
2309 | op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); |
2352 | op->last_heal = rate_hp / temp; |
2310 | } |
2353 | } |
2311 | else |
2354 | else |
2312 | op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); |
2355 | op->last_heal = rate_hp / temp; |
2313 | } |
2356 | } |
2314 | } |
2357 | } |
2315 | |
2358 | |
2316 | /* Digestion */ |
2359 | /* Digestion */ |
2317 | if (--op->last_eat < 0) |
2360 | if (--op->last_eat < 0) |
… | |
… | |
2657 | if (will_kill_again) |
2700 | if (will_kill_again) |
2658 | { |
2701 | { |
2659 | object *force; |
2702 | object *force; |
2660 | int at; |
2703 | int at; |
2661 | |
2704 | |
2662 | force = get_archetype (FORCE_NAME); |
2705 | force = archetype::get (FORCE_NAME); |
2663 | /* 50 ticks should be enough time for the spell to abate */ |
2706 | /* 50 ticks should be enough time for the spell to abate */ |
2664 | force->speed = 0.1f; |
|
|
2665 | force->speed_left = -5.f; |
2707 | force->speed_left = -5.f; |
|
|
2708 | force->set_speed (0.1f); |
2666 | force->set_flag (FLAG_APPLIED); |
2709 | force->set_flag (FLAG_APPLIED); |
|
|
2710 | |
2667 | for (at = 0; at < NROFATTACKS; at++) |
2711 | for (at = 0; at < NROFATTACKS; at++) |
2668 | if (will_kill_again & (1 << at)) |
2712 | if (will_kill_again & (1 << at)) |
2669 | force->resist[at] = 100; |
2713 | force->resist[at] = 100; |
2670 | |
2714 | |
2671 | insert_ob_in_ob (force, op); |
2715 | insert_ob_in_ob (force, op); |
… | |
… | |
2676 | } |
2720 | } |
2677 | |
2721 | |
2678 | static void |
2722 | static void |
2679 | loot_object (object *op) |
2723 | loot_object (object *op) |
2680 | { /* Grab and destroy some treasure */ |
2724 | { /* Grab and destroy some treasure */ |
2681 | object *tmp, *tmp2, *next; |
2725 | object *tmp, *next; |
2682 | |
2726 | |
2683 | op->close_container (); /* close open sack first */ |
2727 | op->close_container (); /* close open sack first */ |
2684 | |
2728 | |
2685 | for (tmp = op->inv; tmp; tmp = next) |
2729 | for (tmp = op->inv; tmp; tmp = next) |
2686 | { |
2730 | { |
… | |
… | |
2718 | void |
2762 | void |
2719 | fix_weight () |
2763 | fix_weight () |
2720 | { |
2764 | { |
2721 | for_all_players (pl) |
2765 | for_all_players (pl) |
2722 | { |
2766 | { |
2723 | sint32 old = pl->ob->carrying; |
2767 | weight_t old = pl->ob->carrying; |
2724 | |
2768 | |
2725 | pl->ob->update_weight (); |
2769 | pl->ob->update_weight (); |
2726 | |
2770 | |
2727 | if (old != pl->ob->carrying) |
2771 | if (old != pl->ob->carrying) |
2728 | { |
2772 | { |
… | |
… | |
2923 | for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) |
2967 | for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above) |
2924 | { |
2968 | { |
2925 | if ((player ||friendly) &&tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_UNAGGRESSIVE]) |
2969 | if ((player ||friendly) &&tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_UNAGGRESSIVE]) |
2926 | return 1; |
2970 | return 1; |
2927 | else if (tmp->type == PLAYER) |
2971 | else if (tmp->type == PLAYER) |
2928 | { |
|
|
2929 | /*don't let a hidden DM prevent you from hiding */ |
|
|
2930 | if (!tmp->flag [FLAG_WIZ] || tmp->contr->hidden == 0) |
|
|
2931 | return 1; |
2972 | return 1; |
2932 | } |
|
|
2933 | } |
2973 | } |
2934 | } |
2974 | } |
2935 | return 0; |
2975 | return 0; |
2936 | } |
2976 | } |
2937 | |
2977 | |
2938 | /* check the player los field for viewability of the |
2978 | /* check the player los field for viewability of the |
2939 | * object op. This function works fine for monsters, |
2979 | * object op. This function works fine for monsters, |
2940 | * but we dont worry if the object isnt the top one in |
2980 | * but we dont worry if the object isnt the top one in |
2941 | * a pile (say a coin under a table would return "viewable" |
2981 | * a pile (say a coin under a table would return "viewable" |
2942 | * by this routine). Another question, should we be |
2982 | * by this routine). Another question, should we be |
2943 | * concerned with the direction the player is looking |
2983 | * concerned with the direction the player is looking |
2944 | * in? Realistically, most of us can't see stuff behind |
2984 | * in? Realistically, most of us can't see stuff behind |
2945 | * our backs...on the other hand, does the "facing" direction |
2985 | * our backs...on the other hand, does the "facing" direction |
2946 | * imply the way your head, or body is facing? It's possible |
2986 | * imply the way your head, or body is facing? It's possible |
2947 | * for them to differ. Sigh, this fctn could get a bit more complex. |
2987 | * for them to differ. Sigh, this fctn could get a bit more complex. |
2948 | * -b.t. |
2988 | * -b.t. |
2949 | * This function is now map tiling safe. |
2989 | * This function is now map tiling safe. |
2950 | */ |
2990 | */ |
2951 | int |
2991 | int |
2952 | player_can_view (object *pl, object *op) |
2992 | player_can_view (object *pl, object *op) |
2953 | { |
2993 | { |