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.89 by root, Sun Jan 7 02:39:14 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 == '%')
… …
180 180
181 players.insert (this); 181 players.insert (this);
182 ob->remove (); 182 ob->remove ();
183 ob->map = 0; 183 ob->map = 0;
184 ob->activate_recursive (); 184 ob->activate_recursive ();
185 CLEAR_FLAG (ob, FLAG_FRIENDLY);
186 add_friendly_object (ob);
185 enter_map (); 187 enter_map ();
186} 188}
187 189
188void 190void
189player::deactivate () 191player::deactivate ()
190{ 192{
191 if (!active) 193 if (!active)
192 return; 194 return;
193 195
194 terminate_all_pets (ob); 196 terminate_all_pets (ob);
197 remove_friendly_object (ob);
195 ob->deactivate_recursive (); 198 ob->deactivate_recursive ();
199 maplevel = ob->map->path;
196 ob->remove (); 200 ob->remove ();
197 ob->map = 0; 201 ob->map = 0;
202 party = 0;
203
204 // for weird reasons, this is often "ob", keeping a circular reference
205 ranges [range_skill] = 0;
198 206
199 players.erase (this); 207 players.erase (this);
200} 208}
201 209
202// connect the player with a specific client 210// connect the player with a specific client
… …
205player::connect (client *ns) 213player::connect (client *ns)
206{ 214{
207 this->ns = ns; 215 this->ns = ns;
208 ns->pl = this; 216 ns->pl = this;
209 217
218 run_on = 0;
219 fire_on = 0;
220 ob->close_container (); //TODO: client-specific
221
210 ns->update_look = 0; 222 ns->update_look = 0;
211 ns->look_position = 0; 223 ns->look_position = 0;
212 224
213 clear_los (ob); 225 clear_los (ob);
226
227 ns->reset_stats ();
214 228
215 /* make sure he's a player -- needed because of class change. */ 229 /* make sure he's a player -- needed because of class change. */
216 ob->type = PLAYER; // we are paranoid 230 ob->type = PLAYER; // we are paranoid
217 ob->race = ob->arch->clone.race; 231 ob->race = ob->arch->clone.race;
218 232
… …
223 link_player_skills (ob); 237 link_player_skills (ob);
224 238
225 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 239 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
226 240
227 assign (title, ob->arch->clone.name); 241 assign (title, ob->arch->clone.name);
228
229 /* can_use_shield is a new flag. However, the can_use.. seems to largely come
230 * from the class, and not race. I don't see any way to get the class information
231 * to then update this. I don't think this will actually break anything - anyone
232 * that can use armour should be able to use a shield. What this may 'break'
233 * are features new characters get, eg, if someone starts up with a Q, they
234 * should be able to use a shield. However, old Q's won't get that advantage.
235 */
236 if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
237 SET_FLAG (ob, FLAG_USE_SHIELD);
238 242
239 /* if it's a dragon player, set the correct title here */ 243 /* if it's a dragon player, set the correct title here */
240 if (is_dragon_pl (ob)) 244 if (is_dragon_pl (ob))
241 { 245 {
242 object *tmp, *abil = 0, *skin = 0; 246 object *tmp, *abil = 0, *skin = 0;
… …
252 skin = tmp; 256 skin = tmp;
253 257
254 set_dragon_name (ob, abil, skin); 258 set_dragon_name (ob, abil, skin);
255 } 259 }
256 260
257 CLEAR_FLAG (ob, FLAG_FRIENDLY);
258 add_friendly_object (ob);
259
260 LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
261
262 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 261 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
263 262
264 esrv_new_player (this, ob->weight + ob->carrying); 263 esrv_new_player (this, ob->weight + ob->carrying);
265 264
266 ob->update_stats (); 265 ob->update_stats ();
… …
280} 279}
281 280
282void 281void
283player::disconnect () 282player::disconnect ()
284{ 283{
285 //TODO: don't be so harsh and destroy :)
286 if (ns) 284 if (ns)
287 { 285 {
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
… …
420 object *op = NULL; 407 object *op = NULL;
421 objectlink *ol; 408 objectlink *ol;
422 unsigned lastdist; 409 unsigned lastdist;
423 rv_vector rv; 410 rv_vector rv;
424 411
425 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 412 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
426 { 413 {
427 /* We should not find free objects on this friendly list, but it 414 /* We should not find free objects on this friendly list, but it
428 * does periodically happen. Given that, lets deal with it. 415 * does periodically happen. Given that, lets deal with it.
429 * While unlikely, it is possible the next object on the friendly 416 * While unlikely, it is possible the next object on the friendly
430 * list is also free, so encapsulate this in a while loop. 417 * list is also free, so encapsulate this in a while loop.
… …
434 object *tmp = ol->ob; 421 object *tmp = ol->ob;
435 422
436 /* Can't do much more other than log the fact, because the object 423 /* Can't do much more other than log the fact, because the object
437 * itself will have been cleared. 424 * itself will have been cleared.
438 */ 425 */
439 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n"); 426 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
427 tmp->debug_desc ());
440 ol = ol->next; 428 ol = ol->next;
441 remove_friendly_object (tmp); 429 remove_friendly_object (tmp);
442 if (!ol) 430 if (!ol)
443 return op; 431 return op;
444 } 432 }
… …
533 x = mon->x; 521 x = mon->x;
534 y = mon->y; 522 y = mon->y;
535 m = mon->map; 523 m = mon->map;
536 dir = rv.direction; 524 dir = rv.direction;
537 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 */
538 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
539 /* 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. */
540 if (diff > max) 529 if (diff > max)
541 return 0; 530 return 0;
531
542 while (diff > 1 && max > 0) 532 while (diff > 1 && max > 0)
543 { 533 {
544 lastx = x; 534 lastx = x;
545 lasty = y; 535 lasty = y;
546 lastmap = m; 536 lastmap = m;
… …
628 max--; 618 max--;
629 lastdir = dir; 619 lastdir = dir;
630 if (!firstdir) 620 if (!firstdir)
631 firstdir = dir; 621 firstdir = dir;
632 } 622 }
623
633 if (diff <= 1) 624 if (diff <= 1)
634 { 625 {
635 /* Recalculate diff (distance) because we may not have actually 626 /* Recalculate diff (distance) because we may not have actually
636 * headed toward player for entire distance. 627 * headed toward player for entire distance.
637 */ 628 */
638 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 629 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
639 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));
640 } 631 }
632
641 if (diff > max) 633 if (diff > max)
642 return 0; 634 return 0;
643 } 635 }
636
644 /* 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 */
645 if (!max) 638 if (!max)
646 return 0; 639 return 0;
647 640
648 return firstdir; 641 return firstdir;
… …
762roll_stat (void) 755roll_stat (void)
763{ 756{
764 int a[4], i, j, k; 757 int a[4], i, j, k;
765 758
766 for (i = 0; i < 4; i++) 759 for (i = 0; i < 4; i++)
767 a[i] = (int) RANDOM () % 6 + 1; 760 a[i] = (int) rndm (6) + 1;
768 761
769 for (i = 0, j = 0, k = 7; i < 4; i++) 762 for (i = 0, j = 0, k = 7; i < 4; i++)
770 if (a[i] < k) 763 if (a[i] < k)
771 k = a[i], j = i; 764 k = a[i], j = i;
772 765
… …
902 * to save here. 895 * to save here.
903 */ 896 */
904 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 897 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);
905 make_path_to_file (buf); 898 make_path_to_file (buf);
906 899
907#ifdef AUTOSAVE
908 op->contr->last_save_tick = pticks;
909#endif
910 start_info (op); 900 start_info (op);
911 CLEAR_FLAG (op, FLAG_WIZ); 901 CLEAR_FLAG (op, FLAG_WIZ);
912 give_initial_items (op, op->randomitems); 902 give_initial_items (op, op->randomitems);
913 link_player_skills (op); 903 link_player_skills (op);
914 esrv_send_inventory (op, op); 904 esrv_send_inventory (op, op);
… …
1040int 1030int
1041check_pick (object *op) 1031check_pick (object *op)
1042{ 1032{
1043 object *tmp, *next; 1033 object *tmp, *next;
1044 int stop = 0; 1034 int stop = 0;
1045 int j, k, wvratio; 1035 int wvratio;
1046 char putstring[128], tmpstr[16]; 1036 char putstring[128];
1047 1037
1048 /* if you're flying, you cna't pick up anything */ 1038 /* if you're flying, you cna't pick up anything */
1049 if (op->move_type & MOVE_FLYING) 1039 if (op->move_type & MOVE_FLYING)
1050 return 1; 1040 return 1;
1051 1041
… …
1388 * found object is returned. 1378 * found object is returned.
1389 */ 1379 */
1390object * 1380object *
1391find_arrow (object *op, const char *type) 1381find_arrow (object *op, const char *type)
1392{ 1382{
1393 object *tmp = NULL; 1383 object *tmp = 0;
1394 1384
1395 for (op = op->inv; op; op = op->below) 1385 for (op = op->inv; op; op = op->below)
1396 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))
1397 tmp = find_arrow (op, type); 1387 tmp = find_arrow (op, type);
1398 else if (op->type == ARROW && op->race == type) 1388 else if (op->type == ARROW && op->race == type)
1399 return op; 1389 return op;
1390
1400 return tmp; 1391 return tmp;
1401} 1392}
1402 1393
1403/* 1394/*
1404 * 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
1405 * 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
1406 * 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
1407 * 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.
1408 */ 1399 */
1409
1410object * 1400object *
1411find_better_arrow (object *op, object *target, const char *type, int *better) 1401find_better_arrow (object *op, object *target, const char *type, int *better)
1412{ 1402{
1413 object *tmp = NULL, *arrow, *ntmp; 1403 object *tmp = NULL, *arrow, *ntmp;
1414 int attacknum, attacktype, betterby = 0, i; 1404 int attacknum, attacktype, betterby = 0, i;
… …
1862 { 1852 {
1863 if (op->type == PLAYER) 1853 if (op->type == PLAYER)
1864 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use."); 1854 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1865 return; 1855 return;
1866 } 1856 }
1857
1867 (void) do_skill (op, op, op->chosen_skill, dir, NULL); 1858 do_skill (op, op, op->chosen_skill, dir, NULL);
1868 return; 1859 return;
1869 case range_builder: 1860 case range_builder:
1870 apply_map_builder (op, dir); 1861 apply_map_builder (op, dir);
1871 return; 1862 return;
1872 default: 1863 default:
1873 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type."); 1864 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1874 return; 1865 return;
1875 } 1866 }
1876} 1867}
1877
1878
1879 1868
1880/* find_key 1869/* find_key
1881 * 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
1882 * and successfully use it, we return the key, otherwise NULL 1871 * and successfully use it, we return the key, otherwise NULL
1883 * This function merges both normal and locked door, since the logic 1872 * This function merges both normal and locked door, since the logic
… …
1885 * pl is the player, 1874 * pl is the player,
1886 * inv is the objects inventory to searched 1875 * inv is the objects inventory to searched
1887 * door is the door we are trying to match against. 1876 * door is the door we are trying to match against.
1888 * This function can be called recursively to search containers. 1877 * This function can be called recursively to search containers.
1889 */ 1878 */
1890
1891object * 1879object *
1892find_key (object *pl, object *container, object *door) 1880find_key (object *pl, object *container, object *door)
1893{ 1881{
1894 object *tmp, *key; 1882 object *tmp, *key;
1895 1883
1896 /* Should not happen, but sanity checking is never bad */ 1884 /* Should not happen, but sanity checking is never bad */
1897 if (container->inv == NULL) 1885 if (!container->inv)
1898 return NULL; 1886 return 0;
1899 1887
1900 /* 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 */
1901 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1889 for (tmp = container->inv; tmp; tmp = tmp->below)
1902 { 1890 {
1903 if (door->type == DOOR && tmp->type == KEY) 1891 if (door->type == DOOR && tmp->type == KEY)
1904 break; 1892 break;
1905 /* For sanity, we should really check door type, but other stuff 1893 /* For sanity, we should really check door type, but other stuff
1906 * (like containers) can be locked with special keys 1894 * (like containers) can be locked with special keys
1907 */ 1895 */
1908 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1896 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1909 break; 1897 break;
1910 } 1898 }
1899
1911 /* No key found - lets search inventories now */ 1900 /* No key found - lets search inventories now */
1912 /* 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.
1913 * 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
1914 * a key, return 1903 * a key, return
1915 */ 1904 */
1916 if (!tmp) 1905 if (!tmp)
1917 { 1906 {
1918 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1907 for (tmp = container->inv; tmp; tmp = tmp->below)
1919 { 1908 {
1920 /* No reason to search empty containers */ 1909 /* No reason to search empty containers */
1921 if (tmp->type == CONTAINER && tmp->inv) 1910 if (tmp->type == CONTAINER && tmp->inv)
1922 { 1911 {
1923 if ((key = find_key (pl, tmp, door)) != NULL) 1912 if ((key = find_key (pl, tmp, door)))
1924 return key; 1913 return key;
1925 } 1914 }
1926 } 1915 }
1916
1927 if (!tmp) 1917 if (!tmp)
1928 return NULL; 1918 return NULL;
1929 } 1919 }
1920
1930 /* 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,
1931 * see if we actually want to use it 1922 * see if we actually want to use it
1932 */ 1923 */
1933 if (pl != container) 1924 if (pl != container)
1934 { 1925 {
… …
1955 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1946 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1956 "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));
1957 return NULL; 1948 return NULL;
1958 } 1949 }
1959 } 1950 }
1951
1960 return tmp; 1952 return tmp;
1961} 1953}
1962 1954
1963/* moved door processing out of move_player_attack. 1955/* moved door processing out of move_player_attack.
1964 * returns 1 if player has opened the door with a key 1956 * returns 1 if player has opened the door with a key
… …
1982 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);
1983 if (action_makes_visible (op)) 1975 if (action_makes_visible (op))
1984 make_visible (op); 1976 make_visible (op);
1985 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1977 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1986 spring_trap (door->inv, op); 1978 spring_trap (door->inv, op);
1979
1987 if (door->type == DOOR) 1980 if (door->type == DOOR)
1988 {
1989 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 */
1990 }
1991 else if (door->type == LOCKED_DOOR) 1982 else if (door->type == LOCKED_DOOR)
1992 { 1983 {
1993 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));
1994 remove_door2 (door); /* remove door without violence ;-) */ 1985 remove_door2 (door); /* remove door without violence ;-) */
1995 } 1986 }
1987
1996 /* Do this after we print the message */ 1988 /* Do this after we print the message */
1997 decrease_ob (key); /* Use up one of the keys */ 1989 decrease_ob (key); /* Use up one of the keys */
1998 /* Need to update the weight the container the key was in */ 1990 /* Need to update the weight the container the key was in */
1999 if (container != op) 1991 if (container != op)
2000 esrv_update_item (UPD_WEIGHT, op, container); 1992 esrv_update_item (UPD_WEIGHT, op, container);
1993
2001 return 1; /* Nothing more to do below */ 1994 return 1; /* Nothing more to do below */
2002 } 1995 }
2003 else if (door->type == LOCKED_DOOR) 1996 else if (door->type == LOCKED_DOOR)
2004 { 1997 {
2005 /* Might as well return now - no other way to open this */ 1998 /* Might as well return now - no other way to open this */
2006 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1999 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2007 return 1; 2000 return 1;
2008 } 2001 }
2002
2009 return 0; 2003 return 0;
2010} 2004}
2011 2005
2012/* This function is just part of a breakup from move_player. 2006/* This function is just part of a breakup from move_player.
2013 * It should keep the code cleaner. 2007 * It should keep the code cleaner.
… …
2219 return 0; 2213 return 0;
2220 } 2214 }
2221 2215
2222 /* peterm: added following line */ 2216 /* peterm: added following line */
2223 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2217 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2224 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2218 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2225 2219
2226 op->facing = dir; 2220 op->facing = dir;
2227 2221
2228 if (op->hide) 2222 if (op->hide)
2229 do_hidden_move (op); 2223 do_hidden_move (op);
… …
2370 * from. 2364 * from.
2371 */ 2365 */
2372void 2366void
2373remove_unpaid_objects (object *op, object *env) 2367remove_unpaid_objects (object *op, object *env)
2374{ 2368{
2375 object *next;
2376
2377 while (op) 2369 while (op)
2378 { 2370 {
2379 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' */
2380 2372
2381 if (QUERY_FLAG (op, FLAG_UNPAID)) 2373 if (QUERY_FLAG (op, FLAG_UNPAID))
… …
2711 tmp->name = buf; 2703 tmp->name = buf;
2712 sprintf (buf, " This finger has been cut off %s\n" 2704 sprintf (buf, " This finger has been cut off %s\n"
2713 " 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",
2714 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2706 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2715 tmp->msg = buf; 2707 tmp->msg = buf;
2716 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2708 tmp->value = 0, tmp->type = 0;
2717 tmp->materialname = NULL; 2709 tmp->materialname = "organics";
2718 tmp->insert_at (op, tmp); 2710 tmp->insert_at (op, tmp);
2719 } 2711 }
2720 2712
2721 /* teleport defeated player to new destination */ 2713 /* teleport defeated player to new destination */
2722 transfer_ob (op, x, y, 0, NULL); 2714 transfer_ob (op, x, y, 0, NULL);
… …
2974void 2966void
2975loot_object (object *op) 2967loot_object (object *op)
2976{ /* Grab and destroy some treasure */ 2968{ /* Grab and destroy some treasure */
2977 object *tmp, *tmp2, *next; 2969 object *tmp, *tmp2, *next;
2978 2970
2979 if (op->container) 2971 op->close_container (); /* close open sack first */
2980 esrv_apply_container (op, op->container); /* close open sack first */
2981 2972
2982 for (tmp = op->inv; tmp; tmp = next) 2973 for (tmp = op->inv; tmp; tmp = next)
2983 { 2974 {
2984 next = tmp->below; 2975 next = tmp->below;
2985 2976
2986 if (tmp->invisible) 2977 if (tmp->invisible)
2987 continue; 2978 continue;
2988 2979
2989 tmp->remove (); 2980 tmp->remove ();
2990 tmp->x = op->x, tmp->y = op->y; 2981 tmp->x = op->x, tmp->y = op->y;
2982
2991 if (tmp->type == CONTAINER) 2983 if (tmp->type == CONTAINER)
2992 { /* empty container to ground */ 2984 loot_object (tmp); /* empty container to ground */
2993 loot_object (tmp); 2985
2994 }
2995 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))))
2996 { 2987 {
2997 if (tmp->nrof > 1) 2988 if (tmp->nrof > 1)
2998 { 2989 {
2999 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2990 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3000 tmp2->destroy (); 2991 tmp2->destroy ();
… …
3011/* 3002/*
3012 * fix_weight(): Check recursively the weight of all players, and fix 3003 * fix_weight(): Check recursively the weight of all players, and fix
3013 * 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
3014 * was changed. 3005 * was changed.
3015 */ 3006 */
3016
3017void 3007void
3018fix_weight (void) 3008fix_weight (void)
3019{ 3009{
3020 for_all_players (pl) 3010 for_all_players (pl)
3021 { 3011 {
… …
3087} 3077}
3088 3078
3089int 3079int
3090is_true_undead (object *op) 3080is_true_undead (object *op)
3091{ 3081{
3092 object *tmp = NULL;
3093
3094 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3082 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3095 return 1; 3083 return 1;
3096 3084
3097 return 0; 3085 return 0;
3098} 3086}
… …
3534 * not readied. 3522 * not readied.
3535 */ 3523 */
3536void 3524void
3537player_unready_range_ob (player *pl, object *ob) 3525player_unready_range_ob (player *pl, object *ob)
3538{ 3526{
3539 rangetype i;
3540
3541 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))
3542 {
3543 if (pl->ranges[i] == ob) 3528 if (pl->ranges[i] == ob)
3544 { 3529 {
3545 pl->ranges[i] = NULL; 3530 pl->ranges[i] = 0;
3546 if (pl->shoottype == i) 3531 if (pl->shoottype == i)
3547 {
3548 pl->shoottype = range_none; 3532 pl->shoottype = range_none;
3549 }
3550 } 3533 }
3551 }
3552} 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