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.96 by root, Mon Jan 8 19:25:53 2007 UTC vs.
Revision 1.111 by root, Mon Apr 23 11:43:22 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 == '%')
127 { /* send one news */ 127 { /* send one news */
128 if (size > 0) 128 if (size > 0)
129 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /*send previously read news */ 129 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news); /*send previously read news */
130 130
131 strcpy (subject, buf + 1); 131 strcpy (subject, buf + 1);
132 strip_endline (subject); 132 strip_endline (subject);
133 size = 0; 133 size = 0;
134 news[0] = '\0'; 134 news[0] = '\0';
… …
144 size += strlen (buf); 144 size += strlen (buf);
145 } 145 }
146 } 146 }
147 147
148 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 148 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
149 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news); 149 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
150 close_and_delete (fp, comp); 150 close_and_delete (fp, comp);
151} 151}
152 152
153/* This loads the first map an puts the player on it. */ 153/* This loads the first map an puts the player on it. */
154static void 154static void
… …
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
200 if (ob->map)
201 maplevel = ob->map->path;
202
199 ob->remove (); 203 ob->remove ();
200 ob->map = 0; 204 ob->map = 0;
205 party = 0;
201 206
202 // for weird reasons, this is often "ob", keeping a circular reference 207 // for weird reasons, this is often "ob", keeping a circular reference
203 ranges [range_skill] = 0; 208 ranges [range_skill] = 0;
204 209
205 players.erase (this); 210 players.erase (this);
… …
213 this->ns = ns; 218 this->ns = ns;
214 ns->pl = this; 219 ns->pl = this;
215 220
216 run_on = 0; 221 run_on = 0;
217 fire_on = 0; 222 fire_on = 0;
223 ob->close_container (); //TODO: client-specific
218 224
219 ns->update_look = 0; 225 ns->update_look = 0;
220 ns->look_position = 0; 226 ns->look_position = 0;
221 227
222 clear_los (ob); 228 clear_los (ob);
… …
234 link_player_skills (ob); 240 link_player_skills (ob);
235 241
236 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 242 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
237 243
238 assign (title, ob->arch->clone.name); 244 assign (title, ob->arch->clone.name);
239
240 /* can_use_shield is a new flag. However, the can_use.. seems to largely come
241 * from the class, and not race. I don't see any way to get the class information
242 * to then update this. I don't think this will actually break anything - anyone
243 * that can use armour should be able to use a shield. What this may 'break'
244 * are features new characters get, eg, if someone starts up with a Q, they
245 * should be able to use a shield. However, old Q's won't get that advantage.
246 */
247 if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
248 SET_FLAG (ob, FLAG_USE_SHIELD);
249 245
250 /* if it's a dragon player, set the correct title here */ 246 /* if it's a dragon player, set the correct title here */
251 if (is_dragon_pl (ob)) 247 if (is_dragon_pl (ob))
252 { 248 {
253 object *tmp, *abil = 0, *skin = 0; 249 object *tmp, *abil = 0, *skin = 0;
… …
293 if (active) 289 if (active)
294 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); 290 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
295 291
296 INVOKE_PLAYER (DISCONNECT, this); 292 INVOKE_PLAYER (DISCONNECT, this);
297 293
294 ns->reset_stats ();
298 ns->pl = 0; 295 ns->pl = 0;
299 this->ns = 0; 296 this->ns = 0;
300 } 297 }
298
299 if (ob)
300 ob->close_container (); //TODO: client-specific
301 301
302 deactivate (); 302 deactivate ();
303} 303}
304 304
305// the need for this function can be explained 305// the need for this function can be explained
306// by load_object not returning the object 306// by load_object not returning the object
307void 307void
308player::set_object (object *op) 308player::set_object (object *op)
309{ 309{
310 ob = op; 310 ob = op;
311 ob->contr = this; /* this aren't yet in archetype */ 311 ob->contr = this; /* this aren't yet in archetype */
312 312
313 ob->speed_left = 0.5; 313 ob->speed_left = 0.5;
314 ob->speed = 1.0; 314 ob->speed = 1.0;
315 ob->direction = 5; /* So player faces south */ 315 ob->direction = 5; /* So player faces south */
316 ob->stats.wc = 2;
317 ob->run_away = 25; /* Then we panick... */
318
319 ob->roll_stats ();
320} 316}
321 317
322player::player () 318player::player ()
323{ 319{
324 /* There are some elements we want initialised to non zero value - 320 /* There are some elements we want initialised to non zero value -
325 * we deal with that below this point. 321 * we deal with that below this point.
326 */ 322 */
327 outputs_sync = 16; /* Every 2 seconds */ 323 outputs_sync = 6; /* Every 2 seconds */
328 outputs_count = 8; /* Keeps present behaviour */ 324 outputs_count = 10; /* Keeps present behaviour */
329 unapply = unapply_nochoice; 325 unapply = unapply_nochoice;
330 326
331 savebed_map = first_map_path; /* Init. respawn position */ 327 savebed_map = first_map_path; /* Init. respawn position */
332 328
333 gen_sp_armour = 10; 329 gen_sp_armour = 10;
… …
368player::create () 364player::create ()
369{ 365{
370 player *pl = new player; 366 player *pl = new player;
371 367
372 pl->set_object (arch_to_object (get_player_archetype (0))); 368 pl->set_object (arch_to_object (get_player_archetype (0)));
369
370 pl->ob->roll_stats ();
371 pl->ob->stats.wc = 2;
372 pl->ob->run_away = 25; /* Then we panick... */
373
373 set_first_map (pl->ob); 374 set_first_map (pl->ob);
374 375
375 return pl; 376 return pl;
376} 377}
377 378
… …
523 x = mon->x; 524 x = mon->x;
524 y = mon->y; 525 y = mon->y;
525 m = mon->map; 526 m = mon->map;
526 dir = rv.direction; 527 dir = rv.direction;
527 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 528 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
528 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 529 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
530
529 /* If we can't solve it within the search distance, return now. */ 531 /* If we can't solve it within the search distance, return now. */
530 if (diff > max) 532 if (diff > max)
531 return 0; 533 return 0;
534
532 while (diff > 1 && max > 0) 535 while (diff > 1 && max > 0)
533 { 536 {
534 lastx = x; 537 lastx = x;
535 lasty = y; 538 lasty = y;
536 lastmap = m; 539 lastmap = m;
… …
618 max--; 621 max--;
619 lastdir = dir; 622 lastdir = dir;
620 if (!firstdir) 623 if (!firstdir)
621 firstdir = dir; 624 firstdir = dir;
622 } 625 }
626
623 if (diff <= 1) 627 if (diff <= 1)
624 { 628 {
625 /* Recalculate diff (distance) because we may not have actually 629 /* Recalculate diff (distance) because we may not have actually
626 * headed toward player for entire distance. 630 * headed toward player for entire distance.
627 */ 631 */
628 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 632 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
629 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 633 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
630 } 634 }
635
631 if (diff > max) 636 if (diff > max)
632 return 0; 637 return 0;
633 } 638 }
639
634 /* If we reached the max, didn't find a direction in time */ 640 /* If we reached the max, didn't find a direction in time */
635 if (!max) 641 if (!max)
636 return 0; 642 return 0;
637 643
638 return firstdir; 644 return firstdir;
… …
752roll_stat (void) 758roll_stat (void)
753{ 759{
754 int a[4], i, j, k; 760 int a[4], i, j, k;
755 761
756 for (i = 0; i < 4; i++) 762 for (i = 0; i < 4; i++)
757 a[i] = (int) RANDOM () % 6 + 1; 763 a[i] = (int) rndm (6) + 1;
758 764
759 for (i = 0, j = 0, k = 7; i < 4; i++) 765 for (i = 0, j = 0, k = 7; i < 4; i++)
760 if (a[i] < k) 766 if (a[i] < k)
761 k = a[i], j = i; 767 k = a[i], j = i;
762 768
… …
874 char buf[MAX_BUF]; 880 char buf[MAX_BUF];
875 881
876 /* this must before then initial items are given */ 882 /* this must before then initial items are given */
877 esrv_new_player (op->contr, op->weight + op->carrying); 883 esrv_new_player (op->contr, op->weight + op->carrying);
878 884
879 treasurelist *tl = find_treasurelist ("starting_wealth"); 885 treasurelist *tl = treasurelist::find ("starting_wealth");
880 if (tl) 886 if (tl)
881 create_treasure (tl, op, 0, 0, 0); 887 create_treasure (tl, op, 0, 0, 0);
882 888
883 INVOKE_PLAYER (BIRTH, op->contr); 889 INVOKE_PLAYER (BIRTH, op->contr);
884 INVOKE_PLAYER (LOGIN, op->contr); 890 INVOKE_PLAYER (LOGIN, op->contr);
… …
1027int 1033int
1028check_pick (object *op) 1034check_pick (object *op)
1029{ 1035{
1030 object *tmp, *next; 1036 object *tmp, *next;
1031 int stop = 0; 1037 int stop = 0;
1032 int j, k, wvratio; 1038 int wvratio;
1033 char putstring[128], tmpstr[16]; 1039 char putstring[128];
1034 1040
1035 /* if you're flying, you cna't pick up anything */ 1041 /* if you're flying, you cna't pick up anything */
1036 if (op->move_type & MOVE_FLYING) 1042 if (op->move_type & MOVE_FLYING)
1037 return 1; 1043 return 1;
1038 1044
… …
1375 * found object is returned. 1381 * found object is returned.
1376 */ 1382 */
1377object * 1383object *
1378find_arrow (object *op, const char *type) 1384find_arrow (object *op, const char *type)
1379{ 1385{
1380 object *tmp = NULL; 1386 object *tmp = 0;
1381 1387
1382 for (op = op->inv; op; op = op->below) 1388 for (op = op->inv; op; op = op->below)
1383 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1389 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1384 tmp = find_arrow (op, type); 1390 tmp = find_arrow (op, type);
1385 else if (op->type == ARROW && op->race == type) 1391 else if (op->type == ARROW && op->race == type)
1386 return op; 1392 return op;
1393
1387 return tmp; 1394 return tmp;
1388} 1395}
1389 1396
1390/* 1397/*
1391 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1398 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1392 * against the target. A full test is not performed, simply a basic test 1399 * against the target. A full test is not performed, simply a basic test
1393 * of resistances. The archer is making a quick guess at what he sees down 1400 * of resistances. The archer is making a quick guess at what he sees down
1394 * the hall. Failing that it does it's best to pick the highest plus arrow. 1401 * the hall. Failing that it does it's best to pick the highest plus arrow.
1395 */ 1402 */
1396
1397object * 1403object *
1398find_better_arrow (object *op, object *target, const char *type, int *better) 1404find_better_arrow (object *op, object *target, const char *type, int *better)
1399{ 1405{
1400 object *tmp = NULL, *arrow, *ntmp; 1406 object *tmp = NULL, *arrow, *ntmp;
1401 int attacknum, attacktype, betterby = 0, i; 1407 int attacknum, attacktype, betterby = 0, i;
… …
1861 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type."); 1867 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1862 return; 1868 return;
1863 } 1869 }
1864} 1870}
1865 1871
1866
1867
1868/* find_key 1872/* find_key
1869 * We try to find a key for the door as passed. If we find a key 1873 * We try to find a key for the door as passed. If we find a key
1870 * and successfully use it, we return the key, otherwise NULL 1874 * and successfully use it, we return the key, otherwise NULL
1871 * This function merges both normal and locked door, since the logic 1875 * This function merges both normal and locked door, since the logic
1872 * for both is the same - just the specific key is different. 1876 * for both is the same - just the specific key is different.
1873 * pl is the player, 1877 * pl is the player,
1874 * inv is the objects inventory to searched 1878 * inv is the objects inventory to searched
1875 * door is the door we are trying to match against. 1879 * door is the door we are trying to match against.
1876 * This function can be called recursively to search containers. 1880 * This function can be called recursively to search containers.
1877 */ 1881 */
1878
1879object * 1882object *
1880find_key (object *pl, object *container, object *door) 1883find_key (object *pl, object *container, object *door)
1881{ 1884{
1882 object *tmp, *key; 1885 object *tmp, *key;
1883 1886
1884 /* Should not happen, but sanity checking is never bad */ 1887 /* Should not happen, but sanity checking is never bad */
1885 if (container->inv == NULL) 1888 if (!container->inv)
1886 return NULL; 1889 return 0;
1887 1890
1888 /* First, lets try to find a key in the top level inventory */ 1891 /* First, lets try to find a key in the top level inventory */
1889 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1892 for (tmp = container->inv; tmp; tmp = tmp->below)
1890 { 1893 {
1891 if (door->type == DOOR && tmp->type == KEY) 1894 if (door->type == DOOR && tmp->type == KEY)
1892 break; 1895 break;
1893 /* For sanity, we should really check door type, but other stuff 1896 /* For sanity, we should really check door type, but other stuff
1894 * (like containers) can be locked with special keys 1897 * (like containers) can be locked with special keys
1895 */ 1898 */
1896 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1899 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1897 break; 1900 break;
1898 } 1901 }
1902
1899 /* No key found - lets search inventories now */ 1903 /* No key found - lets search inventories now */
1900 /* If we find and use a key in an inventory, return at that time. 1904 /* If we find and use a key in an inventory, return at that time.
1901 * otherwise, if we search all the inventories and still don't find 1905 * otherwise, if we search all the inventories and still don't find
1902 * a key, return 1906 * a key, return
1903 */ 1907 */
1904 if (!tmp) 1908 if (!tmp)
1905 { 1909 {
1906 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1910 for (tmp = container->inv; tmp; tmp = tmp->below)
1907 { 1911 {
1908 /* No reason to search empty containers */ 1912 /* No reason to search empty containers */
1909 if (tmp->type == CONTAINER && tmp->inv) 1913 if (tmp->type == CONTAINER && tmp->inv)
1910 { 1914 {
1911 if ((key = find_key (pl, tmp, door)) != NULL) 1915 if ((key = find_key (pl, tmp, door)))
1912 return key; 1916 return key;
1913 } 1917 }
1914 } 1918 }
1919
1915 if (!tmp) 1920 if (!tmp)
1916 return NULL; 1921 return NULL;
1917 } 1922 }
1923
1918 /* We get down here if we have found a key. Now if its in a container, 1924 /* We get down here if we have found a key. Now if its in a container,
1919 * see if we actually want to use it 1925 * see if we actually want to use it
1920 */ 1926 */
1921 if (pl != container) 1927 if (pl != container)
1922 { 1928 {
… …
1943 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1949 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1944 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1950 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1945 return NULL; 1951 return NULL;
1946 } 1952 }
1947 } 1953 }
1954
1948 return tmp; 1955 return tmp;
1949} 1956}
1950 1957
1951/* moved door processing out of move_player_attack. 1958/* moved door processing out of move_player_attack.
1952 * returns 1 if player has opened the door with a key 1959 * returns 1 if player has opened the door with a key
… …
1970 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1977 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1971 if (action_makes_visible (op)) 1978 if (action_makes_visible (op))
1972 make_visible (op); 1979 make_visible (op);
1973 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1980 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1974 spring_trap (door->inv, op); 1981 spring_trap (door->inv, op);
1982
1975 if (door->type == DOOR) 1983 if (door->type == DOOR)
1976 {
1977 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1984 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1978 }
1979 else if (door->type == LOCKED_DOOR) 1985 else if (door->type == LOCKED_DOOR)
1980 { 1986 {
1981 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1987 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
1982 remove_door2 (door); /* remove door without violence ;-) */ 1988 remove_door2 (door); /* remove door without violence ;-) */
1983 } 1989 }
1990
1984 /* Do this after we print the message */ 1991 /* Do this after we print the message */
1985 decrease_ob (key); /* Use up one of the keys */ 1992 decrease_ob (key); /* Use up one of the keys */
1986 /* Need to update the weight the container the key was in */ 1993 /* Need to update the weight the container the key was in */
1987 if (container != op) 1994 if (container != op)
1988 esrv_update_item (UPD_WEIGHT, op, container); 1995 esrv_update_item (UPD_WEIGHT, op, container);
1996
1989 return 1; /* Nothing more to do below */ 1997 return 1; /* Nothing more to do below */
1990 } 1998 }
1991 else if (door->type == LOCKED_DOOR) 1999 else if (door->type == LOCKED_DOOR)
1992 { 2000 {
1993 /* Might as well return now - no other way to open this */ 2001 /* Might as well return now - no other way to open this */
1994 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 2002 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
1995 return 1; 2003 return 1;
1996 } 2004 }
2005
1997 return 0; 2006 return 0;
1998} 2007}
1999 2008
2000/* This function is just part of a breakup from move_player. 2009/* This function is just part of a breakup from move_player.
2001 * It should keep the code cleaner. 2010 * It should keep the code cleaner.
… …
2207 return 0; 2216 return 0;
2208 } 2217 }
2209 2218
2210 /* peterm: added following line */ 2219 /* peterm: added following line */
2211 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2220 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2212 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2221 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2213 2222
2214 op->facing = dir; 2223 op->facing = dir;
2215 2224
2216 if (op->hide) 2225 if (op->hide)
2217 do_hidden_move (op); 2226 do_hidden_move (op);
… …
2250 * Returns true if there are more actions we can do. 2259 * Returns true if there are more actions we can do.
2251 */ 2260 */
2252int 2261int
2253handle_newcs_player (object *op) 2262handle_newcs_player (object *op)
2254{ 2263{
2255 if (op->contr->hidden)
2256 {
2257 op->invisible = 1000;
2258 /* the socket code flashes the player visible/invisible
2259 * depending on the value of invisible, so we need to
2260 * alternate it here for it to work correctly.
2261 */
2262 if (pticks & 2)
2263 op->invisible--;
2264 }
2265 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2266 {
2267 op->invisible--;
2268 if (!op->invisible)
2269 {
2270 make_visible (op);
2271 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2272 }
2273 }
2274
2275 if (QUERY_FLAG (op, FLAG_SCARED)) 2264 if (QUERY_FLAG (op, FLAG_SCARED))
2276 { 2265 {
2277 flee_player (op); 2266 flee_player (op);
2278 /* If player is still scared, that is his action for this tick */ 2267 /* If player is still scared, that is his action for this tick */
2279 if (QUERY_FLAG (op, FLAG_SCARED)) 2268 if (QUERY_FLAG (op, FLAG_SCARED))
… …
2358 * from. 2347 * from.
2359 */ 2348 */
2360void 2349void
2361remove_unpaid_objects (object *op, object *env) 2350remove_unpaid_objects (object *op, object *env)
2362{ 2351{
2363 object *next;
2364
2365 while (op) 2352 while (op)
2366 { 2353 {
2367 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2354 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2368 2355
2369 if (QUERY_FLAG (op, FLAG_UNPAID)) 2356 if (QUERY_FLAG (op, FLAG_UNPAID))
… …
2435 int rate_grace = 2000; 2422 int rate_grace = 2000;
2436 const int max_hp = 1; 2423 const int max_hp = 1;
2437 const int max_sp = 1; 2424 const int max_sp = 1;
2438 const int max_grace = 1; 2425 const int max_grace = 1;
2439 2426
2427 if (op->contr->hidden)
2428 {
2429 op->invisible = 1000;
2430 /* the socket code flashes the player visible/invisible
2431 * depending on the value of invisible, so we need to
2432 * alternate it here for it to work correctly.
2433 */
2434 if (pticks & 2)
2435 op->invisible--;
2436 }
2437 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2438 {
2439 if (!op->invisible--)
2440 {
2441 make_visible (op);
2442 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2443 }
2444 }
2445
2440 if (op->contr->outputs_sync) 2446 if (op->contr->outputs_sync)
2441 {
2442 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2447 for (i = 0; i < NUM_OUTPUT_BUFS; i++)
2443 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2448 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)
2444 flush_output_element (op, &op->contr->outputs[i]); 2449 flush_output_element (op, &op->contr->outputs[i]);
2445 }
2446 2450
2447 if (op->contr->ns->state == ST_PLAYING) 2451 if (op->contr->ns->state == ST_PLAYING)
2448 { 2452 {
2449 /* these next three if clauses make it possible to SLOW DOWN 2453 /* these next three if clauses make it possible to SLOW DOWN
2450 hp/grace/spellpoint regeneration. */ 2454 hp/grace/spellpoint regeneration. */
… …
2699 tmp->name = buf; 2703 tmp->name = buf;
2700 sprintf (buf, " This finger has been cut off %s\n" 2704 sprintf (buf, " This finger has been cut off %s\n"
2701 " 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",
2702 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2706 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2703 tmp->msg = buf; 2707 tmp->msg = buf;
2704 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2708 tmp->value = 0, tmp->type = 0;
2705 tmp->materialname = NULL; 2709 tmp->materialname = "organics";
2706 tmp->insert_at (op, tmp); 2710 tmp->insert_at (op, tmp);
2707 } 2711 }
2708 2712
2709 /* teleport defeated player to new destination */ 2713 /* teleport defeated player to new destination */
2710 transfer_ob (op, x, y, 0, NULL); 2714 transfer_ob (op, x, y, 0, NULL);
… …
2906 op->stats.hp = op->stats.maxhp; 2910 op->stats.hp = op->stats.maxhp;
2907 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2911 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2908 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2912 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2909 2913
2910 /* 2914 /*
2911 * Check to see if the player is in a shop. IF so, then check to see if
2912 * the player has any unpaid items. If so, remove them and put them back 2915 * Check to see if the player has any unpaid items. If so, remove them
2913 * in the map. 2916 * and put them back in the map.
2914 */ 2917 */
2915
2916 if (is_in_shop (op))
2917 remove_unpaid_objects (op->inv, op); 2918 remove_unpaid_objects (op->inv, op);
2918 2919
2919 /****************************************/ 2920 /****************************************/
2920 /* */ 2921 /* */
2921 /* Move player to his current respawn- */ 2922 /* Move player to his current respawn- */
2922 /* position (usually last savebed) */ 2923 /* position (usually last savebed) */
… …
2962void 2963void
2963loot_object (object *op) 2964loot_object (object *op)
2964{ /* Grab and destroy some treasure */ 2965{ /* Grab and destroy some treasure */
2965 object *tmp, *tmp2, *next; 2966 object *tmp, *tmp2, *next;
2966 2967
2967 if (op->container) 2968 op->close_container (); /* close open sack first */
2968 esrv_apply_container (op, op->container); /* close open sack first */
2969 2969
2970 for (tmp = op->inv; tmp; tmp = next) 2970 for (tmp = op->inv; tmp; tmp = next)
2971 { 2971 {
2972 next = tmp->below; 2972 next = tmp->below;
2973 2973
2974 if (tmp->invisible) 2974 if (tmp->invisible)
2975 continue; 2975 continue;
2976 2976
2977 tmp->remove (); 2977 tmp->remove ();
2978 tmp->x = op->x, tmp->y = op->y; 2978 tmp->x = op->x, tmp->y = op->y;
2979
2979 if (tmp->type == CONTAINER) 2980 if (tmp->type == CONTAINER)
2980 { /* empty container to ground */ 2981 loot_object (tmp); /* empty container to ground */
2981 loot_object (tmp); 2982
2982 }
2983 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2983 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2984 { 2984 {
2985 if (tmp->nrof > 1) 2985 if (tmp->nrof > 1)
2986 { 2986 {
2987 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2987 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
2988 tmp2->destroy (); 2988 tmp2->destroy ();
… …
2999/* 2999/*
3000 * fix_weight(): Check recursively the weight of all players, and fix 3000 * fix_weight(): Check recursively the weight of all players, and fix
3001 * what needs to be fixed. Refresh windows and fix speed if anything 3001 * what needs to be fixed. Refresh windows and fix speed if anything
3002 * was changed. 3002 * was changed.
3003 */ 3003 */
3004
3005void 3004void
3006fix_weight (void) 3005fix_weight (void)
3007{ 3006{
3008 for_all_players (pl) 3007 for_all_players (pl)
3009 { 3008 {
… …
3069 if (op->type == PLAYER) 3068 if (op->type == PLAYER)
3070 { 3069 {
3071 op->contr->tmp_invis = 0; 3070 op->contr->tmp_invis = 0;
3072 op->contr->invis_race = 0; 3071 op->contr->invis_race = 0;
3073 } 3072 }
3073
3074 update_object (op, UP_OBJ_FACE); 3074 update_object (op, UP_OBJ_CHANGE);
3075} 3075}
3076 3076
3077int 3077int
3078is_true_undead (object *op) 3078is_true_undead (object *op)
3079{ 3079{
3080 object *tmp = NULL;
3081
3082 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3080 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3083 return 1; 3081 return 1;
3084 3082
3085 return 0; 3083 return 0;
3086} 3084}
… …
3374 char buf[MAX_BUF]; /* tmp. string buffer */ 3372 char buf[MAX_BUF]; /* tmp. string buffer */
3375 int i = 0, j = 0; 3373 int i = 0, j = 0;
3376 3374
3377 /* get the appropriate treasurelist */ 3375 /* get the appropriate treasurelist */
3378 if (atnr == ATNR_FIRE) 3376 if (atnr == ATNR_FIRE)
3379 trlist = find_treasurelist ("dragon_ability_fire"); 3377 trlist = treasurelist::find ("dragon_ability_fire");
3380 else if (atnr == ATNR_COLD) 3378 else if (atnr == ATNR_COLD)
3381 trlist = find_treasurelist ("dragon_ability_cold"); 3379 trlist = treasurelist::find ("dragon_ability_cold");
3382 else if (atnr == ATNR_ELECTRICITY) 3380 else if (atnr == ATNR_ELECTRICITY)
3383 trlist = find_treasurelist ("dragon_ability_elec"); 3381 trlist = treasurelist::find ("dragon_ability_elec");
3384 else if (atnr == ATNR_POISON) 3382 else if (atnr == ATNR_POISON)
3385 trlist = find_treasurelist ("dragon_ability_poison"); 3383 trlist = treasurelist::find ("dragon_ability_poison");
3386 3384
3387 if (trlist == NULL || who->type != PLAYER) 3385 if (trlist == NULL || who->type != PLAYER)
3388 return; 3386 return;
3389 3387
3390 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3388 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
… …
3530 pl->ranges[i] = 0; 3528 pl->ranges[i] = 0;
3531 if (pl->shoottype == i) 3529 if (pl->shoottype == i)
3532 pl->shoottype = range_none; 3530 pl->shoottype = range_none;
3533 } 3531 }
3534} 3532}
3533
3534sint8
3535player::visibility_at (maptile *map, int x, int y) const
3536{
3537 if (!ns)
3538 return 0;
3539
3540 int dx, dy;
3541 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3542 return 0;
3543
3544 x += dx - ns->current_x + ns->mapx / 2;
3545 y += dy - ns->current_y + ns->mapy / 2;
3546
3547 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3548 return 0;
3549
3550 return 100 - blocked_los [x][y];
3551}

Diff Legend

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