ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/player.C
(Generate patch)

Comparing deliantra/server/server/player.C (file contents):
Revision 1.92 by root, Mon Jan 8 01:19:04 2007 UTC vs.
Revision 1.106 by pippijn, Fri Mar 2 10:15:40 2007 UTC

… …
116 116
117 news[0] = '\0'; 117 news[0] = '\0';
118 subject[0] = '\0'; 118 subject[0] = '\0';
119 size = 0; 119 size = 0;
120 120
121 while (fgets (buf, MAX_BUF, fp) != NULL) 121 while (fgets (buf, MAX_BUF, fp))
122 { 122 {
123 if (*buf == '#') 123 if (*buf == '#')
124 continue; 124 continue;
125 125
126 if (*buf == '%') 126 if (*buf == '%')
… …
194 return; 194 return;
195 195
196 terminate_all_pets (ob); 196 terminate_all_pets (ob);
197 remove_friendly_object (ob); 197 remove_friendly_object (ob);
198 ob->deactivate_recursive (); 198 ob->deactivate_recursive ();
199 maplevel = ob->map->path;
199 ob->remove (); 200 ob->remove ();
200 ob->map = 0; 201 ob->map = 0;
202 party = 0;
201 203
202 // for weird reasons, this is often "ob", keeping a circular reference 204 // for weird reasons, this is often "ob", keeping a circular reference
203 ranges [range_skill] = 0; 205 ranges [range_skill] = 0;
204 206
205 players.erase (this); 207 players.erase (this);
… …
211player::connect (client *ns) 213player::connect (client *ns)
212{ 214{
213 this->ns = ns; 215 this->ns = ns;
214 ns->pl = this; 216 ns->pl = this;
215 217
218 run_on = 0;
219 fire_on = 0;
220 ob->close_container (); //TODO: client-specific
221
216 ns->update_look = 0; 222 ns->update_look = 0;
217 ns->look_position = 0; 223 ns->look_position = 0;
218 224
219 clear_los (ob); 225 clear_los (ob);
226
227 ns->reset_stats ();
220 228
221 /* make sure he's a player -- needed because of class change. */ 229 /* make sure he's a player -- needed because of class change. */
222 ob->type = PLAYER; // we are paranoid 230 ob->type = PLAYER; // we are paranoid
223 ob->race = ob->arch->clone.race; 231 ob->race = ob->arch->clone.race;
224 232
… …
229 link_player_skills (ob); 237 link_player_skills (ob);
230 238
231 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 239 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
232 240
233 assign (title, ob->arch->clone.name); 241 assign (title, ob->arch->clone.name);
234
235 /* can_use_shield is a new flag. However, the can_use.. seems to largely come
236 * from the class, and not race. I don't see any way to get the class information
237 * to then update this. I don't think this will actually break anything - anyone
238 * that can use armour should be able to use a shield. What this may 'break'
239 * are features new characters get, eg, if someone starts up with a Q, they
240 * should be able to use a shield. However, old Q's won't get that advantage.
241 */
242 if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
243 SET_FLAG (ob, FLAG_USE_SHIELD);
244 242
245 /* if it's a dragon player, set the correct title here */ 243 /* if it's a dragon player, set the correct title here */
246 if (is_dragon_pl (ob)) 244 if (is_dragon_pl (ob))
247 { 245 {
248 object *tmp, *abil = 0, *skin = 0; 246 object *tmp, *abil = 0, *skin = 0;
… …
288 if (active) 286 if (active)
289 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); 287 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
290 288
291 INVOKE_PLAYER (DISCONNECT, this); 289 INVOKE_PLAYER (DISCONNECT, this);
292 290
291 ns->reset_stats ();
293 ns->pl = 0; 292 ns->pl = 0;
294 this->ns = 0; 293 this->ns = 0;
295 } 294 }
295
296 if (ob)
297 ob->close_container (); //TODO: client-specific
296 298
297 deactivate (); 299 deactivate ();
298} 300}
299 301
300// the need for this function can be explained 302// the need for this function can be explained
301// by load_object not returning the object 303// by load_object not returning the object
302void 304void
303player::set_object (object *op) 305player::set_object (object *op)
304{ 306{
305 ob = op; 307 ob = op;
306 ob->contr = this; /* this aren't yet in archetype */ 308 ob->contr = this; /* this aren't yet in archetype */
307 309
308 ob->speed_left = 0.5; 310 ob->speed_left = 0.5;
309 ob->speed = 1.0; 311 ob->speed = 1.0;
310 ob->direction = 5; /* So player faces south */ 312 ob->direction = 5; /* So player faces south */
311 ob->stats.wc = 2;
312 ob->run_away = 25; /* Then we panick... */
313
314 ob->roll_stats ();
315} 313}
316 314
317player::player () 315player::player ()
318{ 316{
319 /* There are some elements we want initialised to non zero value - 317 /* There are some elements we want initialised to non zero value -
… …
324 unapply = unapply_nochoice; 322 unapply = unapply_nochoice;
325 323
326 savebed_map = first_map_path; /* Init. respawn position */ 324 savebed_map = first_map_path; /* Init. respawn position */
327 325
328 gen_sp_armour = 10; 326 gen_sp_armour = 10;
329 last_speed = -1;
330 shoottype = range_none; 327 shoottype = range_none;
331 bowtype = bow_normal; 328 bowtype = bow_normal;
332 petmode = pet_normal; 329 petmode = pet_normal;
333 listening = 10; 330 listening = 10;
334 usekeys = containers; 331 usekeys = containers;
335 last_weapon_sp = -1;
336 peaceful = 1; /* default peaceful */ 332 peaceful = 1; /* default peaceful */
337 do_los = 1; 333 do_los = 1;
338
339 /* we need to clear these to -1 and not zero - otherwise,
340 * if a player quits and starts a new character, we wont
341 * send new values to the client, as things like exp start
342 * at zero.
343 */
344 for (int i = 0; i < NUM_SKILLS; i++)
345 last_skill_exp[i] = -1;
346
347 for (int i = 0; i < NROFATTACKS; i++)
348 last_resist[i] = -1;
349
350 last_stats.exp = -1;
351 last_weight = (uint32) - 1;
352} 334}
353 335
354void 336void
355player::do_destroy () 337player::do_destroy ()
356{ 338{
… …
379player::create () 361player::create ()
380{ 362{
381 player *pl = new player; 363 player *pl = new player;
382 364
383 pl->set_object (arch_to_object (get_player_archetype (0))); 365 pl->set_object (arch_to_object (get_player_archetype (0)));
366
367 pl->ob->roll_stats ();
368 pl->ob->stats.wc = 2;
369 pl->ob->run_away = 25; /* Then we panick... */
370
384 set_first_map (pl->ob); 371 set_first_map (pl->ob);
385 372
386 return pl; 373 return pl;
387} 374}
388 375
… …
534 x = mon->x; 521 x = mon->x;
535 y = mon->y; 522 y = mon->y;
536 m = mon->map; 523 m = mon->map;
537 dir = rv.direction; 524 dir = rv.direction;
538 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 525 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
539 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 526 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
527
540 /* If we can't solve it within the search distance, return now. */ 528 /* If we can't solve it within the search distance, return now. */
541 if (diff > max) 529 if (diff > max)
542 return 0; 530 return 0;
531
543 while (diff > 1 && max > 0) 532 while (diff > 1 && max > 0)
544 { 533 {
545 lastx = x; 534 lastx = x;
546 lasty = y; 535 lasty = y;
547 lastmap = m; 536 lastmap = m;
… …
629 max--; 618 max--;
630 lastdir = dir; 619 lastdir = dir;
631 if (!firstdir) 620 if (!firstdir)
632 firstdir = dir; 621 firstdir = dir;
633 } 622 }
623
634 if (diff <= 1) 624 if (diff <= 1)
635 { 625 {
636 /* Recalculate diff (distance) because we may not have actually 626 /* Recalculate diff (distance) because we may not have actually
637 * headed toward player for entire distance. 627 * headed toward player for entire distance.
638 */ 628 */
639 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 629 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
640 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 630 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
641 } 631 }
632
642 if (diff > max) 633 if (diff > max)
643 return 0; 634 return 0;
644 } 635 }
636
645 /* If we reached the max, didn't find a direction in time */ 637 /* If we reached the max, didn't find a direction in time */
646 if (!max) 638 if (!max)
647 return 0; 639 return 0;
648 640
649 return firstdir; 641 return firstdir;
… …
763roll_stat (void) 755roll_stat (void)
764{ 756{
765 int a[4], i, j, k; 757 int a[4], i, j, k;
766 758
767 for (i = 0; i < 4; i++) 759 for (i = 0; i < 4; i++)
768 a[i] = (int) RANDOM () % 6 + 1; 760 a[i] = (int) rndm (6) + 1;
769 761
770 for (i = 0, j = 0, k = 7; i < 4; i++) 762 for (i = 0, j = 0, k = 7; i < 4; i++)
771 if (a[i] < k) 763 if (a[i] < k)
772 k = a[i], j = i; 764 k = a[i], j = i;
773 765
… …
903 * to save here. 895 * to save here.
904 */ 896 */
905 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 897 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);
906 make_path_to_file (buf); 898 make_path_to_file (buf);
907 899
908#ifdef AUTOSAVE
909 op->contr->last_save_tick = pticks;
910#endif
911 start_info (op); 900 start_info (op);
912 CLEAR_FLAG (op, FLAG_WIZ); 901 CLEAR_FLAG (op, FLAG_WIZ);
913 give_initial_items (op, op->randomitems); 902 give_initial_items (op, op->randomitems);
914 link_player_skills (op); 903 link_player_skills (op);
915 esrv_send_inventory (op, op); 904 esrv_send_inventory (op, op);
… …
1041int 1030int
1042check_pick (object *op) 1031check_pick (object *op)
1043{ 1032{
1044 object *tmp, *next; 1033 object *tmp, *next;
1045 int stop = 0; 1034 int stop = 0;
1046 int j, k, wvratio; 1035 int wvratio;
1047 char putstring[128], tmpstr[16]; 1036 char putstring[128];
1048 1037
1049 /* if you're flying, you cna't pick up anything */ 1038 /* if you're flying, you cna't pick up anything */
1050 if (op->move_type & MOVE_FLYING) 1039 if (op->move_type & MOVE_FLYING)
1051 return 1; 1040 return 1;
1052 1041
… …
1389 * found object is returned. 1378 * found object is returned.
1390 */ 1379 */
1391object * 1380object *
1392find_arrow (object *op, const char *type) 1381find_arrow (object *op, const char *type)
1393{ 1382{
1394 object *tmp = NULL; 1383 object *tmp = 0;
1395 1384
1396 for (op = op->inv; op; op = op->below) 1385 for (op = op->inv; op; op = op->below)
1397 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1386 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1398 tmp = find_arrow (op, type); 1387 tmp = find_arrow (op, type);
1399 else if (op->type == ARROW && op->race == type) 1388 else if (op->type == ARROW && op->race == type)
1400 return op; 1389 return op;
1390
1401 return tmp; 1391 return tmp;
1402} 1392}
1403 1393
1404/* 1394/*
1405 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1395 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1406 * against the target. A full test is not performed, simply a basic test 1396 * against the target. A full test is not performed, simply a basic test
1407 * of resistances. The archer is making a quick guess at what he sees down 1397 * of resistances. The archer is making a quick guess at what he sees down
1408 * the hall. Failing that it does it's best to pick the highest plus arrow. 1398 * the hall. Failing that it does it's best to pick the highest plus arrow.
1409 */ 1399 */
1410
1411object * 1400object *
1412find_better_arrow (object *op, object *target, const char *type, int *better) 1401find_better_arrow (object *op, object *target, const char *type, int *better)
1413{ 1402{
1414 object *tmp = NULL, *arrow, *ntmp; 1403 object *tmp = NULL, *arrow, *ntmp;
1415 int attacknum, attacktype, betterby = 0, i; 1404 int attacknum, attacktype, betterby = 0, i;
… …
1875 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type."); 1864 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1876 return; 1865 return;
1877 } 1866 }
1878} 1867}
1879 1868
1880
1881
1882/* find_key 1869/* find_key
1883 * We try to find a key for the door as passed. If we find a key 1870 * We try to find a key for the door as passed. If we find a key
1884 * and successfully use it, we return the key, otherwise NULL 1871 * and successfully use it, we return the key, otherwise NULL
1885 * This function merges both normal and locked door, since the logic 1872 * This function merges both normal and locked door, since the logic
1886 * for both is the same - just the specific key is different. 1873 * for both is the same - just the specific key is different.
1887 * pl is the player, 1874 * pl is the player,
1888 * inv is the objects inventory to searched 1875 * inv is the objects inventory to searched
1889 * door is the door we are trying to match against. 1876 * door is the door we are trying to match against.
1890 * This function can be called recursively to search containers. 1877 * This function can be called recursively to search containers.
1891 */ 1878 */
1892
1893object * 1879object *
1894find_key (object *pl, object *container, object *door) 1880find_key (object *pl, object *container, object *door)
1895{ 1881{
1896 object *tmp, *key; 1882 object *tmp, *key;
1897 1883
1898 /* Should not happen, but sanity checking is never bad */ 1884 /* Should not happen, but sanity checking is never bad */
1899 if (container->inv == NULL) 1885 if (!container->inv)
1900 return NULL; 1886 return 0;
1901 1887
1902 /* First, lets try to find a key in the top level inventory */ 1888 /* First, lets try to find a key in the top level inventory */
1903 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1889 for (tmp = container->inv; tmp; tmp = tmp->below)
1904 { 1890 {
1905 if (door->type == DOOR && tmp->type == KEY) 1891 if (door->type == DOOR && tmp->type == KEY)
1906 break; 1892 break;
1907 /* For sanity, we should really check door type, but other stuff 1893 /* For sanity, we should really check door type, but other stuff
1908 * (like containers) can be locked with special keys 1894 * (like containers) can be locked with special keys
1909 */ 1895 */
1910 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1896 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1911 break; 1897 break;
1912 } 1898 }
1899
1913 /* No key found - lets search inventories now */ 1900 /* No key found - lets search inventories now */
1914 /* If we find and use a key in an inventory, return at that time. 1901 /* If we find and use a key in an inventory, return at that time.
1915 * otherwise, if we search all the inventories and still don't find 1902 * otherwise, if we search all the inventories and still don't find
1916 * a key, return 1903 * a key, return
1917 */ 1904 */
1918 if (!tmp) 1905 if (!tmp)
1919 { 1906 {
1920 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1907 for (tmp = container->inv; tmp; tmp = tmp->below)
1921 { 1908 {
1922 /* No reason to search empty containers */ 1909 /* No reason to search empty containers */
1923 if (tmp->type == CONTAINER && tmp->inv) 1910 if (tmp->type == CONTAINER && tmp->inv)
1924 { 1911 {
1925 if ((key = find_key (pl, tmp, door)) != NULL) 1912 if ((key = find_key (pl, tmp, door)))
1926 return key; 1913 return key;
1927 } 1914 }
1928 } 1915 }
1916
1929 if (!tmp) 1917 if (!tmp)
1930 return NULL; 1918 return NULL;
1931 } 1919 }
1920
1932 /* We get down here if we have found a key. Now if its in a container, 1921 /* We get down here if we have found a key. Now if its in a container,
1933 * see if we actually want to use it 1922 * see if we actually want to use it
1934 */ 1923 */
1935 if (pl != container) 1924 if (pl != container)
1936 { 1925 {
… …
1957 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1946 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1958 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1947 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1959 return NULL; 1948 return NULL;
1960 } 1949 }
1961 } 1950 }
1951
1962 return tmp; 1952 return tmp;
1963} 1953}
1964 1954
1965/* moved door processing out of move_player_attack. 1955/* moved door processing out of move_player_attack.
1966 * returns 1 if player has opened the door with a key 1956 * returns 1 if player has opened the door with a key
… …
1984 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1974 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1985 if (action_makes_visible (op)) 1975 if (action_makes_visible (op))
1986 make_visible (op); 1976 make_visible (op);
1987 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1977 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1988 spring_trap (door->inv, op); 1978 spring_trap (door->inv, op);
1979
1989 if (door->type == DOOR) 1980 if (door->type == DOOR)
1990 {
1991 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1981 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1992 }
1993 else if (door->type == LOCKED_DOOR) 1982 else if (door->type == LOCKED_DOOR)
1994 { 1983 {
1995 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1984 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
1996 remove_door2 (door); /* remove door without violence ;-) */ 1985 remove_door2 (door); /* remove door without violence ;-) */
1997 } 1986 }
1987
1998 /* Do this after we print the message */ 1988 /* Do this after we print the message */
1999 decrease_ob (key); /* Use up one of the keys */ 1989 decrease_ob (key); /* Use up one of the keys */
2000 /* Need to update the weight the container the key was in */ 1990 /* Need to update the weight the container the key was in */
2001 if (container != op) 1991 if (container != op)
2002 esrv_update_item (UPD_WEIGHT, op, container); 1992 esrv_update_item (UPD_WEIGHT, op, container);
1993
2003 return 1; /* Nothing more to do below */ 1994 return 1; /* Nothing more to do below */
2004 } 1995 }
2005 else if (door->type == LOCKED_DOOR) 1996 else if (door->type == LOCKED_DOOR)
2006 { 1997 {
2007 /* Might as well return now - no other way to open this */ 1998 /* Might as well return now - no other way to open this */
2008 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1999 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2009 return 1; 2000 return 1;
2010 } 2001 }
2002
2011 return 0; 2003 return 0;
2012} 2004}
2013 2005
2014/* This function is just part of a breakup from move_player. 2006/* This function is just part of a breakup from move_player.
2015 * It should keep the code cleaner. 2007 * It should keep the code cleaner.
… …
2221 return 0; 2213 return 0;
2222 } 2214 }
2223 2215
2224 /* peterm: added following line */ 2216 /* peterm: added following line */
2225 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2217 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2226 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2218 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2227 2219
2228 op->facing = dir; 2220 op->facing = dir;
2229 2221
2230 if (op->hide) 2222 if (op->hide)
2231 do_hidden_move (op); 2223 do_hidden_move (op);
… …
2372 * from. 2364 * from.
2373 */ 2365 */
2374void 2366void
2375remove_unpaid_objects (object *op, object *env) 2367remove_unpaid_objects (object *op, object *env)
2376{ 2368{
2377 object *next;
2378
2379 while (op) 2369 while (op)
2380 { 2370 {
2381 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2371 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2382 2372
2383 if (QUERY_FLAG (op, FLAG_UNPAID)) 2373 if (QUERY_FLAG (op, FLAG_UNPAID))
… …
2713 tmp->name = buf; 2703 tmp->name = buf;
2714 sprintf (buf, " This finger has been cut off %s\n" 2704 sprintf (buf, " This finger has been cut off %s\n"
2715 " the %s, when he was defeated at\n level %d by %s.\n", 2705 " the %s, when he was defeated at\n level %d by %s.\n",
2716 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2706 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2717 tmp->msg = buf; 2707 tmp->msg = buf;
2718 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2708 tmp->value = 0, tmp->type = 0;
2719 tmp->materialname = NULL; 2709 tmp->materialname = "organics";
2720 tmp->insert_at (op, tmp); 2710 tmp->insert_at (op, tmp);
2721 } 2711 }
2722 2712
2723 /* teleport defeated player to new destination */ 2713 /* teleport defeated player to new destination */
2724 transfer_ob (op, x, y, 0, NULL); 2714 transfer_ob (op, x, y, 0, NULL);
… …
2976void 2966void
2977loot_object (object *op) 2967loot_object (object *op)
2978{ /* Grab and destroy some treasure */ 2968{ /* Grab and destroy some treasure */
2979 object *tmp, *tmp2, *next; 2969 object *tmp, *tmp2, *next;
2980 2970
2981 if (op->container) 2971 op->close_container (); /* close open sack first */
2982 esrv_apply_container (op, op->container); /* close open sack first */
2983 2972
2984 for (tmp = op->inv; tmp; tmp = next) 2973 for (tmp = op->inv; tmp; tmp = next)
2985 { 2974 {
2986 next = tmp->below; 2975 next = tmp->below;
2987 2976
2988 if (tmp->invisible) 2977 if (tmp->invisible)
2989 continue; 2978 continue;
2990 2979
2991 tmp->remove (); 2980 tmp->remove ();
2992 tmp->x = op->x, tmp->y = op->y; 2981 tmp->x = op->x, tmp->y = op->y;
2982
2993 if (tmp->type == CONTAINER) 2983 if (tmp->type == CONTAINER)
2994 { /* empty container to ground */ 2984 loot_object (tmp); /* empty container to ground */
2995 loot_object (tmp); 2985
2996 }
2997 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2986 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2998 { 2987 {
2999 if (tmp->nrof > 1) 2988 if (tmp->nrof > 1)
3000 { 2989 {
3001 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2990 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3002 tmp2->destroy (); 2991 tmp2->destroy ();
… …
3013/* 3002/*
3014 * fix_weight(): Check recursively the weight of all players, and fix 3003 * fix_weight(): Check recursively the weight of all players, and fix
3015 * what needs to be fixed. Refresh windows and fix speed if anything 3004 * what needs to be fixed. Refresh windows and fix speed if anything
3016 * was changed. 3005 * was changed.
3017 */ 3006 */
3018
3019void 3007void
3020fix_weight (void) 3008fix_weight (void)
3021{ 3009{
3022 for_all_players (pl) 3010 for_all_players (pl)
3023 { 3011 {
… …
3089} 3077}
3090 3078
3091int 3079int
3092is_true_undead (object *op) 3080is_true_undead (object *op)
3093{ 3081{
3094 object *tmp = NULL;
3095
3096 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3082 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3097 return 1; 3083 return 1;
3098 3084
3099 return 0; 3085 return 0;
3100} 3086}
… …
3536 * not readied. 3522 * not readied.
3537 */ 3523 */
3538void 3524void
3539player_unready_range_ob (player *pl, object *ob) 3525player_unready_range_ob (player *pl, object *ob)
3540{ 3526{
3541 rangetype i;
3542
3543 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3527 for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))
3544 {
3545 if (pl->ranges[i] == ob) 3528 if (pl->ranges[i] == ob)
3546 { 3529 {
3547 pl->ranges[i] = NULL; 3530 pl->ranges[i] = 0;
3548 if (pl->shoottype == i) 3531 if (pl->shoottype == i)
3549 {
3550 pl->shoottype = range_none; 3532 pl->shoottype = range_none;
3551 }
3552 } 3533 }
3553 }
3554} 3534}
3535
3536sint8
3537player::visibility_at (maptile *map, int x, int y) const
3538{
3539 if (!ns)
3540 return 0;
3541
3542 int dx, dy;
3543 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3544 return 0;
3545
3546 x += dx - ns->current_x + ns->mapx / 2;
3547 y += dy - ns->current_y + ns->mapy / 2;
3548
3549 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3550 return 0;
3551
3552 return 100 - blocked_los [x][y];
3553}

Diff Legend

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