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.134 by root, Sun May 13 08:43:12 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 apply_special (ob, op, AP_UNAPPLY);
275 apply_special (ob, op, AP_APPLY);
276 break;
277 }
278
272 ob->update_stats (); 279 ob->update_stats ();
273 ns->floorbox_update (); 280 ns->floorbox_update ();
274 281
275 esrv_send_inventory (ob, ob); 282 esrv_send_inventory (ob, ob);
276 esrv_add_spells (this, 0); 283 esrv_add_spells (this, 0);
… …
293 if (active) 300 if (active)
294 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); 301 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
295 302
296 INVOKE_PLAYER (DISCONNECT, this); 303 INVOKE_PLAYER (DISCONNECT, this);
297 304
305 ns->reset_stats ();
298 ns->pl = 0; 306 ns->pl = 0;
299 this->ns = 0; 307 ns = 0;
300 } 308 }
309
310 if (ob)
311 ob->close_container (); //TODO: client-specific
301 312
302 deactivate (); 313 deactivate ();
303} 314}
304 315
305// the need for this function can be explained 316// the need for this function can be explained
306// by load_object not returning the object 317// by load_object not returning the object
307void 318void
308player::set_object (object *op) 319player::set_object (object *op)
309{ 320{
310 ob = op; 321 ob = op;
311 ob->contr = this; /* this aren't yet in archetype */ 322 ob->contr = this; /* this aren't yet in archetype */
312 323
313 ob->speed_left = 0.5; 324 ob->speed_left = 0.5f;
314 ob->speed = 1.0; 325 ob->speed = 1.0f;
315 ob->direction = 5; /* So player faces south */ 326 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} 327}
321 328
322player::player () 329player::player ()
323{ 330{
324 /* There are some elements we want initialised to non zero value - 331 /* There are some elements we want initialised to non zero value -
325 * we deal with that below this point. 332 * we deal with that below this point.
326 */ 333 */
327 outputs_sync = 16; /* Every 2 seconds */ 334 outputs_sync = 4;
328 outputs_count = 8; /* Keeps present behaviour */ 335 outputs_count = 4;
329 unapply = unapply_nochoice; 336 unapply = unapply_nochoice;
330 337
331 savebed_map = first_map_path; /* Init. respawn position */ 338 savebed_map = first_map_path; /* Init. respawn position */
332 339
333 gen_sp_armour = 10; 340 gen_sp_armour = 10;
334 shoottype = range_none;
335 bowtype = bow_normal; 341 bowtype = bow_normal;
336 petmode = pet_normal; 342 petmode = pet_normal;
337 listening = 10; 343 listening = 10;
338 usekeys = containers; 344 usekeys = containers;
339 peaceful = 1; /* default peaceful */ 345 peaceful = 1; /* default peaceful */
… …
368player::create () 374player::create ()
369{ 375{
370 player *pl = new player; 376 player *pl = new player;
371 377
372 pl->set_object (arch_to_object (get_player_archetype (0))); 378 pl->set_object (arch_to_object (get_player_archetype (0)));
379
380 pl->ob->roll_stats ();
381 pl->ob->stats.wc = 2;
382 pl->ob->run_away = 25; /* Then we panick... */
383
373 set_first_map (pl->ob); 384 set_first_map (pl->ob);
374 385
375 return pl; 386 return pl;
376} 387}
377 388
… …
523 x = mon->x; 534 x = mon->x;
524 y = mon->y; 535 y = mon->y;
525 m = mon->map; 536 m = mon->map;
526 dir = rv.direction; 537 dir = rv.direction;
527 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 538 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); 539 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
540
529 /* If we can't solve it within the search distance, return now. */ 541 /* If we can't solve it within the search distance, return now. */
530 if (diff > max) 542 if (diff > max)
531 return 0; 543 return 0;
544
532 while (diff > 1 && max > 0) 545 while (diff > 1 && max > 0)
533 { 546 {
534 lastx = x; 547 lastx = x;
535 lasty = y; 548 lasty = y;
536 lastmap = m; 549 lastmap = m;
… …
618 max--; 631 max--;
619 lastdir = dir; 632 lastdir = dir;
620 if (!firstdir) 633 if (!firstdir)
621 firstdir = dir; 634 firstdir = dir;
622 } 635 }
636
623 if (diff <= 1) 637 if (diff <= 1)
624 { 638 {
625 /* Recalculate diff (distance) because we may not have actually 639 /* Recalculate diff (distance) because we may not have actually
626 * headed toward player for entire distance. 640 * headed toward player for entire distance.
627 */ 641 */
628 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 642 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); 643 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
630 } 644 }
645
631 if (diff > max) 646 if (diff > max)
632 return 0; 647 return 0;
633 } 648 }
649
634 /* If we reached the max, didn't find a direction in time */ 650 /* If we reached the max, didn't find a direction in time */
635 if (!max) 651 if (!max)
636 return 0; 652 return 0;
637 653
638 return firstdir; 654 return firstdir;
… …
752roll_stat (void) 768roll_stat (void)
753{ 769{
754 int a[4], i, j, k; 770 int a[4], i, j, k;
755 771
756 for (i = 0; i < 4; i++) 772 for (i = 0; i < 4; i++)
757 a[i] = (int) RANDOM () % 6 + 1; 773 a[i] = (int) rndm (6) + 1;
758 774
759 for (i = 0, j = 0, k = 7; i < 4; i++) 775 for (i = 0, j = 0, k = 7; i < 4; i++)
760 if (a[i] < k) 776 if (a[i] < k)
761 k = a[i], j = i; 777 k = a[i], j = i;
762 778
… …
768} 784}
769 785
770void 786void
771object::roll_stats () 787object::roll_stats ()
772{ 788{
773 int statsort [7]; 789 int statsort [NUM_STATS];
774 790
775 for (;;) 791 for (;;)
776 { 792 {
777 int sum = 0; 793 int sum = 0;
778 for (int i = 7; i--; ) 794 for (int i = NUM_STATS; i--; )
779 sum += statsort [i] = roll_stat (); 795 sum += statsort [i] = roll_stat ();
780 796
781 if (sum >= 82 && sum <= 116) 797 if (sum >= 82 && sum <= 116)
782 break; 798 break;
783 } 799 }
784 800
785 // Sort the stats so that rerolling is easier... 801 // Sort the stats so that rerolling is easier...
786 std::sort (statsort, statsort + 7, std::greater<int>()); 802 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
787 803
804 for (int i = 0; i < NUM_STATS; ++i)
788 stats.Str = statsort[0]; 805 stats.stat (i) = statsort [i];
789 stats.Dex = statsort[1];
790 stats.Con = statsort[2];
791 stats.Int = statsort[3];
792 stats.Wis = statsort[4];
793 stats.Pow = statsort[5];
794 stats.Cha = statsort[6];
795 806
796 stats.exp = 0; 807 stats.exp = 0;
797 stats.ac = 0; 808 stats.ac = 0;
798 809
799 stats.hp = stats.maxhp; 810 stats.hp = stats.maxhp;
… …
811} 822}
812 823
813void 824void
814object::swap_stats (int a, int b) 825object::swap_stats (int a, int b)
815{ 826{
816 int tmp = get_attr_value (&contr->orig_stats, a); 827 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
817 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
818 set_attr_value (&contr->orig_stats, b, tmp);
819 828
829 for (int i = 0; i < NUM_STATS; ++i)
820 stats.Str = contr->orig_stats.Str; 830 stats.stat (i) = contr->orig_stats.stat (i);
821 stats.Dex = contr->orig_stats.Dex;
822 stats.Con = contr->orig_stats.Con;
823 stats.Int = contr->orig_stats.Int;
824 stats.Wis = contr->orig_stats.Wis;
825 stats.Pow = contr->orig_stats.Pow;
826 stats.Cha = contr->orig_stats.Cha;
827 831
828 //TODO: the following code looks so borked and should, at the very least, 832 //TODO: the following code looks so borked and should, at the very least,
829 // be merged with the similar code in roll_stats 833 // be merged with the similar code in roll_stats
830 stats.ac = 0; 834 stats.ac = 0;
831 835
… …
862 * appropriate action with it (change race, or other things). 866 * appropriate action with it (change race, or other things).
863 * The function name is for historical reasons - now we have 867 * The function name is for historical reasons - now we have
864 * separate race and class; this actually changes the RACE, 868 * separate race and class; this actually changes the RACE,
865 * not the class. 869 * not the class.
866 */ 870 */
867int 871void
868key_change_class (object *op, char key) 872player::chargen_race_done ()
869{ 873{
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 */ 874 /* this must before then initial items are given */
877 esrv_new_player (op->contr, op->weight + op->carrying); 875 esrv_new_player (ob->contr, ob->weight + ob->carrying);
878 876
879 treasurelist *tl = find_treasurelist ("starting_wealth"); 877 treasurelist *tl = treasurelist::find ("starting_wealth");
880 if (tl) 878 if (tl)
881 create_treasure (tl, op, 0, 0, 0); 879 create_treasure (tl, ob, 0, 0, 0);
882 880
883 INVOKE_PLAYER (BIRTH, op->contr); 881 INVOKE_PLAYER (BIRTH, ob->contr);
884 INVOKE_PLAYER (LOGIN, op->contr); 882 INVOKE_PLAYER (LOGIN, ob->contr);
885 883
886 op->contr->ns->state = ST_PLAYING; 884 ob->contr->ns->state = ST_PLAYING;
887 885
888 if (op->msg) 886 if (ob->msg)
889 op->msg = NULL; 887 ob->msg = 0;
890 888
891 /* We create this now because some of the unique maps will need it 889 /* We create this now because some of the unique maps will need it
892 * to save here. 890 * to save here.
893 */ 891 */
892 {
893 char buf[MAX_BUF];
894 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 894 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
895 make_path_to_file (buf); 895 make_path_to_file (buf);
896 }
896 897
897 start_info (op); 898 start_info (ob);
898 CLEAR_FLAG (op, FLAG_WIZ); 899 CLEAR_FLAG (ob, FLAG_WIZ);
899 give_initial_items (op, op->randomitems); 900 give_initial_items (ob, ob->randomitems);
900 link_player_skills (op); 901 link_player_skills (ob);
901 esrv_send_inventory (op, op); 902 esrv_send_inventory (ob, ob);
902 op->update_stats (); 903 ob->update_stats ();
903 904
904 /* This moves the player to a different start map, if there 905 /* This moves the player to a different start map, if there
905 * is one for this race 906 * is one for this race
906 */ 907 */
907 if (*first_map_ext_path) 908 if (*first_map_ext_path)
908 { 909 {
909 object *tmp; 910 object *tmp;
910 char mapname[MAX_BUF]; 911 char mapname[MAX_BUF];
911 912
912 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name); 913 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
913 tmp = object::create (); 914 tmp = object::create ();
914 EXIT_PATH (tmp) = mapname; 915 EXIT_PATH (tmp) = mapname;
915 EXIT_X (tmp) = op->x; 916 EXIT_X (tmp) = ob->x;
916 EXIT_Y (tmp) = op->y; 917 EXIT_Y (tmp) = ob->y;
917 op->enter_exit (tmp); /* we don't really care if it succeeded; 918 ob->enter_exit (tmp); /* we don't really care if it succeeded;
918 * if the map isn't there, then stay on the 919 * if the map isn't there, then stay on the
919 * default initial map */ 920 * default initial map */
920 tmp->destroy (); 921 tmp->destroy ();
921 } 922 }
922 else 923 else
923 LOG (llevDebug, "first_map_ext_path not set\n"); 924 LOG (llevDebug, "first_map_ext_path not set\n");
925}
924 926
925 return 0; 927void
926 } 928player::chargen_race_next ()
927 929{
928 /* Following actually changes the race - this is the default command 930 /* Following actually changes the race - this is the default command
929 * if we don't match with one of the options above. 931 * if we don't match with one of the options above.
930 */ 932 */
931 933
932 tmp_loop = 0; 934 do
933 while (!tmp_loop)
934 { 935 {
935 shstr name = op->name; 936 shstr name = ob->name;
936 int x = op->x, y = op->y; 937 int x = ob->x, y = ob->y;
937 938
938 op->remove_statbonus (); 939 ob->remove_statbonus ();
939 op->remove (); 940 ob->remove ();
940 op->arch = get_player_archetype (op->arch); 941 ob->arch = get_player_archetype (ob->arch);
941 op->arch->clone.copy_to (op); 942 ob->arch->clone.copy_to (ob);
942 op->instantiate (); 943 ob->instantiate ();
943 op->stats = op->contr->orig_stats; 944 ob->stats = ob->contr->orig_stats;
944 op->name = op->name_pl = name; 945 ob->name = ob->name_pl = name;
945 op->x = x; 946 ob->x = x;
946 op->y = y; 947 ob->y = y;
947 SET_ANIMATION (op, 2); /* So player faces south */ 948 SET_ANIMATION (ob, 2); /* So player faces south */
948 insert_ob_in_map (op, op->map, op, 0); 949 insert_ob_in_map (ob, ob->map, ob, 0);
949 assign (op->contr->title, op->arch->clone.name); 950 assign (ob->contr->title, ob->arch->clone.name);
950 op->add_statbonus (); 951 ob->add_statbonus ();
951 tmp_loop = allowed_class (op);
952 } 952 }
953 while (!allowed_class (ob));
953 954
954 update_object (op, UP_OBJ_FACE); 955 update_object (ob, UP_OBJ_FACE);
955 esrv_update_item (UPD_FACE, op, op); 956 esrv_update_item (UPD_FACE, ob, ob);
956 op->update_stats (); 957 ob->update_stats ();
957 op->stats.hp = op->stats.maxhp; 958 ob->stats.hp = ob->stats.maxhp;
958 op->stats.sp = op->stats.maxsp; 959 ob->stats.sp = ob->stats.maxsp;
959 op->stats.grace = 0; 960 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} 961}
967 962
968void 963void
969flee_player (object *op) 964flee_player (object *op)
970{ 965{
… …
1017 /* Cornered, get rid of scared */ 1012 /* Cornered, get rid of scared */
1018 CLEAR_FLAG (op, FLAG_SCARED); 1013 CLEAR_FLAG (op, FLAG_SCARED);
1019 op->enemy = NULL; 1014 op->enemy = NULL;
1020} 1015}
1021 1016
1022
1023/* check_pick sees if there is stuff to be picked up/picks up stuff. 1017/* 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 1018 * It returns 1 if the player should keep on moving, 0 if he should
1025 * stop. 1019 * stop.
1026 */ 1020 */
1027int 1021int
1028check_pick (object *op) 1022check_pick (object *op)
1029{ 1023{
1030 object *tmp, *next; 1024 object *tmp, *next;
1031 int stop = 0; 1025 int stop = 0;
1032 int j, k, wvratio; 1026 int wvratio;
1033 char putstring[128], tmpstr[16]; 1027 char putstring[128];
1034 1028
1035 /* if you're flying, you cna't pick up anything */ 1029 /* if you're flying, you cna't pick up anything */
1036 if (op->move_type & MOVE_FLYING) 1030 if (op->move_type & MOVE_FLYING)
1037 return 1; 1031 return 1;
1038 1032
… …
1375 * found object is returned. 1369 * found object is returned.
1376 */ 1370 */
1377object * 1371object *
1378find_arrow (object *op, const char *type) 1372find_arrow (object *op, const char *type)
1379{ 1373{
1380 object *tmp = NULL; 1374 object *tmp = 0;
1381 1375
1382 for (op = op->inv; op; op = op->below) 1376 for (op = op->inv; op; op = op->below)
1383 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1377 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1384 tmp = find_arrow (op, type); 1378 tmp = find_arrow (op, type);
1385 else if (op->type == ARROW && op->race == type) 1379 else if (op->type == ARROW && op->race == type)
1386 return op; 1380 return op;
1381
1387 return tmp; 1382 return tmp;
1388} 1383}
1389 1384
1390/* 1385/*
1391 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1386 * 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 1387 * 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 1388 * 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. 1389 * the hall. Failing that it does it's best to pick the highest plus arrow.
1395 */ 1390 */
1396
1397object * 1391object *
1398find_better_arrow (object *op, object *target, const char *type, int *better) 1392find_better_arrow (object *op, object *target, const char *type, int *better)
1399{ 1393{
1400 object *tmp = NULL, *arrow, *ntmp; 1394 object *tmp = NULL, *arrow, *ntmp;
1401 int attacknum, attacktype, betterby = 0, i; 1395 int attacknum, attacktype, betterby = 0, i;
… …
1467 * find_better_arrow to find a decent arrow to use. 1461 * find_better_arrow to find a decent arrow to use.
1468 * op = the shooter 1462 * op = the shooter
1469 * type = bow->race 1463 * type = bow->race
1470 * dir = fire direction 1464 * dir = fire direction
1471 */ 1465 */
1472
1473object * 1466object *
1474pick_arrow_target (object *op, const char *type, int dir) 1467pick_arrow_target (object *op, const char *type, int dir)
1475{ 1468{
1476 object *tmp = NULL; 1469 object *tmp = NULL;
1477 maptile *m; 1470 maptile *m;
… …
1542 */ 1535 */
1543int 1536int
1544fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) 1537fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1545{ 1538{
1546 object *left, *bow; 1539 object *left, *bow;
1547 int bowspeed, mflags; 1540 int mflags;
1548 maptile *m; 1541 maptile *m;
1549 1542
1550 if (!dir) 1543 if (!dir)
1551 { 1544 {
1552 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1545 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1553 return 0; 1546 return 0;
1554 } 1547 }
1555 1548
1556 if (op->type == PLAYER) 1549 if (player *pl = op->contr)
1557 bow = op->contr->ranges[range_bow]; 1550 {
1551 bow = pl->ranged_ob;
1552 if (!op->change_weapon (bow))
1553 return 0;
1554 }
1558 else 1555 else
1559 { 1556 {
1560 for (bow = op->inv; bow; bow = bow->below) 1557 for (bow = op->inv; bow; bow = bow->below)
1561 /* Don't check for applied - monsters don't apply bows - in that way, they 1558 /* 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. 1559 * don't need to switch back and forth between bows and weapons.
… …
1567 if (!bow) 1564 if (!bow)
1568 { 1565 {
1569 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1566 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1570 return 0; 1567 return 0;
1571 } 1568 }
1569
1570 // optimisation: move object to top so we will find it quickly again
1571 if (bow->below)
1572 {
1573 bow->remove ();
1574 op->insert (bow);
1575 }
1576
1572 } 1577 }
1573 1578
1574 if (!bow->race || !bow->skill) 1579 if (!bow->race || !bow->skill)
1575 { 1580 {
1576 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1581 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1577 return 0; 1582 return 0;
1578 } 1583 }
1579
1580 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1581
1582 /* penalize ROF for bestarrow */
1583 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1584 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1585
1586 if (bowspeed < 1)
1587 bowspeed = 1;
1588 1584
1589 if (arrow == NULL) 1585 if (arrow == NULL)
1590 { 1586 {
1591 if ((arrow = find_arrow (op, bow->race)) == NULL) 1587 if ((arrow = find_arrow (op, bow->race)) == NULL)
1592 { 1588 {
1593 if (op->type == PLAYER) 1589 if (op->type == PLAYER)
1594 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1590 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 */ 1591 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1596 else 1592 else
1597 CLEAR_FLAG (op, FLAG_READY_BOW); 1593 CLEAR_FLAG (op, FLAG_READY_BOW);
1594
1598 return 0; 1595 return 0;
1599 } 1596 }
1600 } 1597 }
1601 1598
1602 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1599 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
… …
1626 1623
1627 arrow->set_owner (op); 1624 arrow->set_owner (op);
1628 arrow->skill = bow->skill; 1625 arrow->skill = bow->skill;
1629 arrow->direction = dir; 1626 arrow->direction = dir;
1630 1627
1628 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1629 arrow->stats.hp = arrow->stats.dam;
1630 arrow->stats.grace = arrow->attacktype;
1631
1632 if (arrow->slaying)
1633 arrow->spellarg = strdup (arrow->slaying);
1634
1635 if (player *pl = op->contr)
1636 {
1637 {
1638 pl->has_hit = 1;
1639 pl->ob->speed_left += pl->weapon_sp - pl->ob->speed;
1640 }
1641#if 0
1642 float speed = pl->weapon_sp;
1643
1644 /* penalize ROF for bestarrow */
1645 if (pl->bowtype == bow_bestarrow)
1646 speed *= .9f;
1647 else
1648 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1649
1650 op->speed_left += speed - op->speed;
1651#endif
1652 }
1653
1654 SET_ANIMATION (arrow, arrow->direction);
1655
1656 /* update the speed */
1657 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0
1658 + bow->stats.dam / 7.0;
1659
1660 arrow->set_speed (max (arrow->speed, 2.0));
1661 arrow->speed_left = 0;
1662
1663 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1664
1631 if (op->type == PLAYER) 1665 if (op->type == PLAYER)
1632 { 1666 {
1633 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1634 op->update_stats ();
1635 }
1636
1637 SET_ANIMATION (arrow, arrow->direction);
1638 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1639 arrow->stats.hp = arrow->stats.dam;
1640 arrow->stats.grace = arrow->attacktype;
1641 if (arrow->slaying != NULL)
1642 arrow->spellarg = strdup (arrow->slaying);
1643
1644 /* Note that this was different for monsters - they got their level
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
1650 /* update the speed */
1651 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;
1653
1654 arrow->set_speed (max (arrow->speed, 1.0));
1655 arrow->speed_left = 0;
1656
1657 if (op->type == PLAYER)
1658 {
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; 1667 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1668 wc -= dex_bonus[op->stats.Dex];
1669
1670 if (!arrow->slaying)
1671 arrow->slaying = op->slaying;
1672
1673 arrow->attacktype |= op->attacktype;
1664 } 1674 }
1665 else 1675 else
1666 { 1676 {
1667 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1668 arrow->level = op->level; 1677 arrow->level = op->level;
1669 } 1678 arrow->stats.wc -= bow->magic;
1670 1679
1671 if (arrow->attacktype == AT_PHYSICAL) 1680 if (!arrow->slaying)
1681 arrow->slaying = bow->slaying;
1682
1672 arrow->attacktype |= bow->attacktype; 1683 arrow->attacktype |= bow->attacktype;
1684 }
1673 1685
1674 if (bow->slaying) 1686 wc -= arrow->level;
1675 arrow->slaying = bow->slaying; 1687 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1676 1688
1689 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1677 arrow->move_type = MOVE_FLY_LOW; 1690 arrow->move_type = MOVE_FLY_LOW;
1678 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1691 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1679 1692
1680 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1693 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1681 m->insert (arrow, sx, sy, op); 1694 m->insert (arrow, sx, sy, op);
… …
1706{ 1719{
1707 int ret = 0, wcmod = 0; 1720 int ret = 0, wcmod = 0;
1708 1721
1709 if (op->contr->bowtype == bow_bestarrow) 1722 if (op->contr->bowtype == bow_bestarrow)
1710 { 1723 {
1711 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1724 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1712 } 1725 }
1713 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1726 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1714 { 1727 {
1715 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1728 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1716 wcmod = -1; 1729 wcmod = -1;
… …
1726 else if (op->contr->bowtype == bow_spreadshot) 1739 else if (op->contr->bowtype == bow_spreadshot)
1727 { 1740 {
1728 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1741 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); 1742 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); 1743 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1731
1732 } 1744 }
1733 else 1745 else
1734 { 1746 {
1735 /* Simple case */ 1747 /* Simple case */
1736 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1748 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1737 } 1749 }
1750
1738 return ret; 1751 return ret;
1739} 1752}
1740 1753
1741 1754
1742/* Fires a misc (wand/rod/horn) object in 'dir'. 1755/* Fires a misc (wand/rod/horn) object in 'dir'.
1743 * Broken apart from 'fire' to keep it more readable. 1756 * Broken apart from 'fire' to keep it more readable.
1744 */ 1757 */
1745void 1758void
1746fire_misc_object (object *op, int dir) 1759fire_misc_object (object *op, int dir)
1747{ 1760{
1748 object *item; 1761 object *item = op->contr->ranged_ob;
1749 1762
1750 if (!op->contr->ranges[range_misc]) 1763 if (!item)
1751 { 1764 {
1752 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1765 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1753 return; 1766 return;
1754 } 1767 }
1755 1768
1756 item = op->contr->ranges[range_misc];
1757 if (!item->inv) 1769 if (!item->inv)
1758 { 1770 {
1759 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1771 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1760 return; 1772 return;
1761 } 1773 }
1774
1775 if (!op->change_weapon (item))
1776 return;
1777
1762 if (item->type == WAND) 1778 if (item->type == WAND)
1763 { 1779 {
1764 if (item->stats.food <= 0) 1780 if (item->stats.food <= 0)
1765 { 1781 {
1766 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1782 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)); 1783 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1784
1768 return; 1785 return;
1769 } 1786 }
1770 } 1787 }
1771 else if (item->type == ROD || item->type == HORN) 1788 else if (item->type == ROD || item->type == HORN)
1772 { 1789 {
1773 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1790 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1774 { 1791 {
1775 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1792 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1793
1776 if (item->type == ROD) 1794 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)); 1795 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1778 else 1796 else
1779 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1797 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1798
1780 return; 1799 return;
1781 } 1800 }
1782 } 1801 }
1783 1802
1784 if (cast_spell (op, item, dir, item->inv, NULL)) 1803 if (cast_spell (op, item, dir, item->inv, NULL))
… …
1815 1834
1816 /* check for loss of invisiblity/hide */ 1835 /* check for loss of invisiblity/hide */
1817 if (action_makes_visible (op)) 1836 if (action_makes_visible (op))
1818 make_visible (op); 1837 make_visible (op);
1819 1838
1820 switch (op->contr->shoottype) 1839 player *pl = op->contr;
1840
1841 if (pl->golem)
1821 { 1842 {
1822 case range_none: 1843 control_golem (op->contr->golem, dir);
1823 return; 1844 return;
1845 }
1824 1846
1825 case range_bow: 1847 object *ob = pl->ranged_ob;
1848
1849 if (!ob)
1850 return;
1851
1852 switch (ob->type)
1853 {
1854 case BOW:
1826 player_fire_bow (op, dir); 1855 player_fire_bow (op, dir);
1827 return; 1856 break;
1828 1857
1829 case range_magic: /* Casting spells */ 1858 case SPELL:
1830 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1859 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1831 return; 1860 break;
1832 1861
1833 case range_misc: 1862 case BUILDER:
1863 apply_map_builder (op, dir);
1864 break;
1865
1866 case SKILL:
1867 case SKILL_TOOL:
1868 do_skill (op, op, ob, dir, 0);
1869 break;
1870
1871 default:
1834 fire_misc_object (op, dir); 1872 fire_misc_object (op, dir);
1835 return; 1873 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 } 1874 }
1864} 1875}
1865
1866
1867 1876
1868/* find_key 1877/* find_key
1869 * We try to find a key for the door as passed. If we find a key 1878 * 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 1879 * and successfully use it, we return the key, otherwise NULL
1871 * This function merges both normal and locked door, since the logic 1880 * This function merges both normal and locked door, since the logic
… …
1873 * pl is the player, 1882 * pl is the player,
1874 * inv is the objects inventory to searched 1883 * inv is the objects inventory to searched
1875 * door is the door we are trying to match against. 1884 * door is the door we are trying to match against.
1876 * This function can be called recursively to search containers. 1885 * This function can be called recursively to search containers.
1877 */ 1886 */
1878
1879object * 1887object *
1880find_key (object *pl, object *container, object *door) 1888find_key (object *pl, object *container, object *door)
1881{ 1889{
1882 object *tmp, *key; 1890 object *tmp, *key;
1883 1891
1884 /* Should not happen, but sanity checking is never bad */ 1892 /* Should not happen, but sanity checking is never bad */
1885 if (container->inv == NULL) 1893 if (!container->inv)
1886 return NULL; 1894 return 0;
1887 1895
1888 /* First, lets try to find a key in the top level inventory */ 1896 /* First, lets try to find a key in the top level inventory */
1889 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1897 for (tmp = container->inv; tmp; tmp = tmp->below)
1890 { 1898 {
1891 if (door->type == DOOR && tmp->type == KEY) 1899 if (door->type == DOOR && tmp->type == KEY)
1892 break; 1900 break;
1893 /* For sanity, we should really check door type, but other stuff 1901 /* For sanity, we should really check door type, but other stuff
1894 * (like containers) can be locked with special keys 1902 * (like containers) can be locked with special keys
1895 */ 1903 */
1896 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1904 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1897 break; 1905 break;
1898 } 1906 }
1907
1899 /* No key found - lets search inventories now */ 1908 /* No key found - lets search inventories now */
1900 /* If we find and use a key in an inventory, return at that time. 1909 /* 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 1910 * otherwise, if we search all the inventories and still don't find
1902 * a key, return 1911 * a key, return
1903 */ 1912 */
1904 if (!tmp) 1913 if (!tmp)
1905 { 1914 {
1906 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1915 for (tmp = container->inv; tmp; tmp = tmp->below)
1907 { 1916 {
1908 /* No reason to search empty containers */ 1917 /* No reason to search empty containers */
1909 if (tmp->type == CONTAINER && tmp->inv) 1918 if (tmp->type == CONTAINER && tmp->inv)
1910 { 1919 {
1911 if ((key = find_key (pl, tmp, door)) != NULL) 1920 if ((key = find_key (pl, tmp, door)))
1912 return key; 1921 return key;
1913 } 1922 }
1914 } 1923 }
1924
1915 if (!tmp) 1925 if (!tmp)
1916 return NULL; 1926 return NULL;
1917 } 1927 }
1928
1918 /* We get down here if we have found a key. Now if its in a container, 1929 /* 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 1930 * see if we actually want to use it
1920 */ 1931 */
1921 if (pl != container) 1932 if (pl != container)
1922 { 1933 {
… …
1943 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1954 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)); 1955 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1945 return NULL; 1956 return NULL;
1946 } 1957 }
1947 } 1958 }
1959
1948 return tmp; 1960 return tmp;
1949} 1961}
1950 1962
1951/* moved door processing out of move_player_attack. 1963/* moved door processing out of move_player_attack.
1952 * returns 1 if player has opened the door with a key 1964 * returns 1 if player has opened the door with a key
… …
1966 if (key) 1978 if (key)
1967 { 1979 {
1968 object *container = key->env; 1980 object *container = key->env;
1969 1981
1970 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1982 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1983
1971 if (action_makes_visible (op)) 1984 if (action_makes_visible (op))
1972 make_visible (op); 1985 make_visible (op);
1986
1973 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1987 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1974 spring_trap (door->inv, op); 1988 spring_trap (door->inv, op);
1989
1975 if (door->type == DOOR) 1990 if (door->type == DOOR)
1976 {
1977 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1991 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1978 }
1979 else if (door->type == LOCKED_DOOR) 1992 else if (door->type == LOCKED_DOOR)
1980 { 1993 {
1981 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1994 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 ;-) */ 1995 remove_door2 (door); /* remove door without violence ;-) */
1983 } 1996 }
1997
1984 /* Do this after we print the message */ 1998 /* Do this after we print the message */
1985 decrease_ob (key); /* Use up one of the keys */ 1999 decrease_ob (key); /* Use up one of the keys */
1986 /* Need to update the weight the container the key was in */ 2000 /* Need to update the weight the container the key was in */
1987 if (container != op) 2001 if (container != op)
1988 esrv_update_item (UPD_WEIGHT, op, container); 2002 esrv_update_item (UPD_WEIGHT, op, container);
2003
1989 return 1; /* Nothing more to do below */ 2004 return 1; /* Nothing more to do below */
1990 } 2005 }
1991 else if (door->type == LOCKED_DOOR) 2006 else if (door->type == LOCKED_DOOR)
1992 { 2007 {
1993 /* Might as well return now - no other way to open this */ 2008 /* Might as well return now - no other way to open this */
1994 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 2009 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
1995 return 1; 2010 return 1;
1996 } 2011 }
2012
1997 return 0; 2013 return 0;
1998} 2014}
1999 2015
2000/* This function is just part of a breakup from move_player. 2016/* This function is just part of a breakup from move_player.
2001 * It should keep the code cleaner. 2017 * It should keep the code cleaner.
… …
2005 */ 2021 */
2006void 2022void
2007move_player_attack (object *op, int dir) 2023move_player_attack (object *op, int dir)
2008{ 2024{
2009 object *tmp, *mon; 2025 object *tmp, *mon;
2010 sint16 nx, ny;
2011 int on_battleground; 2026 int on_battleground;
2012 maptile *m; 2027 maptile *m;
2013 2028
2014 nx = freearr_x[dir] + op->x; 2029 sint16 nx = freearr_x[dir] + op->x;
2015 ny = freearr_y[dir] + op->y; 2030 sint16 ny = freearr_y[dir] + op->y;
2016 2031
2017 on_battleground = op_on_battleground (op, 0, 0); 2032 on_battleground = op_on_battleground (op, 0, 0);
2018 2033
2019 /* If braced, or can't move to the square, and it is not out of the 2034 /* 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 2035 * 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 */ 2115 /* If we're braced, we don't want to switch places with it */
2101 if (op->contr->braced) 2116 if (op->contr->braced)
2102 return; 2117 return;
2103 2118
2104 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2119 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2105 (void) push_ob (mon, dir, op); 2120 push_ob (mon, dir, op);
2106 if (op->contr->tmp_invis || op->hide) 2121 if (op->contr->tmp_invis || op->hide)
2107 make_visible (op); 2122 make_visible (op);
2108 2123
2109 return; 2124 return;
2110 } 2125 }
… …
2155 * that party_number -1 is no party, so attacks can still happen. 2170 * that party_number -1 is no party, so attacks can still happen.
2156 */ 2171 */
2157 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2172 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2158 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2173 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2159 { 2174 {
2160
2161 /* If the player hasn't hit something this tick, and does
2162 * so, give them speed boost based on weapon speed. Doing
2163 * it here is better than process_players2, which basically
2164 * incurred a 1 tick offset.
2165 */
2166 if (!op->contr->has_hit) 2175 op->contr->has_hit = 1;
2167 {
2168 op->speed_left += op->speed / op->contr->weapon_sp; 2176 op->speed_left += op->contr->weapon_sp - op->speed;
2169
2170 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2171 }
2172 2177
2173 skill_attack (mon, op, 0, 0, 0); 2178 skill_attack (mon, op, 0, 0, 0);
2174 2179
2175 /* If attacking another player, that player gets automatic 2180 /* If attacking another player, that player gets automatic
2176 * hitback, and doesn't loose luck either. 2181 * hitback, and doesn't loose luck either.
… …
2207 return 0; 2212 return 0;
2208 } 2213 }
2209 2214
2210 /* peterm: added following line */ 2215 /* peterm: added following line */
2211 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2216 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2212 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2217 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2213 2218
2214 op->facing = dir; 2219 op->facing = dir;
2215 2220
2216 if (op->hide) 2221 if (op->hide)
2217 do_hidden_move (op); 2222 do_hidden_move (op);
… …
2250 * Returns true if there are more actions we can do. 2255 * Returns true if there are more actions we can do.
2251 */ 2256 */
2252int 2257int
2253handle_newcs_player (object *op) 2258handle_newcs_player (object *op)
2254{ 2259{
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)) 2260 if (QUERY_FLAG (op, FLAG_SCARED))
2276 { 2261 {
2277 flee_player (op); 2262 flee_player (op);
2263
2278 /* If player is still scared, that is his action for this tick */ 2264 /* If player is still scared, that is his action for this tick */
2279 if (QUERY_FLAG (op, FLAG_SCARED)) 2265 if (op->flag [FLAG_SCARED])
2280 { 2266 {
2281 op->speed_left--; 2267 --op->speed_left;
2282 return 0; 2268 return 0;
2283 } 2269 }
2284 } 2270 }
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 2271
2294 /* call this here - we also will call this in do_ericserver, but 2272 /* call this here - we also will call this in do_ericserver, but
2295 * the players time has been increased when doericserver has been 2273 * the players time has been increased when doericserver has been
2296 * called, so we recheck it here. 2274 * called, so we recheck it here.
2297 */ 2275 */
2298 if (op->contr->ns->handle_command ()) 2276 if (op->contr->ns->handle_command ())
2299 return 1; 2277 return 1;
2300 2278
2301 if (op->speed_left > 0) 2279 if (op->speed_left > 0.f)
2302 { 2280 {
2303 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2281 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2304 { 2282 {
2305 /* All move commands take 1 tick, at least for now */ 2283 /* All move commands take 1 tick, at least for now */
2306 op->speed_left--; 2284 --op->speed_left;
2307 2285
2308 /* Instead of all the stuff below, let move_player take care 2286 /* Instead of all the stuff below, let move_player take care
2309 * of it. Also, some of the skill stuff is only put in 2287 * of it. Also, some of the skill stuff is only put in
2310 * there, as well as the confusion stuff. 2288 * there, as well as the confusion stuff.
2311 */ 2289 */
2312 move_player (op, op->direction); 2290 move_player (op, op->direction);
2313 2291
2314 return op->speed_left > 0; 2292 return op->speed_left > 0.f;
2315 } 2293 }
2316 } 2294 }
2317 2295
2318 return 0; 2296 return 0;
2319} 2297}
… …
2358 * from. 2336 * from.
2359 */ 2337 */
2360void 2338void
2361remove_unpaid_objects (object *op, object *env) 2339remove_unpaid_objects (object *op, object *env)
2362{ 2340{
2363 object *next;
2364
2365 while (op) 2341 while (op)
2366 { 2342 {
2367 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2343 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2368 2344
2369 if (QUERY_FLAG (op, FLAG_UNPAID)) 2345 if (QUERY_FLAG (op, FLAG_UNPAID))
… …
2435 int rate_grace = 2000; 2411 int rate_grace = 2000;
2436 const int max_hp = 1; 2412 const int max_hp = 1;
2437 const int max_sp = 1; 2413 const int max_sp = 1;
2438 const int max_grace = 1; 2414 const int max_grace = 1;
2439 2415
2440 if (op->contr->outputs_sync) 2416 if (op->contr->hidden)
2417 {
2418 op->invisible = 1000;
2419 /* the socket code flashes the player visible/invisible
2420 * depending on the value of invisible, so we need to
2421 * alternate it here for it to work correctly.
2422 */
2423 if (pticks & 2)
2424 op->invisible--;
2441 { 2425 }
2442 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2426 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) 2427 {
2444 flush_output_element (op, &op->contr->outputs[i]); 2428 if (!op->invisible--)
2429 {
2430 make_visible (op);
2431 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2432 }
2445 } 2433 }
2446 2434
2447 if (op->contr->ns->state == ST_PLAYING) 2435 if (op->contr->ns->state == ST_PLAYING)
2448 { 2436 {
2449 /* these next three if clauses make it possible to SLOW DOWN 2437 /* these next three if clauses make it possible to SLOW DOWN
… …
2471 gen_grace = op->stats.maxgrace; 2459 gen_grace = op->stats.maxgrace;
2472 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2460 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2473 } 2461 }
2474 2462
2475 /* Regenerate Spell Points */ 2463 /* Regenerate Spell Points */
2476 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0) 2464 if (!op->contr->golem && --op->last_sp < 0)
2477 { 2465 {
2478 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); 2466 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) 2467 if (op->stats.sp < op->stats.maxsp)
2480 { 2468 {
2481 op->stats.sp++; 2469 op->stats.sp++;
… …
2699 tmp->name = buf; 2687 tmp->name = buf;
2700 sprintf (buf, " This finger has been cut off %s\n" 2688 sprintf (buf, " This finger has been cut off %s\n"
2701 " the %s, when he was defeated at\n level %d by %s.\n", 2689 " 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); 2690 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2703 tmp->msg = buf; 2691 tmp->msg = buf;
2704 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2692 tmp->value = 0, tmp->type = 0;
2705 tmp->materialname = NULL; 2693 tmp->materialname = "organics";
2706 tmp->insert_at (op, tmp); 2694 tmp->insert_at (op, tmp);
2707 } 2695 }
2708 2696
2709 /* teleport defeated player to new destination */ 2697 /* teleport defeated player to new destination */
2710 transfer_ob (op, x, y, 0, NULL); 2698 transfer_ob (op, x, y, 0, NULL);
… …
2906 op->stats.hp = op->stats.maxhp; 2894 op->stats.hp = op->stats.maxhp;
2907 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2895 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2908 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2896 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2909 2897
2910 /* 2898 /*
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 2899 * Check to see if the player has any unpaid items. If so, remove them
2913 * in the map. 2900 * and put them back in the map.
2914 */ 2901 */
2915
2916 if (is_in_shop (op))
2917 remove_unpaid_objects (op->inv, op); 2902 remove_unpaid_objects (op->inv, op);
2918 2903
2919 /****************************************/ 2904 /****************************************/
2920 /* */ 2905 /* */
2921 /* Move player to his current respawn- */ 2906 /* Move player to his current respawn- */
2922 /* position (usually last savebed) */ 2907 /* position (usually last savebed) */
… …
2942 object *force; 2927 object *force;
2943 int at; 2928 int at;
2944 2929
2945 force = get_archetype (FORCE_NAME); 2930 force = get_archetype (FORCE_NAME);
2946 /* 50 ticks should be enough time for the spell to abate */ 2931 /* 50 ticks should be enough time for the spell to abate */
2947 force->speed = 0.1; 2932 force->speed = 0.1f;
2948 force->speed_left = -5.0; 2933 force->speed_left = -5.f;
2949 SET_FLAG (force, FLAG_APPLIED); 2934 SET_FLAG (force, FLAG_APPLIED);
2950 for (at = 0; at < NROFATTACKS; at++) 2935 for (at = 0; at < NROFATTACKS; at++)
2951 if (will_kill_again & (1 << at)) 2936 if (will_kill_again & (1 << at))
2952 force->resist[at] = 100; 2937 force->resist[at] = 100;
2953 2938
… …
2962void 2947void
2963loot_object (object *op) 2948loot_object (object *op)
2964{ /* Grab and destroy some treasure */ 2949{ /* Grab and destroy some treasure */
2965 object *tmp, *tmp2, *next; 2950 object *tmp, *tmp2, *next;
2966 2951
2967 if (op->container) 2952 op->close_container (); /* close open sack first */
2968 esrv_apply_container (op, op->container); /* close open sack first */
2969 2953
2970 for (tmp = op->inv; tmp; tmp = next) 2954 for (tmp = op->inv; tmp; tmp = next)
2971 { 2955 {
2972 next = tmp->below; 2956 next = tmp->below;
2973 2957
2974 if (tmp->invisible) 2958 if (tmp->invisible)
2975 continue; 2959 continue;
2976 2960
2977 tmp->remove (); 2961 tmp->remove ();
2978 tmp->x = op->x, tmp->y = op->y; 2962 tmp->x = op->x, tmp->y = op->y;
2963
2979 if (tmp->type == CONTAINER) 2964 if (tmp->type == CONTAINER)
2980 { /* empty container to ground */ 2965 loot_object (tmp); /* empty container to ground */
2981 loot_object (tmp); 2966
2982 }
2983 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2967 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2984 { 2968 {
2985 if (tmp->nrof > 1) 2969 if (tmp->nrof > 1)
2986 { 2970 {
2987 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2971 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
2988 tmp2->destroy (); 2972 tmp2->destroy ();
… …
2999/* 2983/*
3000 * fix_weight(): Check recursively the weight of all players, and fix 2984 * fix_weight(): Check recursively the weight of all players, and fix
3001 * what needs to be fixed. Refresh windows and fix speed if anything 2985 * what needs to be fixed. Refresh windows and fix speed if anything
3002 * was changed. 2986 * was changed.
3003 */ 2987 */
3004
3005void 2988void
3006fix_weight (void) 2989fix_weight (void)
3007{ 2990{
3008 for_all_players (pl) 2991 for_all_players (pl)
3009 { 2992 {
… …
3069 if (op->type == PLAYER) 3052 if (op->type == PLAYER)
3070 { 3053 {
3071 op->contr->tmp_invis = 0; 3054 op->contr->tmp_invis = 0;
3072 op->contr->invis_race = 0; 3055 op->contr->invis_race = 0;
3073 } 3056 }
3057
3074 update_object (op, UP_OBJ_FACE); 3058 update_object (op, UP_OBJ_CHANGE);
3075} 3059}
3076 3060
3077int 3061int
3078is_true_undead (object *op) 3062is_true_undead (object *op)
3079{ 3063{
3080 object *tmp = NULL;
3081
3082 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3064 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3083 return 1; 3065 return 1;
3084 3066
3085 return 0; 3067 return 0;
3086} 3068}
… …
3374 char buf[MAX_BUF]; /* tmp. string buffer */ 3356 char buf[MAX_BUF]; /* tmp. string buffer */
3375 int i = 0, j = 0; 3357 int i = 0, j = 0;
3376 3358
3377 /* get the appropriate treasurelist */ 3359 /* get the appropriate treasurelist */
3378 if (atnr == ATNR_FIRE) 3360 if (atnr == ATNR_FIRE)
3379 trlist = find_treasurelist ("dragon_ability_fire"); 3361 trlist = treasurelist::find ("dragon_ability_fire");
3380 else if (atnr == ATNR_COLD) 3362 else if (atnr == ATNR_COLD)
3381 trlist = find_treasurelist ("dragon_ability_cold"); 3363 trlist = treasurelist::find ("dragon_ability_cold");
3382 else if (atnr == ATNR_ELECTRICITY) 3364 else if (atnr == ATNR_ELECTRICITY)
3383 trlist = find_treasurelist ("dragon_ability_elec"); 3365 trlist = treasurelist::find ("dragon_ability_elec");
3384 else if (atnr == ATNR_POISON) 3366 else if (atnr == ATNR_POISON)
3385 trlist = find_treasurelist ("dragon_ability_poison"); 3367 trlist = treasurelist::find ("dragon_ability_poison");
3386 3368
3387 if (trlist == NULL || who->type != PLAYER) 3369 if (trlist == NULL || who->type != PLAYER)
3388 return; 3370 return;
3389 3371
3390 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3372 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
… …
3522 * not readied. 3504 * not readied.
3523 */ 3505 */
3524void 3506void
3525player_unready_range_ob (player *pl, object *ob) 3507player_unready_range_ob (player *pl, object *ob)
3526{ 3508{
3527 for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3509 if (pl->ob->current_weapon == ob)
3510 pl->ob->current_weapon = 0;
3511
3512 if (pl->combat_ob == ob)
3513 pl->combat_ob = 0;
3514
3528 if (pl->ranges[i] == ob) 3515 if (pl->ranged_ob == ob)
3529 {
3530 pl->ranges[i] = 0; 3516 pl->ranged_ob = 0;
3531 if (pl->shoottype == i)
3532 pl->shoottype = range_none;
3533 }
3534} 3517}
3518
3519sint8
3520player::visibility_at (maptile *map, int x, int y) const
3521{
3522 if (!ns)
3523 return 0;
3524
3525 int dx, dy;
3526 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3527 return 0;
3528
3529 x += dx - ns->current_x + ns->mapx / 2;
3530 y += dy - ns->current_y + ns->mapy / 2;
3531
3532 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3533 return 0;
3534
3535 return 100 - blocked_los [x][y];
3536}

Diff Legend

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