ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/player.C
(Generate patch)

Comparing deliantra/server/server/player.C (file contents):
Revision 1.96 by root, Mon Jan 8 19:25:53 2007 UTC vs.
Revision 1.122 by root, Wed May 9 11:32:31 2007 UTC

… …
21 * 21 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <pwd.h>
27#include <sproto.h> 26#include <sproto.h>
28#include <sounds.h> 27#include <sounds.h>
29#include <living.h> 28#include <living.h>
30#include <object.h> 29#include <object.h>
31#include <spells.h> 30#include <spells.h>
… …
116 115
117 news[0] = '\0'; 116 news[0] = '\0';
118 subject[0] = '\0'; 117 subject[0] = '\0';
119 size = 0; 118 size = 0;
120 119
121 while (fgets (buf, MAX_BUF, fp) != NULL) 120 while (fgets (buf, MAX_BUF, fp))
122 { 121 {
123 if (*buf == '#') 122 if (*buf == '#')
124 continue; 123 continue;
125 124
126 if (*buf == '%') 125 if (*buf == '%')
127 { /* send one news */ 126 { /* send one news */
128 if (size > 0) 127 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 */ 128 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 129
131 strcpy (subject, buf + 1); 130 strcpy (subject, buf + 1);
132 strip_endline (subject); 131 strip_endline (subject);
133 size = 0; 132 size = 0;
134 news[0] = '\0'; 133 news[0] = '\0';
… …
144 size += strlen (buf); 143 size += strlen (buf);
145 } 144 }
146 } 145 }
147 146
148 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 147 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); 148 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
150 close_and_delete (fp, comp); 149 close_and_delete (fp, comp);
151} 150}
152 151
153/* This loads the first map an puts the player on it. */ 152/* This loads the first map an puts the player on it. */
154static void 153static void
… …
194 return; 193 return;
195 194
196 terminate_all_pets (ob); 195 terminate_all_pets (ob);
197 remove_friendly_object (ob); 196 remove_friendly_object (ob);
198 ob->deactivate_recursive (); 197 ob->deactivate_recursive ();
198
199 if (ob->map)
200 maplevel = ob->map->path;
201
199 ob->remove (); 202 ob->remove ();
200 ob->map = 0; 203 ob->map = 0;
204 party = 0;
201 205
202 // for weird reasons, this is often "ob", keeping a circular reference 206 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
203 ranges [range_skill] = 0;
204 207
205 players.erase (this); 208 players.erase (this);
206} 209}
207 210
208// connect the player with a specific client 211// connect the player with a specific client
209// also changed, rationalises, and fixes some incorrect settings 212// also changes, rationalises, and fixes some incorrect settings
210void 213void
211player::connect (client *ns) 214player::connect (client *ns)
212{ 215{
213 this->ns = ns; 216 this->ns = ns;
214 ns->pl = this; 217 ns->pl = this;
215 218
216 run_on = 0; 219 run_on = 0;
217 fire_on = 0; 220 fire_on = 0;
221 ob->close_container (); //TODO: client-specific
218 222
219 ns->update_look = 0; 223 ns->update_look = 0;
220 ns->look_position = 0; 224 ns->look_position = 0;
221 225
222 clear_los (ob); 226 clear_los (ob);
… …
225 229
226 /* make sure he's a player -- needed because of class change. */ 230 /* make sure he's a player -- needed because of class change. */
227 ob->type = PLAYER; // we are paranoid 231 ob->type = PLAYER; // we are paranoid
228 ob->race = ob->arch->clone.race; 232 ob->race = ob->arch->clone.race;
229 233
230 if (!legal_range (ob, shoottype))
231 shoottype = range_none;
232
233 ob->carrying = sum_weight (ob); 234 ob->carrying = sum_weight (ob);
234 link_player_skills (ob); 235 link_player_skills (ob);
235 236
236 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 237 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
237 238
238 assign (title, ob->arch->clone.name); 239 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 240
250 /* if it's a dragon player, set the correct title here */ 241 /* if it's a dragon player, set the correct title here */
251 if (is_dragon_pl (ob)) 242 if (is_dragon_pl (ob))
252 { 243 {
253 object *tmp, *abil = 0, *skin = 0; 244 object *tmp, *abil = 0, *skin = 0;
… …
267 258
268 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 259 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
269 260
270 esrv_new_player (this, ob->weight + ob->carrying); 261 esrv_new_player (this, ob->weight + ob->carrying);
271 262
263 for (object *op = ob->inv; op; op = op->below)
264 if (op->flag [FLAG_APPLIED])
265 switch (op->type)
266 {
267 case WAND:
268 case ROD:
269 case HORN:
270 case BOW:
271 case SKILL:
272 case SKILL_TOOL:
273 case WEAPON:
274 fprintf (stderr, "applied<%s>\n", &op->name);//D
275 apply_special (ob, op, AP_UNAPPLY);
276 apply_special (ob, op, AP_APPLY);
277 break;
278 }
279
272 ob->update_stats (); 280 ob->update_stats ();
273 ns->floorbox_update (); 281 ns->floorbox_update ();
274 282
275 esrv_send_inventory (ob, ob); 283 esrv_send_inventory (ob, ob);
276 esrv_add_spells (this, 0); 284 esrv_add_spells (this, 0);
… …
293 if (active) 301 if (active)
294 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); 302 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
295 303
296 INVOKE_PLAYER (DISCONNECT, this); 304 INVOKE_PLAYER (DISCONNECT, this);
297 305
306 ns->reset_stats ();
298 ns->pl = 0; 307 ns->pl = 0;
299 this->ns = 0; 308 ns = 0;
300 } 309 }
310
311 if (ob)
312 ob->close_container (); //TODO: client-specific
301 313
302 deactivate (); 314 deactivate ();
303} 315}
304 316
305// the need for this function can be explained 317// the need for this function can be explained
306// by load_object not returning the object 318// by load_object not returning the object
307void 319void
308player::set_object (object *op) 320player::set_object (object *op)
309{ 321{
310 ob = op; 322 ob = op;
311 ob->contr = this; /* this aren't yet in archetype */ 323 ob->contr = this; /* this aren't yet in archetype */
312 324
313 ob->speed_left = 0.5; 325 ob->speed_left = 0.5;
314 ob->speed = 1.0; 326 ob->speed = 1.0;
315 ob->direction = 5; /* So player faces south */ 327 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} 328}
321 329
322player::player () 330player::player ()
323{ 331{
324 /* There are some elements we want initialised to non zero value - 332 /* There are some elements we want initialised to non zero value -
325 * we deal with that below this point. 333 * we deal with that below this point.
326 */ 334 */
327 outputs_sync = 16; /* Every 2 seconds */ 335 outputs_sync = 4;
328 outputs_count = 8; /* Keeps present behaviour */ 336 outputs_count = 4;
329 unapply = unapply_nochoice; 337 unapply = unapply_nochoice;
330 338
331 savebed_map = first_map_path; /* Init. respawn position */ 339 savebed_map = first_map_path; /* Init. respawn position */
332 340
333 gen_sp_armour = 10; 341 gen_sp_armour = 10;
334 shoottype = range_none;
335 bowtype = bow_normal; 342 bowtype = bow_normal;
336 petmode = pet_normal; 343 petmode = pet_normal;
337 listening = 10; 344 listening = 10;
338 usekeys = containers; 345 usekeys = containers;
339 peaceful = 1; /* default peaceful */ 346 peaceful = 1; /* default peaceful */
… …
368player::create () 375player::create ()
369{ 376{
370 player *pl = new player; 377 player *pl = new player;
371 378
372 pl->set_object (arch_to_object (get_player_archetype (0))); 379 pl->set_object (arch_to_object (get_player_archetype (0)));
380
381 pl->ob->roll_stats ();
382 pl->ob->stats.wc = 2;
383 pl->ob->run_away = 25; /* Then we panick... */
384
373 set_first_map (pl->ob); 385 set_first_map (pl->ob);
374 386
375 return pl; 387 return pl;
376} 388}
377 389
… …
523 x = mon->x; 535 x = mon->x;
524 y = mon->y; 536 y = mon->y;
525 m = mon->map; 537 m = mon->map;
526 dir = rv.direction; 538 dir = rv.direction;
527 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 539 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); 540 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
541
529 /* If we can't solve it within the search distance, return now. */ 542 /* If we can't solve it within the search distance, return now. */
530 if (diff > max) 543 if (diff > max)
531 return 0; 544 return 0;
545
532 while (diff > 1 && max > 0) 546 while (diff > 1 && max > 0)
533 { 547 {
534 lastx = x; 548 lastx = x;
535 lasty = y; 549 lasty = y;
536 lastmap = m; 550 lastmap = m;
… …
618 max--; 632 max--;
619 lastdir = dir; 633 lastdir = dir;
620 if (!firstdir) 634 if (!firstdir)
621 firstdir = dir; 635 firstdir = dir;
622 } 636 }
637
623 if (diff <= 1) 638 if (diff <= 1)
624 { 639 {
625 /* Recalculate diff (distance) because we may not have actually 640 /* Recalculate diff (distance) because we may not have actually
626 * headed toward player for entire distance. 641 * headed toward player for entire distance.
627 */ 642 */
628 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 643 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); 644 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
630 } 645 }
646
631 if (diff > max) 647 if (diff > max)
632 return 0; 648 return 0;
633 } 649 }
650
634 /* If we reached the max, didn't find a direction in time */ 651 /* If we reached the max, didn't find a direction in time */
635 if (!max) 652 if (!max)
636 return 0; 653 return 0;
637 654
638 return firstdir; 655 return firstdir;
… …
752roll_stat (void) 769roll_stat (void)
753{ 770{
754 int a[4], i, j, k; 771 int a[4], i, j, k;
755 772
756 for (i = 0; i < 4; i++) 773 for (i = 0; i < 4; i++)
757 a[i] = (int) RANDOM () % 6 + 1; 774 a[i] = (int) rndm (6) + 1;
758 775
759 for (i = 0, j = 0, k = 7; i < 4; i++) 776 for (i = 0, j = 0, k = 7; i < 4; i++)
760 if (a[i] < k) 777 if (a[i] < k)
761 k = a[i], j = i; 778 k = a[i], j = i;
762 779
… …
862 * appropriate action with it (change race, or other things). 879 * appropriate action with it (change race, or other things).
863 * The function name is for historical reasons - now we have 880 * The function name is for historical reasons - now we have
864 * separate race and class; this actually changes the RACE, 881 * separate race and class; this actually changes the RACE,
865 * not the class. 882 * not the class.
866 */ 883 */
867int 884void
868key_change_class (object *op, char key) 885player::chargen_race_done ()
869{ 886{
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 */ 887 /* this must before then initial items are given */
877 esrv_new_player (op->contr, op->weight + op->carrying); 888 esrv_new_player (ob->contr, ob->weight + ob->carrying);
878 889
879 treasurelist *tl = find_treasurelist ("starting_wealth"); 890 treasurelist *tl = treasurelist::find ("starting_wealth");
880 if (tl) 891 if (tl)
881 create_treasure (tl, op, 0, 0, 0); 892 create_treasure (tl, ob, 0, 0, 0);
882 893
883 INVOKE_PLAYER (BIRTH, op->contr); 894 INVOKE_PLAYER (BIRTH, ob->contr);
884 INVOKE_PLAYER (LOGIN, op->contr); 895 INVOKE_PLAYER (LOGIN, ob->contr);
885 896
886 op->contr->ns->state = ST_PLAYING; 897 ob->contr->ns->state = ST_PLAYING;
887 898
888 if (op->msg) 899 if (ob->msg)
889 op->msg = NULL; 900 ob->msg = 0;
890 901
891 /* We create this now because some of the unique maps will need it 902 /* We create this now because some of the unique maps will need it
892 * to save here. 903 * to save here.
893 */ 904 */
905 {
906 char buf[MAX_BUF];
894 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 907 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
895 make_path_to_file (buf); 908 make_path_to_file (buf);
909 }
896 910
897 start_info (op); 911 start_info (ob);
898 CLEAR_FLAG (op, FLAG_WIZ); 912 CLEAR_FLAG (ob, FLAG_WIZ);
899 give_initial_items (op, op->randomitems); 913 give_initial_items (ob, ob->randomitems);
900 link_player_skills (op); 914 link_player_skills (ob);
901 esrv_send_inventory (op, op); 915 esrv_send_inventory (ob, ob);
902 op->update_stats (); 916 ob->update_stats ();
903 917
904 /* This moves the player to a different start map, if there 918 /* This moves the player to a different start map, if there
905 * is one for this race 919 * is one for this race
906 */ 920 */
907 if (*first_map_ext_path) 921 if (*first_map_ext_path)
908 { 922 {
909 object *tmp; 923 object *tmp;
910 char mapname[MAX_BUF]; 924 char mapname[MAX_BUF];
911 925
912 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name); 926 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
913 tmp = object::create (); 927 tmp = object::create ();
914 EXIT_PATH (tmp) = mapname; 928 EXIT_PATH (tmp) = mapname;
915 EXIT_X (tmp) = op->x; 929 EXIT_X (tmp) = ob->x;
916 EXIT_Y (tmp) = op->y; 930 EXIT_Y (tmp) = ob->y;
917 op->enter_exit (tmp); /* we don't really care if it succeeded; 931 ob->enter_exit (tmp); /* we don't really care if it succeeded;
918 * if the map isn't there, then stay on the 932 * if the map isn't there, then stay on the
919 * default initial map */ 933 * default initial map */
920 tmp->destroy (); 934 tmp->destroy ();
921 } 935 }
922 else 936 else
923 LOG (llevDebug, "first_map_ext_path not set\n"); 937 LOG (llevDebug, "first_map_ext_path not set\n");
938}
924 939
925 return 0; 940void
926 } 941player::chargen_race_next ()
927 942{
928 /* Following actually changes the race - this is the default command 943 /* Following actually changes the race - this is the default command
929 * if we don't match with one of the options above. 944 * if we don't match with one of the options above.
930 */ 945 */
931 946
932 tmp_loop = 0; 947 do
933 while (!tmp_loop)
934 { 948 {
935 shstr name = op->name; 949 shstr name = ob->name;
936 int x = op->x, y = op->y; 950 int x = ob->x, y = ob->y;
937 951
938 op->remove_statbonus (); 952 ob->remove_statbonus ();
939 op->remove (); 953 ob->remove ();
940 op->arch = get_player_archetype (op->arch); 954 ob->arch = get_player_archetype (ob->arch);
941 op->arch->clone.copy_to (op); 955 ob->arch->clone.copy_to (ob);
942 op->instantiate (); 956 ob->instantiate ();
943 op->stats = op->contr->orig_stats; 957 ob->stats = ob->contr->orig_stats;
944 op->name = op->name_pl = name; 958 ob->name = ob->name_pl = name;
945 op->x = x; 959 ob->x = x;
946 op->y = y; 960 ob->y = y;
947 SET_ANIMATION (op, 2); /* So player faces south */ 961 SET_ANIMATION (ob, 2); /* So player faces south */
948 insert_ob_in_map (op, op->map, op, 0); 962 insert_ob_in_map (ob, ob->map, ob, 0);
949 assign (op->contr->title, op->arch->clone.name); 963 assign (ob->contr->title, ob->arch->clone.name);
950 op->add_statbonus (); 964 ob->add_statbonus ();
951 tmp_loop = allowed_class (op);
952 } 965 }
966 while (!allowed_class (ob));
953 967
954 update_object (op, UP_OBJ_FACE); 968 update_object (ob, UP_OBJ_FACE);
955 esrv_update_item (UPD_FACE, op, op); 969 esrv_update_item (UPD_FACE, ob, ob);
956 op->update_stats (); 970 ob->update_stats ();
957 op->stats.hp = op->stats.maxhp; 971 ob->stats.hp = ob->stats.maxhp;
958 op->stats.sp = op->stats.maxsp; 972 ob->stats.sp = ob->stats.maxsp;
959 op->stats.grace = 0; 973 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} 974}
967 975
968void 976void
969flee_player (object *op) 977flee_player (object *op)
970{ 978{
… …
1017 /* Cornered, get rid of scared */ 1025 /* Cornered, get rid of scared */
1018 CLEAR_FLAG (op, FLAG_SCARED); 1026 CLEAR_FLAG (op, FLAG_SCARED);
1019 op->enemy = NULL; 1027 op->enemy = NULL;
1020} 1028}
1021 1029
1022
1023/* check_pick sees if there is stuff to be picked up/picks up stuff. 1030/* check_pick sees if there is stuff to be picked up/picks up stuff.
1024 * IT returns 1 if the player should keep on moving, 0 if he should 1031 * It returns 1 if the player should keep on moving, 0 if he should
1025 * stop. 1032 * stop.
1026 */ 1033 */
1027int 1034int
1028check_pick (object *op) 1035check_pick (object *op)
1029{ 1036{
1030 object *tmp, *next; 1037 object *tmp, *next;
1031 int stop = 0; 1038 int stop = 0;
1032 int j, k, wvratio; 1039 int wvratio;
1033 char putstring[128], tmpstr[16]; 1040 char putstring[128];
1034 1041
1035 /* if you're flying, you cna't pick up anything */ 1042 /* if you're flying, you cna't pick up anything */
1036 if (op->move_type & MOVE_FLYING) 1043 if (op->move_type & MOVE_FLYING)
1037 return 1; 1044 return 1;
1038 1045
… …
1375 * found object is returned. 1382 * found object is returned.
1376 */ 1383 */
1377object * 1384object *
1378find_arrow (object *op, const char *type) 1385find_arrow (object *op, const char *type)
1379{ 1386{
1380 object *tmp = NULL; 1387 object *tmp = 0;
1381 1388
1382 for (op = op->inv; op; op = op->below) 1389 for (op = op->inv; op; op = op->below)
1383 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1390 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1384 tmp = find_arrow (op, type); 1391 tmp = find_arrow (op, type);
1385 else if (op->type == ARROW && op->race == type) 1392 else if (op->type == ARROW && op->race == type)
1386 return op; 1393 return op;
1394
1387 return tmp; 1395 return tmp;
1388} 1396}
1389 1397
1390/* 1398/*
1391 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1399 * 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 1400 * 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 1401 * 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. 1402 * the hall. Failing that it does it's best to pick the highest plus arrow.
1395 */ 1403 */
1396
1397object * 1404object *
1398find_better_arrow (object *op, object *target, const char *type, int *better) 1405find_better_arrow (object *op, object *target, const char *type, int *better)
1399{ 1406{
1400 object *tmp = NULL, *arrow, *ntmp; 1407 object *tmp = NULL, *arrow, *ntmp;
1401 int attacknum, attacktype, betterby = 0, i; 1408 int attacknum, attacktype, betterby = 0, i;
… …
1467 * find_better_arrow to find a decent arrow to use. 1474 * find_better_arrow to find a decent arrow to use.
1468 * op = the shooter 1475 * op = the shooter
1469 * type = bow->race 1476 * type = bow->race
1470 * dir = fire direction 1477 * dir = fire direction
1471 */ 1478 */
1472
1473object * 1479object *
1474pick_arrow_target (object *op, const char *type, int dir) 1480pick_arrow_target (object *op, const char *type, int dir)
1475{ 1481{
1476 object *tmp = NULL; 1482 object *tmp = NULL;
1477 maptile *m; 1483 maptile *m;
… …
1551 { 1557 {
1552 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1558 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1553 return 0; 1559 return 0;
1554 } 1560 }
1555 1561
1556 if (op->type == PLAYER) 1562 if (player *pl = op->contr)
1557 bow = op->contr->ranges[range_bow]; 1563 {
1564 bow = pl->ranged_ob;
1565 op->set_weapon (bow);
1566 }
1558 else 1567 else
1559 { 1568 {
1560 for (bow = op->inv; bow; bow = bow->below) 1569 for (bow = op->inv; bow; bow = bow->below)
1561 /* Don't check for applied - monsters don't apply bows - in that way, they 1570 /* Don't check for applied - monsters don't apply bows - in that way, they
1562 * don't need to switch back and forth between bows and weapons. 1571 * don't need to switch back and forth between bows and weapons.
… …
1567 if (!bow) 1576 if (!bow)
1568 { 1577 {
1569 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1578 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1570 return 0; 1579 return 0;
1571 } 1580 }
1581
1582 // optimisation: move object to top so we will find it quickly again
1583 if (bow->below)
1584 {
1585 bow->remove ();
1586 op->insert (bow);
1587 }
1588
1572 } 1589 }
1573 1590
1574 if (!bow->race || !bow->skill) 1591 if (!bow->race || !bow->skill)
1575 { 1592 {
1576 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1593 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
… …
1593 if (op->type == PLAYER) 1610 if (op->type == PLAYER)
1594 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1611 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1595 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1612 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1596 else 1613 else
1597 CLEAR_FLAG (op, FLAG_READY_BOW); 1614 CLEAR_FLAG (op, FLAG_READY_BOW);
1615
1598 return 0; 1616 return 0;
1599 } 1617 }
1600 } 1618 }
1601 1619
1602 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1620 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
… …
1633 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed; 1651 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1634 op->update_stats (); 1652 op->update_stats ();
1635 } 1653 }
1636 1654
1637 SET_ANIMATION (arrow, arrow->direction); 1655 SET_ANIMATION (arrow, arrow->direction);
1656
1638 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */ 1657 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1639 arrow->stats.hp = arrow->stats.dam; 1658 arrow->stats.hp = arrow->stats.dam;
1640 arrow->stats.grace = arrow->attacktype; 1659 arrow->stats.grace = arrow->attacktype;
1660
1641 if (arrow->slaying != NULL) 1661 if (arrow->slaying)
1642 arrow->spellarg = strdup (arrow->slaying); 1662 arrow->spellarg = strdup (arrow->slaying);
1643 1663
1644 /* Note that this was different for monsters - they got their level 1664 arrow->stats.dam += op->stats.dam + arrow->magic;
1645 * added to the damage. I think the strength bonus is more proper.
1646 */
1647
1648 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1649 1665
1650 /* update the speed */ 1666 /* update the speed */
1651 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 1667 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1652 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0; 1668 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1653 1669
1654 arrow->set_speed (max (arrow->speed, 1.0)); 1670 arrow->set_speed (max (arrow->speed, 1.0));
1655 arrow->speed_left = 0; 1671 arrow->speed_left = 0;
1656 1672
1673 arrow->stats.wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1674
1657 if (op->type == PLAYER) 1675 if (op->type == PLAYER)
1658 { 1676 {
1659 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1660 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1661 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1662
1663 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1677 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1678 arrow->stats.wc -= dex_bonus[op->stats.Dex];
1679
1680 if (!arrow->slaying)
1681 arrow->slaying = op->slaying;
1664 } 1682 }
1665 else 1683 else
1666 { 1684 {
1667 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1668 arrow->level = op->level; 1685 arrow->level = op->level;
1669 } 1686 arrow->stats.wc -= bow->magic;
1670 1687
1671 if (arrow->attacktype == AT_PHYSICAL) 1688 if (!arrow->slaying)
1689 arrow->slaying = bow->slaying;
1690 }
1691
1692 arrow->stats.wc -= arrow->level;
1693
1672 arrow->attacktype |= bow->attacktype; 1694 arrow->attacktype |= bow->attacktype;
1673
1674 if (bow->slaying)
1675 arrow->slaying = bow->slaying;
1676 1695
1677 arrow->move_type = MOVE_FLY_LOW; 1696 arrow->move_type = MOVE_FLY_LOW;
1678 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1697 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1679 1698
1680 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1699 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
… …
1706{ 1725{
1707 int ret = 0, wcmod = 0; 1726 int ret = 0, wcmod = 0;
1708 1727
1709 if (op->contr->bowtype == bow_bestarrow) 1728 if (op->contr->bowtype == bow_bestarrow)
1710 { 1729 {
1711 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1730 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1712 } 1731 }
1713 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1732 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1714 { 1733 {
1715 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1734 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1716 wcmod = -1; 1735 wcmod = -1;
… …
1726 else if (op->contr->bowtype == bow_spreadshot) 1745 else if (op->contr->bowtype == bow_spreadshot)
1727 { 1746 {
1728 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1747 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1729 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1748 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1730 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1749 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1731
1732 } 1750 }
1733 else 1751 else
1734 { 1752 {
1735 /* Simple case */ 1753 /* Simple case */
1736 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1754 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1737 } 1755 }
1756
1738 return ret; 1757 return ret;
1739} 1758}
1740 1759
1741 1760
1742/* Fires a misc (wand/rod/horn) object in 'dir'. 1761/* Fires a misc (wand/rod/horn) object in 'dir'.
1743 * Broken apart from 'fire' to keep it more readable. 1762 * Broken apart from 'fire' to keep it more readable.
1744 */ 1763 */
1745void 1764void
1746fire_misc_object (object *op, int dir) 1765fire_misc_object (object *op, int dir)
1747{ 1766{
1748 object *item; 1767 object *item = op->contr->ranged_ob;
1749 1768
1750 if (!op->contr->ranges[range_misc]) 1769 if (!item)
1751 { 1770 {
1752 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1771 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1753 return; 1772 return;
1754 } 1773 }
1755 1774
1756 item = op->contr->ranges[range_misc];
1757 if (!item->inv) 1775 if (!item->inv)
1758 { 1776 {
1759 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1777 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1760 return; 1778 return;
1761 } 1779 }
1780
1781 op->set_weapon (item);
1782
1762 if (item->type == WAND) 1783 if (item->type == WAND)
1763 { 1784 {
1764 if (item->stats.food <= 0) 1785 if (item->stats.food <= 0)
1765 { 1786 {
1766 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1787 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1767 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1788 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1789
1768 return; 1790 return;
1769 } 1791 }
1770 } 1792 }
1771 else if (item->type == ROD || item->type == HORN) 1793 else if (item->type == ROD || item->type == HORN)
1772 { 1794 {
1773 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1795 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1774 { 1796 {
1775 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1797 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1798
1776 if (item->type == ROD) 1799 if (item->type == ROD)
1777 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1800 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1778 else 1801 else
1779 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1802 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1803
1780 return; 1804 return;
1781 } 1805 }
1782 } 1806 }
1783 1807
1784 if (cast_spell (op, item, dir, item->inv, NULL)) 1808 if (cast_spell (op, item, dir, item->inv, NULL))
… …
1815 1839
1816 /* check for loss of invisiblity/hide */ 1840 /* check for loss of invisiblity/hide */
1817 if (action_makes_visible (op)) 1841 if (action_makes_visible (op))
1818 make_visible (op); 1842 make_visible (op);
1819 1843
1820 switch (op->contr->shoottype) 1844 player *pl = op->contr;
1845
1846 if (pl->golem)
1821 { 1847 {
1822 case range_none: 1848 control_golem (op->contr->golem, dir);
1823 return; 1849 return;
1850 }
1824 1851
1825 case range_bow: 1852 object *ob = pl->ranged_ob;
1853
1854 if (!ob)
1855 return;
1856
1857 switch (ob->type)
1858 {
1859 case BOW:
1826 player_fire_bow (op, dir); 1860 player_fire_bow (op, dir);
1827 return; 1861 break;
1828 1862
1829 case range_magic: /* Casting spells */ 1863 case SPELL:
1830 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1864 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1831 return; 1865 break;
1832 1866
1833 case range_misc: 1867 case BUILDER:
1868 apply_map_builder (op, dir);
1869 break;
1870
1871 case SKILL:
1872 case SKILL_TOOL:
1873 do_skill (op, op, ob, dir, 0);
1874 break;
1875
1876 default:
1834 fire_misc_object (op, dir); 1877 fire_misc_object (op, dir);
1835 return; 1878 break;
1836
1837 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);
1845 return;
1846
1847 case range_skill:
1848 if (!op->chosen_skill)
1849 {
1850 if (op->type == PLAYER)
1851 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1852 return;
1853 }
1854
1855 do_skill (op, op, op->chosen_skill, dir, NULL);
1856 return;
1857 case range_builder:
1858 apply_map_builder (op, dir);
1859 return;
1860 default:
1861 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1862 return;
1863 } 1879 }
1864} 1880}
1865
1866
1867 1881
1868/* find_key 1882/* find_key
1869 * We try to find a key for the door as passed. If we find a key 1883 * 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 1884 * and successfully use it, we return the key, otherwise NULL
1871 * This function merges both normal and locked door, since the logic 1885 * This function merges both normal and locked door, since the logic
… …
1873 * pl is the player, 1887 * pl is the player,
1874 * inv is the objects inventory to searched 1888 * inv is the objects inventory to searched
1875 * door is the door we are trying to match against. 1889 * door is the door we are trying to match against.
1876 * This function can be called recursively to search containers. 1890 * This function can be called recursively to search containers.
1877 */ 1891 */
1878
1879object * 1892object *
1880find_key (object *pl, object *container, object *door) 1893find_key (object *pl, object *container, object *door)
1881{ 1894{
1882 object *tmp, *key; 1895 object *tmp, *key;
1883 1896
1884 /* Should not happen, but sanity checking is never bad */ 1897 /* Should not happen, but sanity checking is never bad */
1885 if (container->inv == NULL) 1898 if (!container->inv)
1886 return NULL; 1899 return 0;
1887 1900
1888 /* First, lets try to find a key in the top level inventory */ 1901 /* First, lets try to find a key in the top level inventory */
1889 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1902 for (tmp = container->inv; tmp; tmp = tmp->below)
1890 { 1903 {
1891 if (door->type == DOOR && tmp->type == KEY) 1904 if (door->type == DOOR && tmp->type == KEY)
1892 break; 1905 break;
1893 /* For sanity, we should really check door type, but other stuff 1906 /* For sanity, we should really check door type, but other stuff
1894 * (like containers) can be locked with special keys 1907 * (like containers) can be locked with special keys
1895 */ 1908 */
1896 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1909 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1897 break; 1910 break;
1898 } 1911 }
1912
1899 /* No key found - lets search inventories now */ 1913 /* No key found - lets search inventories now */
1900 /* If we find and use a key in an inventory, return at that time. 1914 /* 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 1915 * otherwise, if we search all the inventories and still don't find
1902 * a key, return 1916 * a key, return
1903 */ 1917 */
1904 if (!tmp) 1918 if (!tmp)
1905 { 1919 {
1906 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1920 for (tmp = container->inv; tmp; tmp = tmp->below)
1907 { 1921 {
1908 /* No reason to search empty containers */ 1922 /* No reason to search empty containers */
1909 if (tmp->type == CONTAINER && tmp->inv) 1923 if (tmp->type == CONTAINER && tmp->inv)
1910 { 1924 {
1911 if ((key = find_key (pl, tmp, door)) != NULL) 1925 if ((key = find_key (pl, tmp, door)))
1912 return key; 1926 return key;
1913 } 1927 }
1914 } 1928 }
1929
1915 if (!tmp) 1930 if (!tmp)
1916 return NULL; 1931 return NULL;
1917 } 1932 }
1933
1918 /* We get down here if we have found a key. Now if its in a container, 1934 /* 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 1935 * see if we actually want to use it
1920 */ 1936 */
1921 if (pl != container) 1937 if (pl != container)
1922 { 1938 {
… …
1943 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1959 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)); 1960 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1945 return NULL; 1961 return NULL;
1946 } 1962 }
1947 } 1963 }
1964
1948 return tmp; 1965 return tmp;
1949} 1966}
1950 1967
1951/* moved door processing out of move_player_attack. 1968/* moved door processing out of move_player_attack.
1952 * returns 1 if player has opened the door with a key 1969 * returns 1 if player has opened the door with a key
… …
1966 if (key) 1983 if (key)
1967 { 1984 {
1968 object *container = key->env; 1985 object *container = key->env;
1969 1986
1970 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1987 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1988
1971 if (action_makes_visible (op)) 1989 if (action_makes_visible (op))
1972 make_visible (op); 1990 make_visible (op);
1991
1973 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1992 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1974 spring_trap (door->inv, op); 1993 spring_trap (door->inv, op);
1994
1975 if (door->type == DOOR) 1995 if (door->type == DOOR)
1976 {
1977 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1996 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1978 }
1979 else if (door->type == LOCKED_DOOR) 1997 else if (door->type == LOCKED_DOOR)
1980 { 1998 {
1981 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1999 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 ;-) */ 2000 remove_door2 (door); /* remove door without violence ;-) */
1983 } 2001 }
2002
1984 /* Do this after we print the message */ 2003 /* Do this after we print the message */
1985 decrease_ob (key); /* Use up one of the keys */ 2004 decrease_ob (key); /* Use up one of the keys */
1986 /* Need to update the weight the container the key was in */ 2005 /* Need to update the weight the container the key was in */
1987 if (container != op) 2006 if (container != op)
1988 esrv_update_item (UPD_WEIGHT, op, container); 2007 esrv_update_item (UPD_WEIGHT, op, container);
2008
1989 return 1; /* Nothing more to do below */ 2009 return 1; /* Nothing more to do below */
1990 } 2010 }
1991 else if (door->type == LOCKED_DOOR) 2011 else if (door->type == LOCKED_DOOR)
1992 { 2012 {
1993 /* Might as well return now - no other way to open this */ 2013 /* Might as well return now - no other way to open this */
1994 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 2014 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
1995 return 1; 2015 return 1;
1996 } 2016 }
2017
1997 return 0; 2018 return 0;
1998} 2019}
1999 2020
2000/* This function is just part of a breakup from move_player. 2021/* This function is just part of a breakup from move_player.
2001 * It should keep the code cleaner. 2022 * It should keep the code cleaner.
… …
2005 */ 2026 */
2006void 2027void
2007move_player_attack (object *op, int dir) 2028move_player_attack (object *op, int dir)
2008{ 2029{
2009 object *tmp, *mon; 2030 object *tmp, *mon;
2010 sint16 nx, ny;
2011 int on_battleground; 2031 int on_battleground;
2012 maptile *m; 2032 maptile *m;
2013 2033
2014 nx = freearr_x[dir] + op->x; 2034 sint16 nx = freearr_x[dir] + op->x;
2015 ny = freearr_y[dir] + op->y; 2035 sint16 ny = freearr_y[dir] + op->y;
2016 2036
2017 on_battleground = op_on_battleground (op, 0, 0); 2037 on_battleground = op_on_battleground (op, 0, 0);
2018 2038
2019 /* If braced, or can't move to the square, and it is not out of the 2039 /* If braced, or can't move to the square, and it is not out of the
2020 * map, attack it. Note order of if statement is important - don't 2040 * map, attack it. Note order of if statement is important - don't
… …
2100 /* If we're braced, we don't want to switch places with it */ 2120 /* If we're braced, we don't want to switch places with it */
2101 if (op->contr->braced) 2121 if (op->contr->braced)
2102 return; 2122 return;
2103 2123
2104 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2124 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2105 (void) push_ob (mon, dir, op); 2125 push_ob (mon, dir, op);
2106 if (op->contr->tmp_invis || op->hide) 2126 if (op->contr->tmp_invis || op->hide)
2107 make_visible (op); 2127 make_visible (op);
2108 2128
2109 return; 2129 return;
2110 } 2130 }
… …
2207 return 0; 2227 return 0;
2208 } 2228 }
2209 2229
2210 /* peterm: added following line */ 2230 /* peterm: added following line */
2211 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2231 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2212 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2232 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2213 2233
2214 op->facing = dir; 2234 op->facing = dir;
2215 2235
2216 if (op->hide) 2236 if (op->hide)
2217 do_hidden_move (op); 2237 do_hidden_move (op);
… …
2250 * Returns true if there are more actions we can do. 2270 * Returns true if there are more actions we can do.
2251 */ 2271 */
2252int 2272int
2253handle_newcs_player (object *op) 2273handle_newcs_player (object *op)
2254{ 2274{
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)) 2275 if (QUERY_FLAG (op, FLAG_SCARED))
2276 { 2276 {
2277 flee_player (op); 2277 flee_player (op);
2278 /* If player is still scared, that is his action for this tick */ 2278 /* If player is still scared, that is his action for this tick */
2279 if (QUERY_FLAG (op, FLAG_SCARED)) 2279 if (QUERY_FLAG (op, FLAG_SCARED))
2280 { 2280 {
2281 op->speed_left--; 2281 op->speed_left--;
2282 return 0; 2282 return 0;
2283 } 2283 }
2284 } 2284 }
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 2285
2294 /* call this here - we also will call this in do_ericserver, but 2286 /* call this here - we also will call this in do_ericserver, but
2295 * the players time has been increased when doericserver has been 2287 * the players time has been increased when doericserver has been
2296 * called, so we recheck it here. 2288 * called, so we recheck it here.
2297 */ 2289 */
… …
2358 * from. 2350 * from.
2359 */ 2351 */
2360void 2352void
2361remove_unpaid_objects (object *op, object *env) 2353remove_unpaid_objects (object *op, object *env)
2362{ 2354{
2363 object *next;
2364
2365 while (op) 2355 while (op)
2366 { 2356 {
2367 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2357 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2368 2358
2369 if (QUERY_FLAG (op, FLAG_UNPAID)) 2359 if (QUERY_FLAG (op, FLAG_UNPAID))
… …
2435 int rate_grace = 2000; 2425 int rate_grace = 2000;
2436 const int max_hp = 1; 2426 const int max_hp = 1;
2437 const int max_sp = 1; 2427 const int max_sp = 1;
2438 const int max_grace = 1; 2428 const int max_grace = 1;
2439 2429
2440 if (op->contr->outputs_sync) 2430 if (op->contr->hidden)
2431 {
2432 op->invisible = 1000;
2433 /* the socket code flashes the player visible/invisible
2434 * depending on the value of invisible, so we need to
2435 * alternate it here for it to work correctly.
2436 */
2437 if (pticks & 2)
2438 op->invisible--;
2441 { 2439 }
2442 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2440 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) 2441 {
2444 flush_output_element (op, &op->contr->outputs[i]); 2442 if (!op->invisible--)
2443 {
2444 make_visible (op);
2445 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2446 }
2445 } 2447 }
2446 2448
2447 if (op->contr->ns->state == ST_PLAYING) 2449 if (op->contr->ns->state == ST_PLAYING)
2448 { 2450 {
2449 /* these next three if clauses make it possible to SLOW DOWN 2451 /* these next three if clauses make it possible to SLOW DOWN
… …
2471 gen_grace = op->stats.maxgrace; 2473 gen_grace = op->stats.maxgrace;
2472 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2474 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2473 } 2475 }
2474 2476
2475 /* Regenerate Spell Points */ 2477 /* Regenerate Spell Points */
2476 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0) 2478 if (!op->contr->golem && --op->last_sp < 0)
2477 { 2479 {
2478 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); 2480 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) 2481 if (op->stats.sp < op->stats.maxsp)
2480 { 2482 {
2481 op->stats.sp++; 2483 op->stats.sp++;
… …
2699 tmp->name = buf; 2701 tmp->name = buf;
2700 sprintf (buf, " This finger has been cut off %s\n" 2702 sprintf (buf, " This finger has been cut off %s\n"
2701 " the %s, when he was defeated at\n level %d by %s.\n", 2703 " 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); 2704 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2703 tmp->msg = buf; 2705 tmp->msg = buf;
2704 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2706 tmp->value = 0, tmp->type = 0;
2705 tmp->materialname = NULL; 2707 tmp->materialname = "organics";
2706 tmp->insert_at (op, tmp); 2708 tmp->insert_at (op, tmp);
2707 } 2709 }
2708 2710
2709 /* teleport defeated player to new destination */ 2711 /* teleport defeated player to new destination */
2710 transfer_ob (op, x, y, 0, NULL); 2712 transfer_ob (op, x, y, 0, NULL);
… …
2906 op->stats.hp = op->stats.maxhp; 2908 op->stats.hp = op->stats.maxhp;
2907 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2909 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2908 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2910 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2909 2911
2910 /* 2912 /*
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 2913 * Check to see if the player has any unpaid items. If so, remove them
2913 * in the map. 2914 * and put them back in the map.
2914 */ 2915 */
2915
2916 if (is_in_shop (op))
2917 remove_unpaid_objects (op->inv, op); 2916 remove_unpaid_objects (op->inv, op);
2918 2917
2919 /****************************************/ 2918 /****************************************/
2920 /* */ 2919 /* */
2921 /* Move player to his current respawn- */ 2920 /* Move player to his current respawn- */
2922 /* position (usually last savebed) */ 2921 /* position (usually last savebed) */
… …
2962void 2961void
2963loot_object (object *op) 2962loot_object (object *op)
2964{ /* Grab and destroy some treasure */ 2963{ /* Grab and destroy some treasure */
2965 object *tmp, *tmp2, *next; 2964 object *tmp, *tmp2, *next;
2966 2965
2967 if (op->container) 2966 op->close_container (); /* close open sack first */
2968 esrv_apply_container (op, op->container); /* close open sack first */
2969 2967
2970 for (tmp = op->inv; tmp; tmp = next) 2968 for (tmp = op->inv; tmp; tmp = next)
2971 { 2969 {
2972 next = tmp->below; 2970 next = tmp->below;
2973 2971
2974 if (tmp->invisible) 2972 if (tmp->invisible)
2975 continue; 2973 continue;
2976 2974
2977 tmp->remove (); 2975 tmp->remove ();
2978 tmp->x = op->x, tmp->y = op->y; 2976 tmp->x = op->x, tmp->y = op->y;
2977
2979 if (tmp->type == CONTAINER) 2978 if (tmp->type == CONTAINER)
2980 { /* empty container to ground */ 2979 loot_object (tmp); /* empty container to ground */
2981 loot_object (tmp); 2980
2982 }
2983 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2981 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2984 { 2982 {
2985 if (tmp->nrof > 1) 2983 if (tmp->nrof > 1)
2986 { 2984 {
2987 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2985 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
2988 tmp2->destroy (); 2986 tmp2->destroy ();
… …
2999/* 2997/*
3000 * fix_weight(): Check recursively the weight of all players, and fix 2998 * fix_weight(): Check recursively the weight of all players, and fix
3001 * what needs to be fixed. Refresh windows and fix speed if anything 2999 * what needs to be fixed. Refresh windows and fix speed if anything
3002 * was changed. 3000 * was changed.
3003 */ 3001 */
3004
3005void 3002void
3006fix_weight (void) 3003fix_weight (void)
3007{ 3004{
3008 for_all_players (pl) 3005 for_all_players (pl)
3009 { 3006 {
… …
3069 if (op->type == PLAYER) 3066 if (op->type == PLAYER)
3070 { 3067 {
3071 op->contr->tmp_invis = 0; 3068 op->contr->tmp_invis = 0;
3072 op->contr->invis_race = 0; 3069 op->contr->invis_race = 0;
3073 } 3070 }
3071
3074 update_object (op, UP_OBJ_FACE); 3072 update_object (op, UP_OBJ_CHANGE);
3075} 3073}
3076 3074
3077int 3075int
3078is_true_undead (object *op) 3076is_true_undead (object *op)
3079{ 3077{
3080 object *tmp = NULL;
3081
3082 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3078 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3083 return 1; 3079 return 1;
3084 3080
3085 return 0; 3081 return 0;
3086} 3082}
… …
3374 char buf[MAX_BUF]; /* tmp. string buffer */ 3370 char buf[MAX_BUF]; /* tmp. string buffer */
3375 int i = 0, j = 0; 3371 int i = 0, j = 0;
3376 3372
3377 /* get the appropriate treasurelist */ 3373 /* get the appropriate treasurelist */
3378 if (atnr == ATNR_FIRE) 3374 if (atnr == ATNR_FIRE)
3379 trlist = find_treasurelist ("dragon_ability_fire"); 3375 trlist = treasurelist::find ("dragon_ability_fire");
3380 else if (atnr == ATNR_COLD) 3376 else if (atnr == ATNR_COLD)
3381 trlist = find_treasurelist ("dragon_ability_cold"); 3377 trlist = treasurelist::find ("dragon_ability_cold");
3382 else if (atnr == ATNR_ELECTRICITY) 3378 else if (atnr == ATNR_ELECTRICITY)
3383 trlist = find_treasurelist ("dragon_ability_elec"); 3379 trlist = treasurelist::find ("dragon_ability_elec");
3384 else if (atnr == ATNR_POISON) 3380 else if (atnr == ATNR_POISON)
3385 trlist = find_treasurelist ("dragon_ability_poison"); 3381 trlist = treasurelist::find ("dragon_ability_poison");
3386 3382
3387 if (trlist == NULL || who->type != PLAYER) 3383 if (trlist == NULL || who->type != PLAYER)
3388 return; 3384 return;
3389 3385
3390 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3386 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
… …
3522 * not readied. 3518 * not readied.
3523 */ 3519 */
3524void 3520void
3525player_unready_range_ob (player *pl, object *ob) 3521player_unready_range_ob (player *pl, object *ob)
3526{ 3522{
3527 for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3523 if (pl->ob->current_weapon == ob)
3524 pl->ob->current_weapon = 0;
3525
3526 if (pl->combat_ob == ob)
3527 pl->combat_ob = 0;
3528
3528 if (pl->ranges[i] == ob) 3529 if (pl->ranged_ob == ob)
3529 {
3530 pl->ranges[i] = 0; 3530 pl->ranged_ob = 0;
3531 if (pl->shoottype == i)
3532 pl->shoottype = range_none;
3533 }
3534} 3531}
3532
3533sint8
3534player::visibility_at (maptile *map, int x, int y) const
3535{
3536 if (!ns)
3537 return 0;
3538
3539 int dx, dy;
3540 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3541 return 0;
3542
3543 x += dx - ns->current_x + ns->mapx / 2;
3544 y += dy - ns->current_y + ns->mapy / 2;
3545
3546 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3547 return 0;
3548
3549 return 100 - blocked_los [x][y];
3550}

Diff Legend

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