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.97 by root, Mon Jan 8 22:32:11 2007 UTC vs.
Revision 1.114 by root, Wed Apr 25 18:47:51 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;
218 ob->container = 0; //TODO: client-specific 223 ob->close_container (); //TODO: client-specific
219 224
220 ns->update_look = 0; 225 ns->update_look = 0;
221 ns->look_position = 0; 226 ns->look_position = 0;
222 227
223 clear_los (ob); 228 clear_los (ob);
… …
235 link_player_skills (ob); 240 link_player_skills (ob);
236 241
237 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 242 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
238 243
239 assign (title, ob->arch->clone.name); 244 assign (title, ob->arch->clone.name);
240
241 /* can_use_shield is a new flag. However, the can_use.. seems to largely come
242 * from the class, and not race. I don't see any way to get the class information
243 * to then update this. I don't think this will actually break anything - anyone
244 * that can use armour should be able to use a shield. What this may 'break'
245 * are features new characters get, eg, if someone starts up with a Q, they
246 * should be able to use a shield. However, old Q's won't get that advantage.
247 */
248 if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
249 SET_FLAG (ob, FLAG_USE_SHIELD);
250 245
251 /* if it's a dragon player, set the correct title here */ 246 /* if it's a dragon player, set the correct title here */
252 if (is_dragon_pl (ob)) 247 if (is_dragon_pl (ob))
253 { 248 {
254 object *tmp, *abil = 0, *skin = 0; 249 object *tmp, *abil = 0, *skin = 0;
… …
299 ns->reset_stats (); 294 ns->reset_stats ();
300 ns->pl = 0; 295 ns->pl = 0;
301 this->ns = 0; 296 this->ns = 0;
302 } 297 }
303 298
299 if (ob)
304 ob->container = 0; //TODO: client-specific 300 ob->close_container (); //TODO: client-specific
301
305 deactivate (); 302 deactivate ();
306} 303}
307 304
308// the need for this function can be explained 305// the need for this function can be explained
309// by load_object not returning the object 306// by load_object not returning the object
310void 307void
311player::set_object (object *op) 308player::set_object (object *op)
312{ 309{
313 ob = op; 310 ob = op;
314 ob->contr = this; /* this aren't yet in archetype */ 311 ob->contr = this; /* this aren't yet in archetype */
315 312
316 ob->speed_left = 0.5; 313 ob->speed_left = 0.5;
317 ob->speed = 1.0; 314 ob->speed = 1.0;
318 ob->direction = 5; /* So player faces south */ 315 ob->direction = 5; /* So player faces south */
319 ob->stats.wc = 2;
320 ob->run_away = 25; /* Then we panick... */
321
322 ob->roll_stats ();
323} 316}
324 317
325player::player () 318player::player ()
326{ 319{
327 /* There are some elements we want initialised to non zero value - 320 /* There are some elements we want initialised to non zero value -
328 * we deal with that below this point. 321 * we deal with that below this point.
329 */ 322 */
330 outputs_sync = 16; /* Every 2 seconds */ 323 outputs_sync = 4;
331 outputs_count = 8; /* Keeps present behaviour */ 324 outputs_count = 4;
332 unapply = unapply_nochoice; 325 unapply = unapply_nochoice;
333 326
334 savebed_map = first_map_path; /* Init. respawn position */ 327 savebed_map = first_map_path; /* Init. respawn position */
335 328
336 gen_sp_armour = 10; 329 gen_sp_armour = 10;
… …
371player::create () 364player::create ()
372{ 365{
373 player *pl = new player; 366 player *pl = new player;
374 367
375 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
376 set_first_map (pl->ob); 374 set_first_map (pl->ob);
377 375
378 return pl; 376 return pl;
379} 377}
380 378
… …
526 x = mon->x; 524 x = mon->x;
527 y = mon->y; 525 y = mon->y;
528 m = mon->map; 526 m = mon->map;
529 dir = rv.direction; 527 dir = rv.direction;
530 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 */
531 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
532 /* 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. */
533 if (diff > max) 532 if (diff > max)
534 return 0; 533 return 0;
534
535 while (diff > 1 && max > 0) 535 while (diff > 1 && max > 0)
536 { 536 {
537 lastx = x; 537 lastx = x;
538 lasty = y; 538 lasty = y;
539 lastmap = m; 539 lastmap = m;
… …
621 max--; 621 max--;
622 lastdir = dir; 622 lastdir = dir;
623 if (!firstdir) 623 if (!firstdir)
624 firstdir = dir; 624 firstdir = dir;
625 } 625 }
626
626 if (diff <= 1) 627 if (diff <= 1)
627 { 628 {
628 /* Recalculate diff (distance) because we may not have actually 629 /* Recalculate diff (distance) because we may not have actually
629 * headed toward player for entire distance. 630 * headed toward player for entire distance.
630 */ 631 */
631 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 632 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
632 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));
633 } 634 }
635
634 if (diff > max) 636 if (diff > max)
635 return 0; 637 return 0;
636 } 638 }
639
637 /* 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 */
638 if (!max) 641 if (!max)
639 return 0; 642 return 0;
640 643
641 return firstdir; 644 return firstdir;
… …
755roll_stat (void) 758roll_stat (void)
756{ 759{
757 int a[4], i, j, k; 760 int a[4], i, j, k;
758 761
759 for (i = 0; i < 4; i++) 762 for (i = 0; i < 4; i++)
760 a[i] = (int) RANDOM () % 6 + 1; 763 a[i] = (int) rndm (6) + 1;
761 764
762 for (i = 0, j = 0, k = 7; i < 4; i++) 765 for (i = 0, j = 0, k = 7; i < 4; i++)
763 if (a[i] < k) 766 if (a[i] < k)
764 k = a[i], j = i; 767 k = a[i], j = i;
765 768
… …
865 * appropriate action with it (change race, or other things). 868 * appropriate action with it (change race, or other things).
866 * The function name is for historical reasons - now we have 869 * The function name is for historical reasons - now we have
867 * separate race and class; this actually changes the RACE, 870 * separate race and class; this actually changes the RACE,
868 * not the class. 871 * not the class.
869 */ 872 */
870int 873void
871key_change_class (object *op, char key) 874player::chargen_race_done ()
872{ 875{
873 int tmp_loop;
874
875 if (key == 'd' || key == 'D')
876 {
877 char buf[MAX_BUF];
878
879 /* this must before then initial items are given */ 876 /* this must before then initial items are given */
880 esrv_new_player (op->contr, op->weight + op->carrying); 877 esrv_new_player (ob->contr, ob->weight + ob->carrying);
881 878
882 treasurelist *tl = find_treasurelist ("starting_wealth"); 879 treasurelist *tl = treasurelist::find ("starting_wealth");
883 if (tl) 880 if (tl)
884 create_treasure (tl, op, 0, 0, 0); 881 create_treasure (tl, ob, 0, 0, 0);
885 882
886 INVOKE_PLAYER (BIRTH, op->contr); 883 INVOKE_PLAYER (BIRTH, ob->contr);
887 INVOKE_PLAYER (LOGIN, op->contr); 884 INVOKE_PLAYER (LOGIN, ob->contr);
888 885
889 op->contr->ns->state = ST_PLAYING; 886 ob->contr->ns->state = ST_PLAYING;
890 887
891 if (op->msg) 888 if (ob->msg)
892 op->msg = NULL; 889 ob->msg = 0;
893 890
894 /* 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
895 * to save here. 892 * to save here.
896 */ 893 */
894 {
895 char buf[MAX_BUF];
897 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 896 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
898 make_path_to_file (buf); 897 make_path_to_file (buf);
898 }
899 899
900 start_info (op); 900 start_info (ob);
901 CLEAR_FLAG (op, FLAG_WIZ); 901 CLEAR_FLAG (ob, FLAG_WIZ);
902 give_initial_items (op, op->randomitems); 902 give_initial_items (ob, ob->randomitems);
903 link_player_skills (op); 903 link_player_skills (ob);
904 esrv_send_inventory (op, op); 904 esrv_send_inventory (ob, ob);
905 op->update_stats (); 905 ob->update_stats ();
906 906
907 /* This moves the player to a different start map, if there 907 /* This moves the player to a different start map, if there
908 * is one for this race 908 * is one for this race
909 */ 909 */
910 if (*first_map_ext_path) 910 if (*first_map_ext_path)
911 { 911 {
912 object *tmp; 912 object *tmp;
913 char mapname[MAX_BUF]; 913 char mapname[MAX_BUF];
914 914
915 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);
916 tmp = object::create (); 916 tmp = object::create ();
917 EXIT_PATH (tmp) = mapname; 917 EXIT_PATH (tmp) = mapname;
918 EXIT_X (tmp) = op->x; 918 EXIT_X (tmp) = ob->x;
919 EXIT_Y (tmp) = op->y; 919 EXIT_Y (tmp) = ob->y;
920 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;
921 * if the map isn't there, then stay on the 921 * if the map isn't there, then stay on the
922 * default initial map */ 922 * default initial map */
923 tmp->destroy (); 923 tmp->destroy ();
924 } 924 }
925 else 925 else
926 LOG (llevDebug, "first_map_ext_path not set\n"); 926 LOG (llevDebug, "first_map_ext_path not set\n");
927}
927 928
928 return 0; 929void
929 } 930player::chargen_race_next ()
930 931{
931 /* Following actually changes the race - this is the default command 932 /* Following actually changes the race - this is the default command
932 * if we don't match with one of the options above. 933 * if we don't match with one of the options above.
933 */ 934 */
934 935
935 tmp_loop = 0; 936 do
936 while (!tmp_loop)
937 { 937 {
938 shstr name = op->name; 938 shstr name = ob->name;
939 int x = op->x, y = op->y; 939 int x = ob->x, y = ob->y;
940 940
941 op->remove_statbonus (); 941 ob->remove_statbonus ();
942 op->remove (); 942 ob->remove ();
943 op->arch = get_player_archetype (op->arch); 943 ob->arch = get_player_archetype (ob->arch);
944 op->arch->clone.copy_to (op); 944 ob->arch->clone.copy_to (ob);
945 op->instantiate (); 945 ob->instantiate ();
946 op->stats = op->contr->orig_stats; 946 ob->stats = ob->contr->orig_stats;
947 op->name = op->name_pl = name; 947 ob->name = ob->name_pl = name;
948 op->x = x; 948 ob->x = x;
949 op->y = y; 949 ob->y = y;
950 SET_ANIMATION (op, 2); /* So player faces south */ 950 SET_ANIMATION (ob, 2); /* So player faces south */
951 insert_ob_in_map (op, op->map, op, 0); 951 insert_ob_in_map (ob, ob->map, ob, 0);
952 assign (op->contr->title, op->arch->clone.name); 952 assign (ob->contr->title, ob->arch->clone.name);
953 op->add_statbonus (); 953 ob->add_statbonus ();
954 tmp_loop = allowed_class (op);
955 } 954 }
955 while (!allowed_class (ob));
956 956
957 update_object (op, UP_OBJ_FACE); 957 update_object (ob, UP_OBJ_FACE);
958 esrv_update_item (UPD_FACE, op, op); 958 esrv_update_item (UPD_FACE, ob, ob);
959 op->update_stats (); 959 ob->update_stats ();
960 op->stats.hp = op->stats.maxhp; 960 ob->stats.hp = ob->stats.maxhp;
961 op->stats.sp = op->stats.maxsp; 961 ob->stats.sp = ob->stats.maxsp;
962 op->stats.grace = 0; 962 ob->stats.grace = 0;
963
964 if (op->msg)
965 new_draw_info (NDI_BLUE, 0, op, op->msg);
966
967 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
968 return 0;
969} 963}
970 964
971void 965void
972flee_player (object *op) 966flee_player (object *op)
973{ 967{
… …
1030int 1024int
1031check_pick (object *op) 1025check_pick (object *op)
1032{ 1026{
1033 object *tmp, *next; 1027 object *tmp, *next;
1034 int stop = 0; 1028 int stop = 0;
1035 int j, k, wvratio; 1029 int wvratio;
1036 char putstring[128], tmpstr[16]; 1030 char putstring[128];
1037 1031
1038 /* if you're flying, you cna't pick up anything */ 1032 /* if you're flying, you cna't pick up anything */
1039 if (op->move_type & MOVE_FLYING) 1033 if (op->move_type & MOVE_FLYING)
1040 return 1; 1034 return 1;
1041 1035
… …
1378 * found object is returned. 1372 * found object is returned.
1379 */ 1373 */
1380object * 1374object *
1381find_arrow (object *op, const char *type) 1375find_arrow (object *op, const char *type)
1382{ 1376{
1383 object *tmp = NULL; 1377 object *tmp = 0;
1384 1378
1385 for (op = op->inv; op; op = op->below) 1379 for (op = op->inv; op; op = op->below)
1386 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))
1387 tmp = find_arrow (op, type); 1381 tmp = find_arrow (op, type);
1388 else if (op->type == ARROW && op->race == type) 1382 else if (op->type == ARROW && op->race == type)
1389 return op; 1383 return op;
1384
1390 return tmp; 1385 return tmp;
1391} 1386}
1392 1387
1393/* 1388/*
1394 * 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
1395 * 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
1396 * 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
1397 * 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.
1398 */ 1393 */
1399
1400object * 1394object *
1401find_better_arrow (object *op, object *target, const char *type, int *better) 1395find_better_arrow (object *op, object *target, const char *type, int *better)
1402{ 1396{
1403 object *tmp = NULL, *arrow, *ntmp; 1397 object *tmp = NULL, *arrow, *ntmp;
1404 int attacknum, attacktype, betterby = 0, i; 1398 int attacknum, attacktype, betterby = 0, i;
… …
1836 case range_misc: 1830 case range_misc:
1837 fire_misc_object (op, dir); 1831 fire_misc_object (op, dir);
1838 return; 1832 return;
1839 1833
1840 case range_golem: /* Control summoned monsters from scrolls */ 1834 case range_golem: /* Control summoned monsters from scrolls */
1841 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1842 {
1843 op->contr->ranges[range_golem] = 0;
1844 op->contr->shoottype = range_none;
1845 }
1846 else
1847 control_golem (op->contr->ranges[range_golem], dir); 1835 control_golem (op->contr->ranges[range_golem], dir);
1848 return; 1836 return;
1849 1837
1850 case range_skill: 1838 case range_skill:
1851 if (!op->chosen_skill) 1839 if (!op->chosen_skill)
1852 { 1840 {
1853 if (op->type == PLAYER) 1841 if (op->type == PLAYER)
1854 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
1855 return; 1844 return;
1856 } 1845 }
1857 1846
1858 do_skill (op, op, op->chosen_skill, dir, NULL); 1847 do_skill (op, op, op->chosen_skill, dir, NULL);
1859 return; 1848 return;
… …
1863 default: 1852 default:
1864 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type."); 1853 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1865 return; 1854 return;
1866 } 1855 }
1867} 1856}
1868
1869
1870 1857
1871/* find_key 1858/* find_key
1872 * 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
1873 * and successfully use it, we return the key, otherwise NULL 1860 * and successfully use it, we return the key, otherwise NULL
1874 * This function merges both normal and locked door, since the logic 1861 * This function merges both normal and locked door, since the logic
… …
1876 * pl is the player, 1863 * pl is the player,
1877 * inv is the objects inventory to searched 1864 * inv is the objects inventory to searched
1878 * door is the door we are trying to match against. 1865 * door is the door we are trying to match against.
1879 * This function can be called recursively to search containers. 1866 * This function can be called recursively to search containers.
1880 */ 1867 */
1881
1882object * 1868object *
1883find_key (object *pl, object *container, object *door) 1869find_key (object *pl, object *container, object *door)
1884{ 1870{
1885 object *tmp, *key; 1871 object *tmp, *key;
1886 1872
1887 /* Should not happen, but sanity checking is never bad */ 1873 /* Should not happen, but sanity checking is never bad */
1888 if (container->inv == NULL) 1874 if (!container->inv)
1889 return NULL; 1875 return 0;
1890 1876
1891 /* 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 */
1892 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1878 for (tmp = container->inv; tmp; tmp = tmp->below)
1893 { 1879 {
1894 if (door->type == DOOR && tmp->type == KEY) 1880 if (door->type == DOOR && tmp->type == KEY)
1895 break; 1881 break;
1896 /* For sanity, we should really check door type, but other stuff 1882 /* For sanity, we should really check door type, but other stuff
1897 * (like containers) can be locked with special keys 1883 * (like containers) can be locked with special keys
1898 */ 1884 */
1899 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1885 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1900 break; 1886 break;
1901 } 1887 }
1888
1902 /* No key found - lets search inventories now */ 1889 /* No key found - lets search inventories now */
1903 /* 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.
1904 * 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
1905 * a key, return 1892 * a key, return
1906 */ 1893 */
1907 if (!tmp) 1894 if (!tmp)
1908 { 1895 {
1909 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1896 for (tmp = container->inv; tmp; tmp = tmp->below)
1910 { 1897 {
1911 /* No reason to search empty containers */ 1898 /* No reason to search empty containers */
1912 if (tmp->type == CONTAINER && tmp->inv) 1899 if (tmp->type == CONTAINER && tmp->inv)
1913 { 1900 {
1914 if ((key = find_key (pl, tmp, door)) != NULL) 1901 if ((key = find_key (pl, tmp, door)))
1915 return key; 1902 return key;
1916 } 1903 }
1917 } 1904 }
1905
1918 if (!tmp) 1906 if (!tmp)
1919 return NULL; 1907 return NULL;
1920 } 1908 }
1909
1921 /* 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,
1922 * see if we actually want to use it 1911 * see if we actually want to use it
1923 */ 1912 */
1924 if (pl != container) 1913 if (pl != container)
1925 { 1914 {
… …
1946 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1935 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1947 "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));
1948 return NULL; 1937 return NULL;
1949 } 1938 }
1950 } 1939 }
1940
1951 return tmp; 1941 return tmp;
1952} 1942}
1953 1943
1954/* moved door processing out of move_player_attack. 1944/* moved door processing out of move_player_attack.
1955 * returns 1 if player has opened the door with a key 1945 * returns 1 if player has opened the door with a key
… …
1973 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);
1974 if (action_makes_visible (op)) 1964 if (action_makes_visible (op))
1975 make_visible (op); 1965 make_visible (op);
1976 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1966 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1977 spring_trap (door->inv, op); 1967 spring_trap (door->inv, op);
1968
1978 if (door->type == DOOR) 1969 if (door->type == DOOR)
1979 {
1980 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 */
1981 }
1982 else if (door->type == LOCKED_DOOR) 1971 else if (door->type == LOCKED_DOOR)
1983 { 1972 {
1984 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));
1985 remove_door2 (door); /* remove door without violence ;-) */ 1974 remove_door2 (door); /* remove door without violence ;-) */
1986 } 1975 }
1976
1987 /* Do this after we print the message */ 1977 /* Do this after we print the message */
1988 decrease_ob (key); /* Use up one of the keys */ 1978 decrease_ob (key); /* Use up one of the keys */
1989 /* Need to update the weight the container the key was in */ 1979 /* Need to update the weight the container the key was in */
1990 if (container != op) 1980 if (container != op)
1991 esrv_update_item (UPD_WEIGHT, op, container); 1981 esrv_update_item (UPD_WEIGHT, op, container);
1982
1992 return 1; /* Nothing more to do below */ 1983 return 1; /* Nothing more to do below */
1993 } 1984 }
1994 else if (door->type == LOCKED_DOOR) 1985 else if (door->type == LOCKED_DOOR)
1995 { 1986 {
1996 /* Might as well return now - no other way to open this */ 1987 /* Might as well return now - no other way to open this */
1997 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1988 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
1998 return 1; 1989 return 1;
1999 } 1990 }
1991
2000 return 0; 1992 return 0;
2001} 1993}
2002 1994
2003/* This function is just part of a breakup from move_player. 1995/* This function is just part of a breakup from move_player.
2004 * It should keep the code cleaner. 1996 * It should keep the code cleaner.
… …
2210 return 0; 2202 return 0;
2211 } 2203 }
2212 2204
2213 /* peterm: added following line */ 2205 /* peterm: added following line */
2214 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2206 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2215 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2207 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2216 2208
2217 op->facing = dir; 2209 op->facing = dir;
2218 2210
2219 if (op->hide) 2211 if (op->hide)
2220 do_hidden_move (op); 2212 do_hidden_move (op);
… …
2253 * Returns true if there are more actions we can do. 2245 * Returns true if there are more actions we can do.
2254 */ 2246 */
2255int 2247int
2256handle_newcs_player (object *op) 2248handle_newcs_player (object *op)
2257{ 2249{
2258 if (op->contr->hidden)
2259 {
2260 op->invisible = 1000;
2261 /* the socket code flashes the player visible/invisible
2262 * depending on the value of invisible, so we need to
2263 * alternate it here for it to work correctly.
2264 */
2265 if (pticks & 2)
2266 op->invisible--;
2267 }
2268 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2269 {
2270 op->invisible--;
2271 if (!op->invisible)
2272 {
2273 make_visible (op);
2274 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2275 }
2276 }
2277
2278 if (QUERY_FLAG (op, FLAG_SCARED)) 2250 if (QUERY_FLAG (op, FLAG_SCARED))
2279 { 2251 {
2280 flee_player (op); 2252 flee_player (op);
2281 /* 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 */
2282 if (QUERY_FLAG (op, FLAG_SCARED)) 2254 if (QUERY_FLAG (op, FLAG_SCARED))
2283 { 2255 {
2284 op->speed_left--; 2256 op->speed_left--;
2285 return 0; 2257 return 0;
2286 } 2258 }
2287 } 2259 }
2288
2289 /* I've been seeing crashes where the golem has been destroyed, but
2290 * the player object still points to the defunct golem. The code that
2291 * destroys the golem looks correct, and it doesn't always happen, so
2292 * put this in a a workaround to clean up the golem pointer.
2293 */
2294 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2295 op->contr->ranges[range_golem] = 0;
2296 2260
2297 /* 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
2298 * the players time has been increased when doericserver has been 2262 * the players time has been increased when doericserver has been
2299 * called, so we recheck it here. 2263 * called, so we recheck it here.
2300 */ 2264 */
… …
2361 * from. 2325 * from.
2362 */ 2326 */
2363void 2327void
2364remove_unpaid_objects (object *op, object *env) 2328remove_unpaid_objects (object *op, object *env)
2365{ 2329{
2366 object *next;
2367
2368 while (op) 2330 while (op)
2369 { 2331 {
2370 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' */
2371 2333
2372 if (QUERY_FLAG (op, FLAG_UNPAID)) 2334 if (QUERY_FLAG (op, FLAG_UNPAID))
… …
2438 int rate_grace = 2000; 2400 int rate_grace = 2000;
2439 const int max_hp = 1; 2401 const int max_hp = 1;
2440 const int max_sp = 1; 2402 const int max_sp = 1;
2441 const int max_grace = 1; 2403 const int max_grace = 1;
2442 2404
2443 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--;
2444 { 2414 }
2445 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2415 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2446 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2416 {
2447 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 }
2448 } 2422 }
2449 2423
2450 if (op->contr->ns->state == ST_PLAYING) 2424 if (op->contr->ns->state == ST_PLAYING)
2451 { 2425 {
2452 /* these next three if clauses make it possible to SLOW DOWN 2426 /* these next three if clauses make it possible to SLOW DOWN
… …
2474 gen_grace = op->stats.maxgrace; 2448 gen_grace = op->stats.maxgrace;
2475 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2449 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2476 } 2450 }
2477 2451
2478 /* Regenerate Spell Points */ 2452 /* Regenerate Spell Points */
2479 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0) 2453 if (!op->contr->ranges[range_golem] && --op->last_sp < 0)
2480 { 2454 {
2481 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);
2482 if (op->stats.sp < op->stats.maxsp) 2456 if (op->stats.sp < op->stats.maxsp)
2483 { 2457 {
2484 op->stats.sp++; 2458 op->stats.sp++;
… …
2702 tmp->name = buf; 2676 tmp->name = buf;
2703 sprintf (buf, " This finger has been cut off %s\n" 2677 sprintf (buf, " This finger has been cut off %s\n"
2704 " 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",
2705 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2679 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2706 tmp->msg = buf; 2680 tmp->msg = buf;
2707 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2681 tmp->value = 0, tmp->type = 0;
2708 tmp->materialname = NULL; 2682 tmp->materialname = "organics";
2709 tmp->insert_at (op, tmp); 2683 tmp->insert_at (op, tmp);
2710 } 2684 }
2711 2685
2712 /* teleport defeated player to new destination */ 2686 /* teleport defeated player to new destination */
2713 transfer_ob (op, x, y, 0, NULL); 2687 transfer_ob (op, x, y, 0, NULL);
… …
2909 op->stats.hp = op->stats.maxhp; 2883 op->stats.hp = op->stats.maxhp;
2910 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2884 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2911 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2885 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2912 2886
2913 /* 2887 /*
2914 * Check to see if the player is in a shop. IF so, then check to see if
2915 * 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
2916 * in the map. 2889 * and put them back in the map.
2917 */ 2890 */
2918
2919 if (is_in_shop (op))
2920 remove_unpaid_objects (op->inv, op); 2891 remove_unpaid_objects (op->inv, op);
2921 2892
2922 /****************************************/ 2893 /****************************************/
2923 /* */ 2894 /* */
2924 /* Move player to his current respawn- */ 2895 /* Move player to his current respawn- */
2925 /* position (usually last savebed) */ 2896 /* position (usually last savebed) */
… …
2965void 2936void
2966loot_object (object *op) 2937loot_object (object *op)
2967{ /* Grab and destroy some treasure */ 2938{ /* Grab and destroy some treasure */
2968 object *tmp, *tmp2, *next; 2939 object *tmp, *tmp2, *next;
2969 2940
2970 if (op->container) 2941 op->close_container (); /* close open sack first */
2971 esrv_apply_container (op, op->container); /* close open sack first */
2972 2942
2973 for (tmp = op->inv; tmp; tmp = next) 2943 for (tmp = op->inv; tmp; tmp = next)
2974 { 2944 {
2975 next = tmp->below; 2945 next = tmp->below;
2976 2946
2977 if (tmp->invisible) 2947 if (tmp->invisible)
2978 continue; 2948 continue;
2979 2949
2980 tmp->remove (); 2950 tmp->remove ();
2981 tmp->x = op->x, tmp->y = op->y; 2951 tmp->x = op->x, tmp->y = op->y;
2952
2982 if (tmp->type == CONTAINER) 2953 if (tmp->type == CONTAINER)
2983 { /* empty container to ground */ 2954 loot_object (tmp); /* empty container to ground */
2984 loot_object (tmp); 2955
2985 }
2986 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))))
2987 { 2957 {
2988 if (tmp->nrof > 1) 2958 if (tmp->nrof > 1)
2989 { 2959 {
2990 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2960 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
2991 tmp2->destroy (); 2961 tmp2->destroy ();
… …
3002/* 2972/*
3003 * fix_weight(): Check recursively the weight of all players, and fix 2973 * fix_weight(): Check recursively the weight of all players, and fix
3004 * 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
3005 * was changed. 2975 * was changed.
3006 */ 2976 */
3007
3008void 2977void
3009fix_weight (void) 2978fix_weight (void)
3010{ 2979{
3011 for_all_players (pl) 2980 for_all_players (pl)
3012 { 2981 {
… …
3072 if (op->type == PLAYER) 3041 if (op->type == PLAYER)
3073 { 3042 {
3074 op->contr->tmp_invis = 0; 3043 op->contr->tmp_invis = 0;
3075 op->contr->invis_race = 0; 3044 op->contr->invis_race = 0;
3076 } 3045 }
3046
3077 update_object (op, UP_OBJ_FACE); 3047 update_object (op, UP_OBJ_CHANGE);
3078} 3048}
3079 3049
3080int 3050int
3081is_true_undead (object *op) 3051is_true_undead (object *op)
3082{ 3052{
3083 object *tmp = NULL;
3084
3085 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3053 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3086 return 1; 3054 return 1;
3087 3055
3088 return 0; 3056 return 0;
3089} 3057}
… …
3377 char buf[MAX_BUF]; /* tmp. string buffer */ 3345 char buf[MAX_BUF]; /* tmp. string buffer */
3378 int i = 0, j = 0; 3346 int i = 0, j = 0;
3379 3347
3380 /* get the appropriate treasurelist */ 3348 /* get the appropriate treasurelist */
3381 if (atnr == ATNR_FIRE) 3349 if (atnr == ATNR_FIRE)
3382 trlist = find_treasurelist ("dragon_ability_fire"); 3350 trlist = treasurelist::find ("dragon_ability_fire");
3383 else if (atnr == ATNR_COLD) 3351 else if (atnr == ATNR_COLD)
3384 trlist = find_treasurelist ("dragon_ability_cold"); 3352 trlist = treasurelist::find ("dragon_ability_cold");
3385 else if (atnr == ATNR_ELECTRICITY) 3353 else if (atnr == ATNR_ELECTRICITY)
3386 trlist = find_treasurelist ("dragon_ability_elec"); 3354 trlist = treasurelist::find ("dragon_ability_elec");
3387 else if (atnr == ATNR_POISON) 3355 else if (atnr == ATNR_POISON)
3388 trlist = find_treasurelist ("dragon_ability_poison"); 3356 trlist = treasurelist::find ("dragon_ability_poison");
3389 3357
3390 if (trlist == NULL || who->type != PLAYER) 3358 if (trlist == NULL || who->type != PLAYER)
3391 return; 3359 return;
3392 3360
3393 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++);
… …
3533 pl->ranges[i] = 0; 3501 pl->ranges[i] = 0;
3534 if (pl->shoottype == i) 3502 if (pl->shoottype == i)
3535 pl->shoottype = range_none; 3503 pl->shoottype = range_none;
3536 } 3504 }
3537} 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