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.95 by root, Mon Jan 8 18:18:35 2007 UTC vs.
Revision 1.115 by root, Fri Apr 27 02:43:04 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 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 = 4;
328 outputs_count = 8; /* Keeps present behaviour */ 324 outputs_count = 4;
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
… …
862 * appropriate action with it (change race, or other things). 868 * appropriate action with it (change race, or other things).
863 * The function name is for historical reasons - now we have 869 * The function name is for historical reasons - now we have
864 * separate race and class; this actually changes the RACE, 870 * separate race and class; this actually changes the RACE,
865 * not the class. 871 * not the class.
866 */ 872 */
867int 873void
868key_change_class (object *op, char key) 874player::chargen_race_done ()
869{ 875{
870 int tmp_loop;
871
872 if (key == 'd' || key == 'D')
873 {
874 char buf[MAX_BUF];
875
876 /* this must before then initial items are given */ 876 /* this must before then initial items are given */
877 esrv_new_player (op->contr, op->weight + op->carrying); 877 esrv_new_player (ob->contr, ob->weight + ob->carrying);
878 878
879 treasurelist *tl = find_treasurelist ("starting_wealth"); 879 treasurelist *tl = treasurelist::find ("starting_wealth");
880 if (tl) 880 if (tl)
881 create_treasure (tl, op, 0, 0, 0); 881 create_treasure (tl, ob, 0, 0, 0);
882 882
883 INVOKE_PLAYER (BIRTH, op->contr); 883 INVOKE_PLAYER (BIRTH, ob->contr);
884 INVOKE_PLAYER (LOGIN, op->contr); 884 INVOKE_PLAYER (LOGIN, ob->contr);
885 885
886 op->contr->ns->state = ST_PLAYING; 886 ob->contr->ns->state = ST_PLAYING;
887 887
888 if (op->msg) 888 if (ob->msg)
889 op->msg = NULL; 889 ob->msg = 0;
890 890
891 /* We create this now because some of the unique maps will need it 891 /* We create this now because some of the unique maps will need it
892 * to save here. 892 * to save here.
893 */ 893 */
894 {
895 char buf[MAX_BUF];
894 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 896 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
895 make_path_to_file (buf); 897 make_path_to_file (buf);
898 }
896 899
897 start_info (op); 900 start_info (ob);
898 CLEAR_FLAG (op, FLAG_WIZ); 901 CLEAR_FLAG (ob, FLAG_WIZ);
899 give_initial_items (op, op->randomitems); 902 give_initial_items (ob, ob->randomitems);
900 link_player_skills (op); 903 link_player_skills (ob);
901 esrv_send_inventory (op, op); 904 esrv_send_inventory (ob, ob);
902 op->update_stats (); 905 ob->update_stats ();
903 906
904 /* This moves the player to a different start map, if there 907 /* This moves the player to a different start map, if there
905 * is one for this race 908 * is one for this race
906 */ 909 */
907 if (*first_map_ext_path) 910 if (*first_map_ext_path)
908 { 911 {
909 object *tmp; 912 object *tmp;
910 char mapname[MAX_BUF]; 913 char mapname[MAX_BUF];
911 914
912 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name); 915 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
913 tmp = object::create (); 916 tmp = object::create ();
914 EXIT_PATH (tmp) = mapname; 917 EXIT_PATH (tmp) = mapname;
915 EXIT_X (tmp) = op->x; 918 EXIT_X (tmp) = ob->x;
916 EXIT_Y (tmp) = op->y; 919 EXIT_Y (tmp) = ob->y;
917 op->enter_exit (tmp); /* we don't really care if it succeeded; 920 ob->enter_exit (tmp); /* we don't really care if it succeeded;
918 * if the map isn't there, then stay on the 921 * if the map isn't there, then stay on the
919 * default initial map */ 922 * default initial map */
920 tmp->destroy (); 923 tmp->destroy ();
921 } 924 }
922 else 925 else
923 LOG (llevDebug, "first_map_ext_path not set\n"); 926 LOG (llevDebug, "first_map_ext_path not set\n");
927}
924 928
925 return 0; 929void
926 } 930player::chargen_race_next ()
927 931{
928 /* Following actually changes the race - this is the default command 932 /* Following actually changes the race - this is the default command
929 * if we don't match with one of the options above. 933 * if we don't match with one of the options above.
930 */ 934 */
931 935
932 tmp_loop = 0; 936 do
933 while (!tmp_loop)
934 { 937 {
935 shstr name = op->name; 938 shstr name = ob->name;
936 int x = op->x, y = op->y; 939 int x = ob->x, y = ob->y;
937 940
938 op->remove_statbonus (); 941 ob->remove_statbonus ();
939 op->remove (); 942 ob->remove ();
940 op->arch = get_player_archetype (op->arch); 943 ob->arch = get_player_archetype (ob->arch);
941 op->arch->clone.copy_to (op); 944 ob->arch->clone.copy_to (ob);
942 op->instantiate (); 945 ob->instantiate ();
943 op->stats = op->contr->orig_stats; 946 ob->stats = ob->contr->orig_stats;
944 op->name = op->name_pl = name; 947 ob->name = ob->name_pl = name;
945 op->x = x; 948 ob->x = x;
946 op->y = y; 949 ob->y = y;
947 SET_ANIMATION (op, 2); /* So player faces south */ 950 SET_ANIMATION (ob, 2); /* So player faces south */
948 insert_ob_in_map (op, op->map, op, 0); 951 insert_ob_in_map (ob, ob->map, ob, 0);
949 assign (op->contr->title, op->arch->clone.name); 952 assign (ob->contr->title, ob->arch->clone.name);
950 op->add_statbonus (); 953 ob->add_statbonus ();
951 tmp_loop = allowed_class (op);
952 } 954 }
955 while (!allowed_class (ob));
953 956
954 update_object (op, UP_OBJ_FACE); 957 update_object (ob, UP_OBJ_FACE);
955 esrv_update_item (UPD_FACE, op, op); 958 esrv_update_item (UPD_FACE, ob, ob);
956 op->update_stats (); 959 ob->update_stats ();
957 op->stats.hp = op->stats.maxhp; 960 ob->stats.hp = ob->stats.maxhp;
958 op->stats.sp = op->stats.maxsp; 961 ob->stats.sp = ob->stats.maxsp;
959 op->stats.grace = 0; 962 ob->stats.grace = 0;
960
961 if (op->msg)
962 new_draw_info (NDI_BLUE, 0, op, op->msg);
963
964 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
965 return 0;
966} 963}
967 964
968void 965void
969flee_player (object *op) 966flee_player (object *op)
970{ 967{
… …
1027int 1024int
1028check_pick (object *op) 1025check_pick (object *op)
1029{ 1026{
1030 object *tmp, *next; 1027 object *tmp, *next;
1031 int stop = 0; 1028 int stop = 0;
1032 int j, k, wvratio; 1029 int wvratio;
1033 char putstring[128], tmpstr[16]; 1030 char putstring[128];
1034 1031
1035 /* if you're flying, you cna't pick up anything */ 1032 /* if you're flying, you cna't pick up anything */
1036 if (op->move_type & MOVE_FLYING) 1033 if (op->move_type & MOVE_FLYING)
1037 return 1; 1034 return 1;
1038 1035
… …
1375 * found object is returned. 1372 * found object is returned.
1376 */ 1373 */
1377object * 1374object *
1378find_arrow (object *op, const char *type) 1375find_arrow (object *op, const char *type)
1379{ 1376{
1380 object *tmp = NULL; 1377 object *tmp = 0;
1381 1378
1382 for (op = op->inv; op; op = op->below) 1379 for (op = op->inv; op; op = op->below)
1383 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1380 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1384 tmp = find_arrow (op, type); 1381 tmp = find_arrow (op, type);
1385 else if (op->type == ARROW && op->race == type) 1382 else if (op->type == ARROW && op->race == type)
1386 return op; 1383 return op;
1384
1387 return tmp; 1385 return tmp;
1388} 1386}
1389 1387
1390/* 1388/*
1391 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1389 * 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 1390 * 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 1391 * 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. 1392 * the hall. Failing that it does it's best to pick the highest plus arrow.
1395 */ 1393 */
1396
1397object * 1394object *
1398find_better_arrow (object *op, object *target, const char *type, int *better) 1395find_better_arrow (object *op, object *target, const char *type, int *better)
1399{ 1396{
1400 object *tmp = NULL, *arrow, *ntmp; 1397 object *tmp = NULL, *arrow, *ntmp;
1401 int attacknum, attacktype, betterby = 0, i; 1398 int attacknum, attacktype, betterby = 0, i;
… …
1833 case range_misc: 1830 case range_misc:
1834 fire_misc_object (op, dir); 1831 fire_misc_object (op, dir);
1835 return; 1832 return;
1836 1833
1837 case range_golem: /* Control summoned monsters from scrolls */ 1834 case range_golem: /* Control summoned monsters from scrolls */
1838 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1839 {
1840 op->contr->ranges[range_golem] = 0;
1841 op->contr->shoottype = range_none;
1842 }
1843 else
1844 control_golem (op->contr->ranges[range_golem], dir); 1835 control_golem (op->contr->ranges[range_golem], dir);
1845 return; 1836 return;
1846 1837
1847 case range_skill: 1838 case range_skill:
1848 if (!op->chosen_skill) 1839 if (!op->chosen_skill)
1849 { 1840 {
1850 if (op->type == PLAYER) 1841 if (op->type == PLAYER)
1851 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use."); 1842 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1843
1852 return; 1844 return;
1853 } 1845 }
1854 1846
1855 do_skill (op, op, op->chosen_skill, dir, NULL); 1847 do_skill (op, op, op->chosen_skill, dir, NULL);
1856 return; 1848 return;
… …
1860 default: 1852 default:
1861 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type."); 1853 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1862 return; 1854 return;
1863 } 1855 }
1864} 1856}
1865
1866
1867 1857
1868/* find_key 1858/* find_key
1869 * We try to find a key for the door as passed. If we find a key 1859 * 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 1860 * and successfully use it, we return the key, otherwise NULL
1871 * This function merges both normal and locked door, since the logic 1861 * This function merges both normal and locked door, since the logic
… …
1873 * pl is the player, 1863 * pl is the player,
1874 * inv is the objects inventory to searched 1864 * inv is the objects inventory to searched
1875 * door is the door we are trying to match against. 1865 * door is the door we are trying to match against.
1876 * This function can be called recursively to search containers. 1866 * This function can be called recursively to search containers.
1877 */ 1867 */
1878
1879object * 1868object *
1880find_key (object *pl, object *container, object *door) 1869find_key (object *pl, object *container, object *door)
1881{ 1870{
1882 object *tmp, *key; 1871 object *tmp, *key;
1883 1872
1884 /* Should not happen, but sanity checking is never bad */ 1873 /* Should not happen, but sanity checking is never bad */
1885 if (container->inv == NULL) 1874 if (!container->inv)
1886 return NULL; 1875 return 0;
1887 1876
1888 /* First, lets try to find a key in the top level inventory */ 1877 /* First, lets try to find a key in the top level inventory */
1889 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1878 for (tmp = container->inv; tmp; tmp = tmp->below)
1890 { 1879 {
1891 if (door->type == DOOR && tmp->type == KEY) 1880 if (door->type == DOOR && tmp->type == KEY)
1892 break; 1881 break;
1893 /* For sanity, we should really check door type, but other stuff 1882 /* For sanity, we should really check door type, but other stuff
1894 * (like containers) can be locked with special keys 1883 * (like containers) can be locked with special keys
1895 */ 1884 */
1896 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1885 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1897 break; 1886 break;
1898 } 1887 }
1888
1899 /* No key found - lets search inventories now */ 1889 /* No key found - lets search inventories now */
1900 /* If we find and use a key in an inventory, return at that time. 1890 /* 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 1891 * otherwise, if we search all the inventories and still don't find
1902 * a key, return 1892 * a key, return
1903 */ 1893 */
1904 if (!tmp) 1894 if (!tmp)
1905 { 1895 {
1906 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1896 for (tmp = container->inv; tmp; tmp = tmp->below)
1907 { 1897 {
1908 /* No reason to search empty containers */ 1898 /* No reason to search empty containers */
1909 if (tmp->type == CONTAINER && tmp->inv) 1899 if (tmp->type == CONTAINER && tmp->inv)
1910 { 1900 {
1911 if ((key = find_key (pl, tmp, door)) != NULL) 1901 if ((key = find_key (pl, tmp, door)))
1912 return key; 1902 return key;
1913 } 1903 }
1914 } 1904 }
1905
1915 if (!tmp) 1906 if (!tmp)
1916 return NULL; 1907 return NULL;
1917 } 1908 }
1909
1918 /* We get down here if we have found a key. Now if its in a container, 1910 /* 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 1911 * see if we actually want to use it
1920 */ 1912 */
1921 if (pl != container) 1913 if (pl != container)
1922 { 1914 {
… …
1943 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1935 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)); 1936 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1945 return NULL; 1937 return NULL;
1946 } 1938 }
1947 } 1939 }
1940
1948 return tmp; 1941 return tmp;
1949} 1942}
1950 1943
1951/* moved door processing out of move_player_attack. 1944/* moved door processing out of move_player_attack.
1952 * returns 1 if player has opened the door with a key 1945 * returns 1 if player has opened the door with a key
… …
1970 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1963 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1971 if (action_makes_visible (op)) 1964 if (action_makes_visible (op))
1972 make_visible (op); 1965 make_visible (op);
1973 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1966 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1974 spring_trap (door->inv, op); 1967 spring_trap (door->inv, op);
1968
1975 if (door->type == DOOR) 1969 if (door->type == DOOR)
1976 {
1977 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1970 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1978 }
1979 else if (door->type == LOCKED_DOOR) 1971 else if (door->type == LOCKED_DOOR)
1980 { 1972 {
1981 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1973 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 ;-) */ 1974 remove_door2 (door); /* remove door without violence ;-) */
1983 } 1975 }
1976
1984 /* Do this after we print the message */ 1977 /* Do this after we print the message */
1985 decrease_ob (key); /* Use up one of the keys */ 1978 decrease_ob (key); /* Use up one of the keys */
1986 /* Need to update the weight the container the key was in */ 1979 /* Need to update the weight the container the key was in */
1987 if (container != op) 1980 if (container != op)
1988 esrv_update_item (UPD_WEIGHT, op, container); 1981 esrv_update_item (UPD_WEIGHT, op, container);
1982
1989 return 1; /* Nothing more to do below */ 1983 return 1; /* Nothing more to do below */
1990 } 1984 }
1991 else if (door->type == LOCKED_DOOR) 1985 else if (door->type == LOCKED_DOOR)
1992 { 1986 {
1993 /* Might as well return now - no other way to open this */ 1987 /* Might as well return now - no other way to open this */
1994 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1988 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
1995 return 1; 1989 return 1;
1996 } 1990 }
1991
1997 return 0; 1992 return 0;
1998} 1993}
1999 1994
2000/* This function is just part of a breakup from move_player. 1995/* This function is just part of a breakup from move_player.
2001 * It should keep the code cleaner. 1996 * It should keep the code cleaner.
… …
2207 return 0; 2202 return 0;
2208 } 2203 }
2209 2204
2210 /* peterm: added following line */ 2205 /* peterm: added following line */
2211 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2206 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2212 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2207 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2213 2208
2214 op->facing = dir; 2209 op->facing = dir;
2215 2210
2216 if (op->hide) 2211 if (op->hide)
2217 do_hidden_move (op); 2212 do_hidden_move (op);
… …
2250 * Returns true if there are more actions we can do. 2245 * Returns true if there are more actions we can do.
2251 */ 2246 */
2252int 2247int
2253handle_newcs_player (object *op) 2248handle_newcs_player (object *op)
2254{ 2249{
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)) 2250 if (QUERY_FLAG (op, FLAG_SCARED))
2276 { 2251 {
2277 flee_player (op); 2252 flee_player (op);
2278 /* If player is still scared, that is his action for this tick */ 2253 /* If player is still scared, that is his action for this tick */
2279 if (QUERY_FLAG (op, FLAG_SCARED)) 2254 if (QUERY_FLAG (op, FLAG_SCARED))
2280 { 2255 {
2281 op->speed_left--; 2256 op->speed_left--;
2282 return 0; 2257 return 0;
2283 } 2258 }
2284 } 2259 }
2285
2286 /* I've been seeing crashes where the golem has been destroyed, but
2287 * the player object still points to the defunct golem. The code that
2288 * destroys the golem looks correct, and it doesn't always happen, so
2289 * put this in a a workaround to clean up the golem pointer.
2290 */
2291 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2292 op->contr->ranges[range_golem] = 0;
2293 2260
2294 /* call this here - we also will call this in do_ericserver, but 2261 /* call this here - we also will call this in do_ericserver, but
2295 * the players time has been increased when doericserver has been 2262 * the players time has been increased when doericserver has been
2296 * called, so we recheck it here. 2263 * called, so we recheck it here.
2297 */ 2264 */
… …
2358 * from. 2325 * from.
2359 */ 2326 */
2360void 2327void
2361remove_unpaid_objects (object *op, object *env) 2328remove_unpaid_objects (object *op, object *env)
2362{ 2329{
2363 object *next;
2364
2365 while (op) 2330 while (op)
2366 { 2331 {
2367 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2332 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2368 2333
2369 if (QUERY_FLAG (op, FLAG_UNPAID)) 2334 if (QUERY_FLAG (op, FLAG_UNPAID))
… …
2435 int rate_grace = 2000; 2400 int rate_grace = 2000;
2436 const int max_hp = 1; 2401 const int max_hp = 1;
2437 const int max_sp = 1; 2402 const int max_sp = 1;
2438 const int max_grace = 1; 2403 const int max_grace = 1;
2439 2404
2440 if (op->contr->outputs_sync) 2405 if (op->contr->hidden)
2406 {
2407 op->invisible = 1000;
2408 /* the socket code flashes the player visible/invisible
2409 * depending on the value of invisible, so we need to
2410 * alternate it here for it to work correctly.
2411 */
2412 if (pticks & 2)
2413 op->invisible--;
2441 { 2414 }
2442 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2415 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2443 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2416 {
2444 flush_output_element (op, &op->contr->outputs[i]); 2417 if (!op->invisible--)
2418 {
2419 make_visible (op);
2420 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2421 }
2445 } 2422 }
2446 2423
2447 if (op->contr->ns->state == ST_PLAYING) 2424 if (op->contr->ns->state == ST_PLAYING)
2448 { 2425 {
2449 /* these next three if clauses make it possible to SLOW DOWN 2426 /* these next three if clauses make it possible to SLOW DOWN
… …
2471 gen_grace = op->stats.maxgrace; 2448 gen_grace = op->stats.maxgrace;
2472 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2449 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2473 } 2450 }
2474 2451
2475 /* Regenerate Spell Points */ 2452 /* Regenerate Spell Points */
2476 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0) 2453 if (!op->contr->ranges[range_golem] && --op->last_sp < 0)
2477 { 2454 {
2478 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); 2455 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2479 if (op->stats.sp < op->stats.maxsp) 2456 if (op->stats.sp < op->stats.maxsp)
2480 { 2457 {
2481 op->stats.sp++; 2458 op->stats.sp++;
… …
2699 tmp->name = buf; 2676 tmp->name = buf;
2700 sprintf (buf, " This finger has been cut off %s\n" 2677 sprintf (buf, " This finger has been cut off %s\n"
2701 " the %s, when he was defeated at\n level %d by %s.\n", 2678 " 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); 2679 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2703 tmp->msg = buf; 2680 tmp->msg = buf;
2704 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2681 tmp->value = 0, tmp->type = 0;
2705 tmp->materialname = NULL; 2682 tmp->materialname = "organics";
2706 tmp->insert_at (op, tmp); 2683 tmp->insert_at (op, tmp);
2707 } 2684 }
2708 2685
2709 /* teleport defeated player to new destination */ 2686 /* teleport defeated player to new destination */
2710 transfer_ob (op, x, y, 0, NULL); 2687 transfer_ob (op, x, y, 0, NULL);
… …
2906 op->stats.hp = op->stats.maxhp; 2883 op->stats.hp = op->stats.maxhp;
2907 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2884 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2908 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2885 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2909 2886
2910 /* 2887 /*
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 2888 * Check to see if the player has any unpaid items. If so, remove them
2913 * in the map. 2889 * and put them back in the map.
2914 */ 2890 */
2915
2916 if (is_in_shop (op))
2917 remove_unpaid_objects (op->inv, op); 2891 remove_unpaid_objects (op->inv, op);
2918 2892
2919 /****************************************/ 2893 /****************************************/
2920 /* */ 2894 /* */
2921 /* Move player to his current respawn- */ 2895 /* Move player to his current respawn- */
2922 /* position (usually last savebed) */ 2896 /* position (usually last savebed) */
… …
2962void 2936void
2963loot_object (object *op) 2937loot_object (object *op)
2964{ /* Grab and destroy some treasure */ 2938{ /* Grab and destroy some treasure */
2965 object *tmp, *tmp2, *next; 2939 object *tmp, *tmp2, *next;
2966 2940
2967 if (op->container) 2941 op->close_container (); /* close open sack first */
2968 esrv_apply_container (op, op->container); /* close open sack first */
2969 2942
2970 for (tmp = op->inv; tmp; tmp = next) 2943 for (tmp = op->inv; tmp; tmp = next)
2971 { 2944 {
2972 next = tmp->below; 2945 next = tmp->below;
2973 2946
2974 if (tmp->invisible) 2947 if (tmp->invisible)
2975 continue; 2948 continue;
2976 2949
2977 tmp->remove (); 2950 tmp->remove ();
2978 tmp->x = op->x, tmp->y = op->y; 2951 tmp->x = op->x, tmp->y = op->y;
2952
2979 if (tmp->type == CONTAINER) 2953 if (tmp->type == CONTAINER)
2980 { /* empty container to ground */ 2954 loot_object (tmp); /* empty container to ground */
2981 loot_object (tmp); 2955
2982 }
2983 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2956 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2984 { 2957 {
2985 if (tmp->nrof > 1) 2958 if (tmp->nrof > 1)
2986 { 2959 {
2987 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2960 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
2988 tmp2->destroy (); 2961 tmp2->destroy ();
… …
2999/* 2972/*
3000 * fix_weight(): Check recursively the weight of all players, and fix 2973 * fix_weight(): Check recursively the weight of all players, and fix
3001 * what needs to be fixed. Refresh windows and fix speed if anything 2974 * what needs to be fixed. Refresh windows and fix speed if anything
3002 * was changed. 2975 * was changed.
3003 */ 2976 */
3004
3005void 2977void
3006fix_weight (void) 2978fix_weight (void)
3007{ 2979{
3008 for_all_players (pl) 2980 for_all_players (pl)
3009 { 2981 {
… …
3069 if (op->type == PLAYER) 3041 if (op->type == PLAYER)
3070 { 3042 {
3071 op->contr->tmp_invis = 0; 3043 op->contr->tmp_invis = 0;
3072 op->contr->invis_race = 0; 3044 op->contr->invis_race = 0;
3073 } 3045 }
3046
3074 update_object (op, UP_OBJ_FACE); 3047 update_object (op, UP_OBJ_CHANGE);
3075} 3048}
3076 3049
3077int 3050int
3078is_true_undead (object *op) 3051is_true_undead (object *op)
3079{ 3052{
3080 object *tmp = NULL;
3081
3082 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3053 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3083 return 1; 3054 return 1;
3084 3055
3085 return 0; 3056 return 0;
3086} 3057}
… …
3374 char buf[MAX_BUF]; /* tmp. string buffer */ 3345 char buf[MAX_BUF]; /* tmp. string buffer */
3375 int i = 0, j = 0; 3346 int i = 0, j = 0;
3376 3347
3377 /* get the appropriate treasurelist */ 3348 /* get the appropriate treasurelist */
3378 if (atnr == ATNR_FIRE) 3349 if (atnr == ATNR_FIRE)
3379 trlist = find_treasurelist ("dragon_ability_fire"); 3350 trlist = treasurelist::find ("dragon_ability_fire");
3380 else if (atnr == ATNR_COLD) 3351 else if (atnr == ATNR_COLD)
3381 trlist = find_treasurelist ("dragon_ability_cold"); 3352 trlist = treasurelist::find ("dragon_ability_cold");
3382 else if (atnr == ATNR_ELECTRICITY) 3353 else if (atnr == ATNR_ELECTRICITY)
3383 trlist = find_treasurelist ("dragon_ability_elec"); 3354 trlist = treasurelist::find ("dragon_ability_elec");
3384 else if (atnr == ATNR_POISON) 3355 else if (atnr == ATNR_POISON)
3385 trlist = find_treasurelist ("dragon_ability_poison"); 3356 trlist = treasurelist::find ("dragon_ability_poison");
3386 3357
3387 if (trlist == NULL || who->type != PLAYER) 3358 if (trlist == NULL || who->type != PLAYER)
3388 return; 3359 return;
3389 3360
3390 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3361 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
… …
3522 * not readied. 3493 * not readied.
3523 */ 3494 */
3524void 3495void
3525player_unready_range_ob (player *pl, object *ob) 3496player_unready_range_ob (player *pl, object *ob)
3526{ 3497{
3527 rangetype i;
3528
3529 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3498 for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))
3530 {
3531 if (pl->ranges[i] == ob) 3499 if (pl->ranges[i] == ob)
3532 { 3500 {
3533 pl->ranges[i] = NULL; 3501 pl->ranges[i] = 0;
3534 if (pl->shoottype == i) 3502 if (pl->shoottype == i)
3535 {
3536 pl->shoottype = range_none; 3503 pl->shoottype = range_none;
3537 }
3538 } 3504 }
3539 }
3540} 3505}
3506
3507sint8
3508player::visibility_at (maptile *map, int x, int y) const
3509{
3510 if (!ns)
3511 return 0;
3512
3513 int dx, dy;
3514 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3515 return 0;
3516
3517 x += dx - ns->current_x + ns->mapx / 2;
3518 y += dy - ns->current_y + ns->mapy / 2;
3519
3520 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3521 return 0;
3522
3523 return 100 - blocked_los [x][y];
3524}

Diff Legend

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