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.99 by root, Thu Jan 18 19:42:10 2007 UTC vs.
Revision 1.116 by root, Sun Apr 29 03:44:36 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)
199 maplevel = ob->map->path; 201 maplevel = ob->map->path;
202
200 ob->remove (); 203 ob->remove ();
201 ob->map = 0; 204 ob->map = 0;
205 party = 0;
202 206
203 // for weird reasons, this is often "ob", keeping a circular reference 207 // for weird reasons, this is often "ob", keeping a circular reference
204 ranges [range_skill] = 0; 208 ranges [range_skill] = 0;
205 209
206 players.erase (this); 210 players.erase (this);
… …
214 this->ns = ns; 218 this->ns = ns;
215 ns->pl = this; 219 ns->pl = this;
216 220
217 run_on = 0; 221 run_on = 0;
218 fire_on = 0; 222 fire_on = 0;
219 ob->container = 0; //TODO: client-specific 223 ob->close_container (); //TODO: client-specific
220 224
221 ns->update_look = 0; 225 ns->update_look = 0;
222 ns->look_position = 0; 226 ns->look_position = 0;
223 227
224 clear_los (ob); 228 clear_los (ob);
… …
236 link_player_skills (ob); 240 link_player_skills (ob);
237 241
238 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 242 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
239 243
240 assign (title, ob->arch->clone.name); 244 assign (title, ob->arch->clone.name);
241
242 /* can_use_shield is a new flag. However, the can_use.. seems to largely come
243 * from the class, and not race. I don't see any way to get the class information
244 * to then update this. I don't think this will actually break anything - anyone
245 * that can use armour should be able to use a shield. What this may 'break'
246 * are features new characters get, eg, if someone starts up with a Q, they
247 * should be able to use a shield. However, old Q's won't get that advantage.
248 */
249 if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
250 SET_FLAG (ob, FLAG_USE_SHIELD);
251 245
252 /* if it's a dragon player, set the correct title here */ 246 /* if it's a dragon player, set the correct title here */
253 if (is_dragon_pl (ob)) 247 if (is_dragon_pl (ob))
254 { 248 {
255 object *tmp, *abil = 0, *skin = 0; 249 object *tmp, *abil = 0, *skin = 0;
… …
297 291
298 INVOKE_PLAYER (DISCONNECT, this); 292 INVOKE_PLAYER (DISCONNECT, this);
299 293
300 ns->reset_stats (); 294 ns->reset_stats ();
301 ns->pl = 0; 295 ns->pl = 0;
302 this->ns = 0; 296 ns = 0;
303 } 297 }
304 298
299 if (ob)
305 ob->container = 0; //TODO: client-specific 300 ob->close_container (); //TODO: client-specific
301
306 deactivate (); 302 deactivate ();
307} 303}
308 304
309// the need for this function can be explained 305// the need for this function can be explained
310// by load_object not returning the object 306// by load_object not returning the object
311void 307void
312player::set_object (object *op) 308player::set_object (object *op)
313{ 309{
314 ob = op; 310 ob = op;
315 ob->contr = this; /* this aren't yet in archetype */ 311 ob->contr = this; /* this aren't yet in archetype */
316 312
317 ob->speed_left = 0.5; 313 ob->speed_left = 0.5;
318 ob->speed = 1.0; 314 ob->speed = 1.0;
319 ob->direction = 5; /* So player faces south */ 315 ob->direction = 5; /* So player faces south */
320 ob->stats.wc = 2;
321 ob->run_away = 25; /* Then we panick... */
322
323 ob->roll_stats ();
324} 316}
325 317
326player::player () 318player::player ()
327{ 319{
328 /* There are some elements we want initialised to non zero value - 320 /* There are some elements we want initialised to non zero value -
329 * we deal with that below this point. 321 * we deal with that below this point.
330 */ 322 */
331 outputs_sync = 16; /* Every 2 seconds */ 323 outputs_sync = 4;
332 outputs_count = 8; /* Keeps present behaviour */ 324 outputs_count = 4;
333 unapply = unapply_nochoice; 325 unapply = unapply_nochoice;
334 326
335 savebed_map = first_map_path; /* Init. respawn position */ 327 savebed_map = first_map_path; /* Init. respawn position */
336 328
337 gen_sp_armour = 10; 329 gen_sp_armour = 10;
… …
372player::create () 364player::create ()
373{ 365{
374 player *pl = new player; 366 player *pl = new player;
375 367
376 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
377 set_first_map (pl->ob); 374 set_first_map (pl->ob);
378 375
379 return pl; 376 return pl;
380} 377}
381 378
… …
527 x = mon->x; 524 x = mon->x;
528 y = mon->y; 525 y = mon->y;
529 m = mon->map; 526 m = mon->map;
530 dir = rv.direction; 527 dir = rv.direction;
531 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 */
532 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
533 /* 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. */
534 if (diff > max) 532 if (diff > max)
535 return 0; 533 return 0;
534
536 while (diff > 1 && max > 0) 535 while (diff > 1 && max > 0)
537 { 536 {
538 lastx = x; 537 lastx = x;
539 lasty = y; 538 lasty = y;
540 lastmap = m; 539 lastmap = m;
… …
622 max--; 621 max--;
623 lastdir = dir; 622 lastdir = dir;
624 if (!firstdir) 623 if (!firstdir)
625 firstdir = dir; 624 firstdir = dir;
626 } 625 }
626
627 if (diff <= 1) 627 if (diff <= 1)
628 { 628 {
629 /* Recalculate diff (distance) because we may not have actually 629 /* Recalculate diff (distance) because we may not have actually
630 * headed toward player for entire distance. 630 * headed toward player for entire distance.
631 */ 631 */
632 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 632 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
633 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));
634 } 634 }
635
635 if (diff > max) 636 if (diff > max)
636 return 0; 637 return 0;
637 } 638 }
639
638 /* 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 */
639 if (!max) 641 if (!max)
640 return 0; 642 return 0;
641 643
642 return firstdir; 644 return firstdir;
… …
866 * appropriate action with it (change race, or other things). 868 * appropriate action with it (change race, or other things).
867 * The function name is for historical reasons - now we have 869 * The function name is for historical reasons - now we have
868 * separate race and class; this actually changes the RACE, 870 * separate race and class; this actually changes the RACE,
869 * not the class. 871 * not the class.
870 */ 872 */
871int 873void
872key_change_class (object *op, char key) 874player::chargen_race_done ()
873{ 875{
874 int tmp_loop;
875
876 if (key == 'd' || key == 'D')
877 {
878 char buf[MAX_BUF];
879
880 /* this must before then initial items are given */ 876 /* this must before then initial items are given */
881 esrv_new_player (op->contr, op->weight + op->carrying); 877 esrv_new_player (ob->contr, ob->weight + ob->carrying);
882 878
883 treasurelist *tl = find_treasurelist ("starting_wealth"); 879 treasurelist *tl = treasurelist::find ("starting_wealth");
884 if (tl) 880 if (tl)
885 create_treasure (tl, op, 0, 0, 0); 881 create_treasure (tl, ob, 0, 0, 0);
886 882
887 INVOKE_PLAYER (BIRTH, op->contr); 883 INVOKE_PLAYER (BIRTH, ob->contr);
888 INVOKE_PLAYER (LOGIN, op->contr); 884 INVOKE_PLAYER (LOGIN, ob->contr);
889 885
890 op->contr->ns->state = ST_PLAYING; 886 ob->contr->ns->state = ST_PLAYING;
891 887
892 if (op->msg) 888 if (ob->msg)
893 op->msg = NULL; 889 ob->msg = 0;
894 890
895 /* 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
896 * to save here. 892 * to save here.
897 */ 893 */
894 {
895 char buf[MAX_BUF];
898 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 896 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
899 make_path_to_file (buf); 897 make_path_to_file (buf);
898 }
900 899
901 start_info (op); 900 start_info (ob);
902 CLEAR_FLAG (op, FLAG_WIZ); 901 CLEAR_FLAG (ob, FLAG_WIZ);
903 give_initial_items (op, op->randomitems); 902 give_initial_items (ob, ob->randomitems);
904 link_player_skills (op); 903 link_player_skills (ob);
905 esrv_send_inventory (op, op); 904 esrv_send_inventory (ob, ob);
906 op->update_stats (); 905 ob->update_stats ();
907 906
908 /* This moves the player to a different start map, if there 907 /* This moves the player to a different start map, if there
909 * is one for this race 908 * is one for this race
910 */ 909 */
911 if (*first_map_ext_path) 910 if (*first_map_ext_path)
912 { 911 {
913 object *tmp; 912 object *tmp;
914 char mapname[MAX_BUF]; 913 char mapname[MAX_BUF];
915 914
916 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);
917 tmp = object::create (); 916 tmp = object::create ();
918 EXIT_PATH (tmp) = mapname; 917 EXIT_PATH (tmp) = mapname;
919 EXIT_X (tmp) = op->x; 918 EXIT_X (tmp) = ob->x;
920 EXIT_Y (tmp) = op->y; 919 EXIT_Y (tmp) = ob->y;
921 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;
922 * if the map isn't there, then stay on the 921 * if the map isn't there, then stay on the
923 * default initial map */ 922 * default initial map */
924 tmp->destroy (); 923 tmp->destroy ();
925 } 924 }
926 else 925 else
927 LOG (llevDebug, "first_map_ext_path not set\n"); 926 LOG (llevDebug, "first_map_ext_path not set\n");
927}
928 928
929 return 0; 929void
930 } 930player::chargen_race_next ()
931 931{
932 /* Following actually changes the race - this is the default command 932 /* Following actually changes the race - this is the default command
933 * if we don't match with one of the options above. 933 * if we don't match with one of the options above.
934 */ 934 */
935 935
936 tmp_loop = 0; 936 do
937 while (!tmp_loop)
938 { 937 {
939 shstr name = op->name; 938 shstr name = ob->name;
940 int x = op->x, y = op->y; 939 int x = ob->x, y = ob->y;
941 940
942 op->remove_statbonus (); 941 ob->remove_statbonus ();
943 op->remove (); 942 ob->remove ();
944 op->arch = get_player_archetype (op->arch); 943 ob->arch = get_player_archetype (ob->arch);
945 op->arch->clone.copy_to (op); 944 ob->arch->clone.copy_to (ob);
946 op->instantiate (); 945 ob->instantiate ();
947 op->stats = op->contr->orig_stats; 946 ob->stats = ob->contr->orig_stats;
948 op->name = op->name_pl = name; 947 ob->name = ob->name_pl = name;
949 op->x = x; 948 ob->x = x;
950 op->y = y; 949 ob->y = y;
951 SET_ANIMATION (op, 2); /* So player faces south */ 950 SET_ANIMATION (ob, 2); /* So player faces south */
952 insert_ob_in_map (op, op->map, op, 0); 951 insert_ob_in_map (ob, ob->map, ob, 0);
953 assign (op->contr->title, op->arch->clone.name); 952 assign (ob->contr->title, ob->arch->clone.name);
954 op->add_statbonus (); 953 ob->add_statbonus ();
955 tmp_loop = allowed_class (op);
956 } 954 }
955 while (!allowed_class (ob));
957 956
958 update_object (op, UP_OBJ_FACE); 957 update_object (ob, UP_OBJ_FACE);
959 esrv_update_item (UPD_FACE, op, op); 958 esrv_update_item (UPD_FACE, ob, ob);
960 op->update_stats (); 959 ob->update_stats ();
961 op->stats.hp = op->stats.maxhp; 960 ob->stats.hp = ob->stats.maxhp;
962 op->stats.sp = op->stats.maxsp; 961 ob->stats.sp = ob->stats.maxsp;
963 op->stats.grace = 0; 962 ob->stats.grace = 0;
964
965 if (op->msg)
966 new_draw_info (NDI_BLUE, 0, op, op->msg);
967
968 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
969 return 0;
970} 963}
971 964
972void 965void
973flee_player (object *op) 966flee_player (object *op)
974{ 967{
… …
1031int 1024int
1032check_pick (object *op) 1025check_pick (object *op)
1033{ 1026{
1034 object *tmp, *next; 1027 object *tmp, *next;
1035 int stop = 0; 1028 int stop = 0;
1036 int j, k, wvratio; 1029 int wvratio;
1037 char putstring[128], tmpstr[16]; 1030 char putstring[128];
1038 1031
1039 /* if you're flying, you cna't pick up anything */ 1032 /* if you're flying, you cna't pick up anything */
1040 if (op->move_type & MOVE_FLYING) 1033 if (op->move_type & MOVE_FLYING)
1041 return 1; 1034 return 1;
1042 1035
… …
1379 * found object is returned. 1372 * found object is returned.
1380 */ 1373 */
1381object * 1374object *
1382find_arrow (object *op, const char *type) 1375find_arrow (object *op, const char *type)
1383{ 1376{
1384 object *tmp = NULL; 1377 object *tmp = 0;
1385 1378
1386 for (op = op->inv; op; op = op->below) 1379 for (op = op->inv; op; op = op->below)
1387 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))
1388 tmp = find_arrow (op, type); 1381 tmp = find_arrow (op, type);
1389 else if (op->type == ARROW && op->race == type) 1382 else if (op->type == ARROW && op->race == type)
1390 return op; 1383 return op;
1384
1391 return tmp; 1385 return tmp;
1392} 1386}
1393 1387
1394/* 1388/*
1395 * 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
1396 * 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
1397 * 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
1398 * 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.
1399 */ 1393 */
1400
1401object * 1394object *
1402find_better_arrow (object *op, object *target, const char *type, int *better) 1395find_better_arrow (object *op, object *target, const char *type, int *better)
1403{ 1396{
1404 object *tmp = NULL, *arrow, *ntmp; 1397 object *tmp = NULL, *arrow, *ntmp;
1405 int attacknum, attacktype, betterby = 0, i; 1398 int attacknum, attacktype, betterby = 0, i;
… …
1597 if (op->type == PLAYER) 1590 if (op->type == PLAYER)
1598 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1591 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1599 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1592 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1600 else 1593 else
1601 CLEAR_FLAG (op, FLAG_READY_BOW); 1594 CLEAR_FLAG (op, FLAG_READY_BOW);
1595
1602 return 0; 1596 return 0;
1603 } 1597 }
1604 } 1598 }
1605 1599
1606 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1600 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
… …
1637 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed; 1631 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1638 op->update_stats (); 1632 op->update_stats ();
1639 } 1633 }
1640 1634
1641 SET_ANIMATION (arrow, arrow->direction); 1635 SET_ANIMATION (arrow, arrow->direction);
1636
1642 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */ 1637 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1643 arrow->stats.hp = arrow->stats.dam; 1638 arrow->stats.hp = arrow->stats.dam;
1644 arrow->stats.grace = arrow->attacktype; 1639 arrow->stats.grace = arrow->attacktype;
1640
1645 if (arrow->slaying != NULL) 1641 if (arrow->slaying)
1646 arrow->spellarg = strdup (arrow->slaying); 1642 arrow->spellarg = strdup (arrow->slaying);
1647 1643
1648 /* Note that this was different for monsters - they got their level 1644 arrow->stats.dam += op->stats.dam + arrow->magic;
1649 * added to the damage. I think the strength bonus is more proper.
1650 */
1651
1652 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1653 1645
1654 /* update the speed */ 1646 /* update the speed */
1655 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 1647 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1656 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0; 1648 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1657 1649
1658 arrow->set_speed (max (arrow->speed, 1.0)); 1650 arrow->set_speed (max (arrow->speed, 1.0));
1659 arrow->speed_left = 0; 1651 arrow->speed_left = 0;
1660 1652
1653 arrow->stats.wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1654
1661 if (op->type == PLAYER) 1655 if (op->type == PLAYER)
1662 { 1656 {
1663 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1664 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1665 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1666
1667 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1657 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1658 arrow->stats.wc -= dex_bonus[op->stats.Dex];
1659
1660 if (!arrow->slaying)
1661 arrow->slaying = op->slaying;
1668 } 1662 }
1669 else 1663 else
1670 { 1664 {
1671 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1672 arrow->level = op->level; 1665 arrow->level = op->level;
1673 } 1666 arrow->stats.wc -= bow->magic;
1674 1667
1675 if (arrow->attacktype == AT_PHYSICAL) 1668 if (!arrow->slaying)
1669 arrow->slaying = bow->slaying;
1670 }
1671
1672 arrow->stats.wc -= arrow->level;
1673
1676 arrow->attacktype |= bow->attacktype; 1674 arrow->attacktype |= bow->attacktype;
1677
1678 if (bow->slaying)
1679 arrow->slaying = bow->slaying;
1680 1675
1681 arrow->move_type = MOVE_FLY_LOW; 1676 arrow->move_type = MOVE_FLY_LOW;
1682 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1677 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1683 1678
1684 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1679 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
… …
1837 case range_misc: 1832 case range_misc:
1838 fire_misc_object (op, dir); 1833 fire_misc_object (op, dir);
1839 return; 1834 return;
1840 1835
1841 case range_golem: /* Control summoned monsters from scrolls */ 1836 case range_golem: /* Control summoned monsters from scrolls */
1842 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1843 {
1844 op->contr->ranges[range_golem] = 0;
1845 op->contr->shoottype = range_none;
1846 }
1847 else
1848 control_golem (op->contr->ranges[range_golem], dir); 1837 control_golem (op->contr->ranges[range_golem], dir);
1849 return; 1838 return;
1850 1839
1851 case range_skill: 1840 case range_skill:
1852 if (!op->chosen_skill) 1841 if (!op->chosen_skill)
1853 { 1842 {
1854 if (op->type == PLAYER) 1843 if (op->type == PLAYER)
1855 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use."); 1844 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1845
1856 return; 1846 return;
1857 } 1847 }
1858 1848
1859 do_skill (op, op, op->chosen_skill, dir, NULL); 1849 do_skill (op, op, op->chosen_skill, dir, NULL);
1860 return; 1850 return;
… …
1864 default: 1854 default:
1865 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type."); 1855 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1866 return; 1856 return;
1867 } 1857 }
1868} 1858}
1869
1870
1871 1859
1872/* find_key 1860/* find_key
1873 * We try to find a key for the door as passed. If we find a key 1861 * We try to find a key for the door as passed. If we find a key
1874 * and successfully use it, we return the key, otherwise NULL 1862 * and successfully use it, we return the key, otherwise NULL
1875 * This function merges both normal and locked door, since the logic 1863 * This function merges both normal and locked door, since the logic
… …
1877 * pl is the player, 1865 * pl is the player,
1878 * inv is the objects inventory to searched 1866 * inv is the objects inventory to searched
1879 * door is the door we are trying to match against. 1867 * door is the door we are trying to match against.
1880 * This function can be called recursively to search containers. 1868 * This function can be called recursively to search containers.
1881 */ 1869 */
1882
1883object * 1870object *
1884find_key (object *pl, object *container, object *door) 1871find_key (object *pl, object *container, object *door)
1885{ 1872{
1886 object *tmp, *key; 1873 object *tmp, *key;
1887 1874
1888 /* Should not happen, but sanity checking is never bad */ 1875 /* Should not happen, but sanity checking is never bad */
1889 if (container->inv == NULL) 1876 if (!container->inv)
1890 return NULL; 1877 return 0;
1891 1878
1892 /* First, lets try to find a key in the top level inventory */ 1879 /* First, lets try to find a key in the top level inventory */
1893 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1880 for (tmp = container->inv; tmp; tmp = tmp->below)
1894 { 1881 {
1895 if (door->type == DOOR && tmp->type == KEY) 1882 if (door->type == DOOR && tmp->type == KEY)
1896 break; 1883 break;
1897 /* For sanity, we should really check door type, but other stuff 1884 /* For sanity, we should really check door type, but other stuff
1898 * (like containers) can be locked with special keys 1885 * (like containers) can be locked with special keys
1899 */ 1886 */
1900 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1887 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1901 break; 1888 break;
1902 } 1889 }
1890
1903 /* No key found - lets search inventories now */ 1891 /* No key found - lets search inventories now */
1904 /* If we find and use a key in an inventory, return at that time. 1892 /* If we find and use a key in an inventory, return at that time.
1905 * otherwise, if we search all the inventories and still don't find 1893 * otherwise, if we search all the inventories and still don't find
1906 * a key, return 1894 * a key, return
1907 */ 1895 */
1908 if (!tmp) 1896 if (!tmp)
1909 { 1897 {
1910 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1898 for (tmp = container->inv; tmp; tmp = tmp->below)
1911 { 1899 {
1912 /* No reason to search empty containers */ 1900 /* No reason to search empty containers */
1913 if (tmp->type == CONTAINER && tmp->inv) 1901 if (tmp->type == CONTAINER && tmp->inv)
1914 { 1902 {
1915 if ((key = find_key (pl, tmp, door)) != NULL) 1903 if ((key = find_key (pl, tmp, door)))
1916 return key; 1904 return key;
1917 } 1905 }
1918 } 1906 }
1907
1919 if (!tmp) 1908 if (!tmp)
1920 return NULL; 1909 return NULL;
1921 } 1910 }
1911
1922 /* We get down here if we have found a key. Now if its in a container, 1912 /* We get down here if we have found a key. Now if its in a container,
1923 * see if we actually want to use it 1913 * see if we actually want to use it
1924 */ 1914 */
1925 if (pl != container) 1915 if (pl != container)
1926 { 1916 {
… …
1947 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1937 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1948 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1938 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1949 return NULL; 1939 return NULL;
1950 } 1940 }
1951 } 1941 }
1942
1952 return tmp; 1943 return tmp;
1953} 1944}
1954 1945
1955/* moved door processing out of move_player_attack. 1946/* moved door processing out of move_player_attack.
1956 * returns 1 if player has opened the door with a key 1947 * returns 1 if player has opened the door with a key
… …
1974 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1965 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1975 if (action_makes_visible (op)) 1966 if (action_makes_visible (op))
1976 make_visible (op); 1967 make_visible (op);
1977 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1968 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1978 spring_trap (door->inv, op); 1969 spring_trap (door->inv, op);
1970
1979 if (door->type == DOOR) 1971 if (door->type == DOOR)
1980 {
1981 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1972 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1982 }
1983 else if (door->type == LOCKED_DOOR) 1973 else if (door->type == LOCKED_DOOR)
1984 { 1974 {
1985 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1975 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
1986 remove_door2 (door); /* remove door without violence ;-) */ 1976 remove_door2 (door); /* remove door without violence ;-) */
1987 } 1977 }
1978
1988 /* Do this after we print the message */ 1979 /* Do this after we print the message */
1989 decrease_ob (key); /* Use up one of the keys */ 1980 decrease_ob (key); /* Use up one of the keys */
1990 /* Need to update the weight the container the key was in */ 1981 /* Need to update the weight the container the key was in */
1991 if (container != op) 1982 if (container != op)
1992 esrv_update_item (UPD_WEIGHT, op, container); 1983 esrv_update_item (UPD_WEIGHT, op, container);
1984
1993 return 1; /* Nothing more to do below */ 1985 return 1; /* Nothing more to do below */
1994 } 1986 }
1995 else if (door->type == LOCKED_DOOR) 1987 else if (door->type == LOCKED_DOOR)
1996 { 1988 {
1997 /* Might as well return now - no other way to open this */ 1989 /* Might as well return now - no other way to open this */
1998 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1990 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
1999 return 1; 1991 return 1;
2000 } 1992 }
1993
2001 return 0; 1994 return 0;
2002} 1995}
2003 1996
2004/* This function is just part of a breakup from move_player. 1997/* This function is just part of a breakup from move_player.
2005 * It should keep the code cleaner. 1998 * It should keep the code cleaner.
… …
2254 * Returns true if there are more actions we can do. 2247 * Returns true if there are more actions we can do.
2255 */ 2248 */
2256int 2249int
2257handle_newcs_player (object *op) 2250handle_newcs_player (object *op)
2258{ 2251{
2259 if (op->contr->hidden)
2260 {
2261 op->invisible = 1000;
2262 /* the socket code flashes the player visible/invisible
2263 * depending on the value of invisible, so we need to
2264 * alternate it here for it to work correctly.
2265 */
2266 if (pticks & 2)
2267 op->invisible--;
2268 }
2269 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2270 {
2271 op->invisible--;
2272 if (!op->invisible)
2273 {
2274 make_visible (op);
2275 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2276 }
2277 }
2278
2279 if (QUERY_FLAG (op, FLAG_SCARED)) 2252 if (QUERY_FLAG (op, FLAG_SCARED))
2280 { 2253 {
2281 flee_player (op); 2254 flee_player (op);
2282 /* If player is still scared, that is his action for this tick */ 2255 /* If player is still scared, that is his action for this tick */
2283 if (QUERY_FLAG (op, FLAG_SCARED)) 2256 if (QUERY_FLAG (op, FLAG_SCARED))
2284 { 2257 {
2285 op->speed_left--; 2258 op->speed_left--;
2286 return 0; 2259 return 0;
2287 } 2260 }
2288 } 2261 }
2289
2290 /* I've been seeing crashes where the golem has been destroyed, but
2291 * the player object still points to the defunct golem. The code that
2292 * destroys the golem looks correct, and it doesn't always happen, so
2293 * put this in a a workaround to clean up the golem pointer.
2294 */
2295 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2296 op->contr->ranges[range_golem] = 0;
2297 2262
2298 /* call this here - we also will call this in do_ericserver, but 2263 /* call this here - we also will call this in do_ericserver, but
2299 * the players time has been increased when doericserver has been 2264 * the players time has been increased when doericserver has been
2300 * called, so we recheck it here. 2265 * called, so we recheck it here.
2301 */ 2266 */
… …
2362 * from. 2327 * from.
2363 */ 2328 */
2364void 2329void
2365remove_unpaid_objects (object *op, object *env) 2330remove_unpaid_objects (object *op, object *env)
2366{ 2331{
2367 object *next;
2368
2369 while (op) 2332 while (op)
2370 { 2333 {
2371 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2334 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2372 2335
2373 if (QUERY_FLAG (op, FLAG_UNPAID)) 2336 if (QUERY_FLAG (op, FLAG_UNPAID))
… …
2439 int rate_grace = 2000; 2402 int rate_grace = 2000;
2440 const int max_hp = 1; 2403 const int max_hp = 1;
2441 const int max_sp = 1; 2404 const int max_sp = 1;
2442 const int max_grace = 1; 2405 const int max_grace = 1;
2443 2406
2444 if (op->contr->outputs_sync) 2407 if (op->contr->hidden)
2408 {
2409 op->invisible = 1000;
2410 /* the socket code flashes the player visible/invisible
2411 * depending on the value of invisible, so we need to
2412 * alternate it here for it to work correctly.
2413 */
2414 if (pticks & 2)
2415 op->invisible--;
2445 { 2416 }
2446 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2417 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2447 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2418 {
2448 flush_output_element (op, &op->contr->outputs[i]); 2419 if (!op->invisible--)
2420 {
2421 make_visible (op);
2422 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2423 }
2449 } 2424 }
2450 2425
2451 if (op->contr->ns->state == ST_PLAYING) 2426 if (op->contr->ns->state == ST_PLAYING)
2452 { 2427 {
2453 /* these next three if clauses make it possible to SLOW DOWN 2428 /* these next three if clauses make it possible to SLOW DOWN
… …
2475 gen_grace = op->stats.maxgrace; 2450 gen_grace = op->stats.maxgrace;
2476 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2451 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2477 } 2452 }
2478 2453
2479 /* Regenerate Spell Points */ 2454 /* Regenerate Spell Points */
2480 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0) 2455 if (!op->contr->ranges[range_golem] && --op->last_sp < 0)
2481 { 2456 {
2482 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); 2457 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2483 if (op->stats.sp < op->stats.maxsp) 2458 if (op->stats.sp < op->stats.maxsp)
2484 { 2459 {
2485 op->stats.sp++; 2460 op->stats.sp++;
… …
2703 tmp->name = buf; 2678 tmp->name = buf;
2704 sprintf (buf, " This finger has been cut off %s\n" 2679 sprintf (buf, " This finger has been cut off %s\n"
2705 " the %s, when he was defeated at\n level %d by %s.\n", 2680 " the %s, when he was defeated at\n level %d by %s.\n",
2706 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2681 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2707 tmp->msg = buf; 2682 tmp->msg = buf;
2708 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2683 tmp->value = 0, tmp->type = 0;
2709 tmp->materialname = NULL; 2684 tmp->materialname = "organics";
2710 tmp->insert_at (op, tmp); 2685 tmp->insert_at (op, tmp);
2711 } 2686 }
2712 2687
2713 /* teleport defeated player to new destination */ 2688 /* teleport defeated player to new destination */
2714 transfer_ob (op, x, y, 0, NULL); 2689 transfer_ob (op, x, y, 0, NULL);
… …
2910 op->stats.hp = op->stats.maxhp; 2885 op->stats.hp = op->stats.maxhp;
2911 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2886 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2912 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2887 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2913 2888
2914 /* 2889 /*
2915 * Check to see if the player is in a shop. IF so, then check to see if
2916 * the player has any unpaid items. If so, remove them and put them back 2890 * Check to see if the player has any unpaid items. If so, remove them
2917 * in the map. 2891 * and put them back in the map.
2918 */ 2892 */
2919
2920 if (is_in_shop (op))
2921 remove_unpaid_objects (op->inv, op); 2893 remove_unpaid_objects (op->inv, op);
2922 2894
2923 /****************************************/ 2895 /****************************************/
2924 /* */ 2896 /* */
2925 /* Move player to his current respawn- */ 2897 /* Move player to his current respawn- */
2926 /* position (usually last savebed) */ 2898 /* position (usually last savebed) */
… …
2966void 2938void
2967loot_object (object *op) 2939loot_object (object *op)
2968{ /* Grab and destroy some treasure */ 2940{ /* Grab and destroy some treasure */
2969 object *tmp, *tmp2, *next; 2941 object *tmp, *tmp2, *next;
2970 2942
2971 if (op->container) 2943 op->close_container (); /* close open sack first */
2972 esrv_apply_container (op, op->container); /* close open sack first */
2973 2944
2974 for (tmp = op->inv; tmp; tmp = next) 2945 for (tmp = op->inv; tmp; tmp = next)
2975 { 2946 {
2976 next = tmp->below; 2947 next = tmp->below;
2977 2948
2978 if (tmp->invisible) 2949 if (tmp->invisible)
2979 continue; 2950 continue;
2980 2951
2981 tmp->remove (); 2952 tmp->remove ();
2982 tmp->x = op->x, tmp->y = op->y; 2953 tmp->x = op->x, tmp->y = op->y;
2954
2983 if (tmp->type == CONTAINER) 2955 if (tmp->type == CONTAINER)
2984 { /* empty container to ground */ 2956 loot_object (tmp); /* empty container to ground */
2985 loot_object (tmp); 2957
2986 }
2987 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3)))) 2958 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2988 { 2959 {
2989 if (tmp->nrof > 1) 2960 if (tmp->nrof > 1)
2990 { 2961 {
2991 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2962 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
… …
3003/* 2974/*
3004 * fix_weight(): Check recursively the weight of all players, and fix 2975 * fix_weight(): Check recursively the weight of all players, and fix
3005 * what needs to be fixed. Refresh windows and fix speed if anything 2976 * what needs to be fixed. Refresh windows and fix speed if anything
3006 * was changed. 2977 * was changed.
3007 */ 2978 */
3008
3009void 2979void
3010fix_weight (void) 2980fix_weight (void)
3011{ 2981{
3012 for_all_players (pl) 2982 for_all_players (pl)
3013 { 2983 {
… …
3073 if (op->type == PLAYER) 3043 if (op->type == PLAYER)
3074 { 3044 {
3075 op->contr->tmp_invis = 0; 3045 op->contr->tmp_invis = 0;
3076 op->contr->invis_race = 0; 3046 op->contr->invis_race = 0;
3077 } 3047 }
3048
3078 update_object (op, UP_OBJ_FACE); 3049 update_object (op, UP_OBJ_CHANGE);
3079} 3050}
3080 3051
3081int 3052int
3082is_true_undead (object *op) 3053is_true_undead (object *op)
3083{ 3054{
3084 object *tmp = NULL;
3085
3086 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3055 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3087 return 1; 3056 return 1;
3088 3057
3089 return 0; 3058 return 0;
3090} 3059}
… …
3378 char buf[MAX_BUF]; /* tmp. string buffer */ 3347 char buf[MAX_BUF]; /* tmp. string buffer */
3379 int i = 0, j = 0; 3348 int i = 0, j = 0;
3380 3349
3381 /* get the appropriate treasurelist */ 3350 /* get the appropriate treasurelist */
3382 if (atnr == ATNR_FIRE) 3351 if (atnr == ATNR_FIRE)
3383 trlist = find_treasurelist ("dragon_ability_fire"); 3352 trlist = treasurelist::find ("dragon_ability_fire");
3384 else if (atnr == ATNR_COLD) 3353 else if (atnr == ATNR_COLD)
3385 trlist = find_treasurelist ("dragon_ability_cold"); 3354 trlist = treasurelist::find ("dragon_ability_cold");
3386 else if (atnr == ATNR_ELECTRICITY) 3355 else if (atnr == ATNR_ELECTRICITY)
3387 trlist = find_treasurelist ("dragon_ability_elec"); 3356 trlist = treasurelist::find ("dragon_ability_elec");
3388 else if (atnr == ATNR_POISON) 3357 else if (atnr == ATNR_POISON)
3389 trlist = find_treasurelist ("dragon_ability_poison"); 3358 trlist = treasurelist::find ("dragon_ability_poison");
3390 3359
3391 if (trlist == NULL || who->type != PLAYER) 3360 if (trlist == NULL || who->type != PLAYER)
3392 return; 3361 return;
3393 3362
3394 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3363 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
… …
3534 pl->ranges[i] = 0; 3503 pl->ranges[i] = 0;
3535 if (pl->shoottype == i) 3504 if (pl->shoottype == i)
3536 pl->shoottype = range_none; 3505 pl->shoottype = range_none;
3537 } 3506 }
3538} 3507}
3508
3509sint8
3510player::visibility_at (maptile *map, int x, int y) const
3511{
3512 if (!ns)
3513 return 0;
3514
3515 int dx, dy;
3516 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3517 return 0;
3518
3519 x += dx - ns->current_x + ns->mapx / 2;
3520 y += dy - ns->current_y + ns->mapy / 2;
3521
3522 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3523 return 0;
3524
3525 return 100 - blocked_los [x][y];
3526}

Diff Legend

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