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.94 by root, Mon Jan 8 14:29:05 2007 UTC vs.
Revision 1.133 by root, Sat May 12 22:04:20 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
219 run_on = 0;
220 fire_on = 0;
221 ob->close_container (); //TODO: client-specific
222
216 ns->update_look = 0; 223 ns->update_look = 0;
217 ns->look_position = 0; 224 ns->look_position = 0;
218 225
219 clear_los (ob); 226 clear_los (ob);
220 227
221//TODO: must move into client 228 ns->reset_stats ();
222/* we need to clear these to -1 and not zero - otherwise,
223 * if a player quits and starts a new character, we wont
224 * send new values to the client, as things like exp start
225 * at zero.
226 */
227for (int i = 0; i < NUM_SKILLS; i++)
228 last_skill_exp[i] = -1;
229
230for (int i = 0; i < NROFATTACKS; i++)
231 last_resist[i] = -1;
232
233last_weapon_sp = -1;
234last_level = -1;
235last_stats.exp = -1;
236last_weight = (uint32) - 1;
237last_flags = 0;
238last_weight = 0;
239last_weight_limit = 0;
240last_path_attuned = 0;
241last_path_repelled = 0;
242last_path_denied = 0;
243last_speed = 0;
244run_on = 0;
245fire_on = 0;
246memset (&last_stats, 0, sizeof (living)); //TODO dirty
247 229
248 /* make sure he's a player -- needed because of class change. */ 230 /* make sure he's a player -- needed because of class change. */
249 ob->type = PLAYER; // we are paranoid 231 ob->type = PLAYER; // we are paranoid
250 ob->race = ob->arch->clone.race; 232 ob->race = ob->arch->clone.race;
251 233
252 if (!legal_range (ob, shoottype))
253 shoottype = range_none;
254
255 ob->carrying = sum_weight (ob); 234 ob->carrying = sum_weight (ob);
256 link_player_skills (ob); 235 link_player_skills (ob);
257 236
258 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 237 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
259 238
260 assign (title, ob->arch->clone.name); 239 assign (title, ob->arch->clone.name);
261
262 /* can_use_shield is a new flag. However, the can_use.. seems to largely come
263 * from the class, and not race. I don't see any way to get the class information
264 * to then update this. I don't think this will actually break anything - anyone
265 * that can use armour should be able to use a shield. What this may 'break'
266 * are features new characters get, eg, if someone starts up with a Q, they
267 * should be able to use a shield. However, old Q's won't get that advantage.
268 */
269 if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
270 SET_FLAG (ob, FLAG_USE_SHIELD);
271 240
272 /* if it's a dragon player, set the correct title here */ 241 /* if it's a dragon player, set the correct title here */
273 if (is_dragon_pl (ob)) 242 if (is_dragon_pl (ob))
274 { 243 {
275 object *tmp, *abil = 0, *skin = 0; 244 object *tmp, *abil = 0, *skin = 0;
… …
289 258
290 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 259 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
291 260
292 esrv_new_player (this, ob->weight + ob->carrying); 261 esrv_new_player (this, ob->weight + ob->carrying);
293 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
294 ob->update_stats (); 279 ob->update_stats ();
295 ns->floorbox_update (); 280 ns->floorbox_update ();
296 281
297 esrv_send_inventory (ob, ob); 282 esrv_send_inventory (ob, ob);
298 esrv_add_spells (this, 0); 283 esrv_add_spells (this, 0);
… …
315 if (active) 300 if (active)
316 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); 301 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
317 302
318 INVOKE_PLAYER (DISCONNECT, this); 303 INVOKE_PLAYER (DISCONNECT, this);
319 304
305 ns->reset_stats ();
320 ns->pl = 0; 306 ns->pl = 0;
321 this->ns = 0; 307 ns = 0;
322 } 308 }
309
310 if (ob)
311 ob->close_container (); //TODO: client-specific
323 312
324 deactivate (); 313 deactivate ();
325} 314}
326 315
327// the need for this function can be explained 316// the need for this function can be explained
328// by load_object not returning the object 317// by load_object not returning the object
329void 318void
330player::set_object (object *op) 319player::set_object (object *op)
331{ 320{
332 ob = op; 321 ob = op;
333 ob->contr = this; /* this aren't yet in archetype */ 322 ob->contr = this; /* this aren't yet in archetype */
334 323
335 ob->speed_left = 0.5; 324 ob->speed_left = 0.5f;
336 ob->speed = 1.0; 325 ob->speed = 1.0f;
337 ob->direction = 5; /* So player faces south */ 326 ob->direction = 5; /* So player faces south */
338 ob->stats.wc = 2;
339 ob->run_away = 25; /* Then we panick... */
340
341 ob->roll_stats ();
342} 327}
343 328
344player::player () 329player::player ()
345{ 330{
346 /* There are some elements we want initialised to non zero value - 331 /* There are some elements we want initialised to non zero value -
347 * we deal with that below this point. 332 * we deal with that below this point.
348 */ 333 */
349 outputs_sync = 16; /* Every 2 seconds */ 334 outputs_sync = 4;
350 outputs_count = 8; /* Keeps present behaviour */ 335 outputs_count = 4;
351 unapply = unapply_nochoice; 336 unapply = unapply_nochoice;
352 337
353 savebed_map = first_map_path; /* Init. respawn position */ 338 savebed_map = first_map_path; /* Init. respawn position */
354 339
355 gen_sp_armour = 10; 340 gen_sp_armour = 10;
356 shoottype = range_none;
357 bowtype = bow_normal; 341 bowtype = bow_normal;
358 petmode = pet_normal; 342 petmode = pet_normal;
359 listening = 10; 343 listening = 10;
360 usekeys = containers; 344 usekeys = containers;
361 peaceful = 1; /* default peaceful */ 345 peaceful = 1; /* default peaceful */
… …
390player::create () 374player::create ()
391{ 375{
392 player *pl = new player; 376 player *pl = new player;
393 377
394 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
395 set_first_map (pl->ob); 384 set_first_map (pl->ob);
396 385
397 return pl; 386 return pl;
398} 387}
399 388
… …
545 x = mon->x; 534 x = mon->x;
546 y = mon->y; 535 y = mon->y;
547 m = mon->map; 536 m = mon->map;
548 dir = rv.direction; 537 dir = rv.direction;
549 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 */
550 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
551 /* 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. */
552 if (diff > max) 542 if (diff > max)
553 return 0; 543 return 0;
544
554 while (diff > 1 && max > 0) 545 while (diff > 1 && max > 0)
555 { 546 {
556 lastx = x; 547 lastx = x;
557 lasty = y; 548 lasty = y;
558 lastmap = m; 549 lastmap = m;
… …
640 max--; 631 max--;
641 lastdir = dir; 632 lastdir = dir;
642 if (!firstdir) 633 if (!firstdir)
643 firstdir = dir; 634 firstdir = dir;
644 } 635 }
636
645 if (diff <= 1) 637 if (diff <= 1)
646 { 638 {
647 /* Recalculate diff (distance) because we may not have actually 639 /* Recalculate diff (distance) because we may not have actually
648 * headed toward player for entire distance. 640 * headed toward player for entire distance.
649 */ 641 */
650 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 642 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
651 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));
652 } 644 }
645
653 if (diff > max) 646 if (diff > max)
654 return 0; 647 return 0;
655 } 648 }
649
656 /* 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 */
657 if (!max) 651 if (!max)
658 return 0; 652 return 0;
659 653
660 return firstdir; 654 return firstdir;
… …
774roll_stat (void) 768roll_stat (void)
775{ 769{
776 int a[4], i, j, k; 770 int a[4], i, j, k;
777 771
778 for (i = 0; i < 4; i++) 772 for (i = 0; i < 4; i++)
779 a[i] = (int) RANDOM () % 6 + 1; 773 a[i] = (int) rndm (6) + 1;
780 774
781 for (i = 0, j = 0, k = 7; i < 4; i++) 775 for (i = 0, j = 0, k = 7; i < 4; i++)
782 if (a[i] < k) 776 if (a[i] < k)
783 k = a[i], j = i; 777 k = a[i], j = i;
784 778
… …
790} 784}
791 785
792void 786void
793object::roll_stats () 787object::roll_stats ()
794{ 788{
795 int statsort [7]; 789 int statsort [NUM_STATS];
796 790
797 for (;;) 791 for (;;)
798 { 792 {
799 int sum = 0; 793 int sum = 0;
800 for (int i = 7; i--; ) 794 for (int i = NUM_STATS; i--; )
801 sum += statsort [i] = roll_stat (); 795 sum += statsort [i] = roll_stat ();
802 796
803 if (sum >= 82 && sum <= 116) 797 if (sum >= 82 && sum <= 116)
804 break; 798 break;
805 } 799 }
806 800
807 // Sort the stats so that rerolling is easier... 801 // Sort the stats so that rerolling is easier...
808 std::sort (statsort, statsort + 7, std::greater<int>()); 802 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
809 803
804 for (int i = 0; i < NUM_STATS; ++i)
810 stats.Str = statsort[0]; 805 stats.stat (i) = statsort [i];
811 stats.Dex = statsort[1];
812 stats.Con = statsort[2];
813 stats.Int = statsort[3];
814 stats.Wis = statsort[4];
815 stats.Pow = statsort[5];
816 stats.Cha = statsort[6];
817 806
818 stats.exp = 0; 807 stats.exp = 0;
819 stats.ac = 0; 808 stats.ac = 0;
820 809
821 stats.hp = stats.maxhp; 810 stats.hp = stats.maxhp;
… …
833} 822}
834 823
835void 824void
836object::swap_stats (int a, int b) 825object::swap_stats (int a, int b)
837{ 826{
838 int tmp = get_attr_value (&contr->orig_stats, a); 827 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
839 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
840 set_attr_value (&contr->orig_stats, b, tmp);
841 828
829 for (int i = 0; i < NUM_STATS; ++i)
842 stats.Str = contr->orig_stats.Str; 830 stats.stat (i) = contr->orig_stats.stat (i);
843 stats.Dex = contr->orig_stats.Dex;
844 stats.Con = contr->orig_stats.Con;
845 stats.Int = contr->orig_stats.Int;
846 stats.Wis = contr->orig_stats.Wis;
847 stats.Pow = contr->orig_stats.Pow;
848 stats.Cha = contr->orig_stats.Cha;
849 831
850 //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,
851 // be merged with the similar code in roll_stats 833 // be merged with the similar code in roll_stats
852 stats.ac = 0; 834 stats.ac = 0;
853 835
… …
884 * appropriate action with it (change race, or other things). 866 * appropriate action with it (change race, or other things).
885 * The function name is for historical reasons - now we have 867 * The function name is for historical reasons - now we have
886 * separate race and class; this actually changes the RACE, 868 * separate race and class; this actually changes the RACE,
887 * not the class. 869 * not the class.
888 */ 870 */
889int 871void
890key_change_class (object *op, char key) 872player::chargen_race_done ()
891{ 873{
892 int tmp_loop;
893
894 if (key == 'd' || key == 'D')
895 {
896 char buf[MAX_BUF];
897
898 /* this must before then initial items are given */ 874 /* this must before then initial items are given */
899 esrv_new_player (op->contr, op->weight + op->carrying); 875 esrv_new_player (ob->contr, ob->weight + ob->carrying);
900 876
901 treasurelist *tl = find_treasurelist ("starting_wealth"); 877 treasurelist *tl = treasurelist::find ("starting_wealth");
902 if (tl) 878 if (tl)
903 create_treasure (tl, op, 0, 0, 0); 879 create_treasure (tl, ob, 0, 0, 0);
904 880
905 INVOKE_PLAYER (BIRTH, op->contr); 881 INVOKE_PLAYER (BIRTH, ob->contr);
906 INVOKE_PLAYER (LOGIN, op->contr); 882 INVOKE_PLAYER (LOGIN, ob->contr);
907 883
908 op->contr->ns->state = ST_PLAYING; 884 ob->contr->ns->state = ST_PLAYING;
909 885
910 if (op->msg) 886 if (ob->msg)
911 op->msg = NULL; 887 ob->msg = 0;
912 888
913 /* 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
914 * to save here. 890 * to save here.
915 */ 891 */
892 {
893 char buf[MAX_BUF];
916 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 894 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
917 make_path_to_file (buf); 895 make_path_to_file (buf);
896 }
918 897
919#ifdef AUTOSAVE
920 op->contr->last_save_tick = pticks;
921#endif
922 start_info (op); 898 start_info (ob);
923 CLEAR_FLAG (op, FLAG_WIZ); 899 CLEAR_FLAG (ob, FLAG_WIZ);
924 give_initial_items (op, op->randomitems); 900 give_initial_items (ob, ob->randomitems);
925 link_player_skills (op); 901 link_player_skills (ob);
926 esrv_send_inventory (op, op); 902 esrv_send_inventory (ob, ob);
927 op->update_stats (); 903 ob->update_stats ();
928 904
929 /* This moves the player to a different start map, if there 905 /* This moves the player to a different start map, if there
930 * is one for this race 906 * is one for this race
931 */ 907 */
932 if (*first_map_ext_path) 908 if (*first_map_ext_path)
933 { 909 {
934 object *tmp; 910 object *tmp;
935 char mapname[MAX_BUF]; 911 char mapname[MAX_BUF];
936 912
937 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);
938 tmp = object::create (); 914 tmp = object::create ();
939 EXIT_PATH (tmp) = mapname; 915 EXIT_PATH (tmp) = mapname;
940 EXIT_X (tmp) = op->x; 916 EXIT_X (tmp) = ob->x;
941 EXIT_Y (tmp) = op->y; 917 EXIT_Y (tmp) = ob->y;
942 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;
943 * if the map isn't there, then stay on the 919 * if the map isn't there, then stay on the
944 * default initial map */ 920 * default initial map */
945 tmp->destroy (); 921 tmp->destroy ();
946 } 922 }
947 else 923 else
948 LOG (llevDebug, "first_map_ext_path not set\n"); 924 LOG (llevDebug, "first_map_ext_path not set\n");
925}
949 926
950 return 0; 927void
951 } 928player::chargen_race_next ()
952 929{
953 /* Following actually changes the race - this is the default command 930 /* Following actually changes the race - this is the default command
954 * if we don't match with one of the options above. 931 * if we don't match with one of the options above.
955 */ 932 */
956 933
957 tmp_loop = 0; 934 do
958 while (!tmp_loop)
959 { 935 {
960 shstr name = op->name; 936 shstr name = ob->name;
961 int x = op->x, y = op->y; 937 int x = ob->x, y = ob->y;
962 938
963 op->remove_statbonus (); 939 ob->remove_statbonus ();
964 op->remove (); 940 ob->remove ();
965 op->arch = get_player_archetype (op->arch); 941 ob->arch = get_player_archetype (ob->arch);
966 op->arch->clone.copy_to (op); 942 ob->arch->clone.copy_to (ob);
967 op->instantiate (); 943 ob->instantiate ();
968 op->stats = op->contr->orig_stats; 944 ob->stats = ob->contr->orig_stats;
969 op->name = op->name_pl = name; 945 ob->name = ob->name_pl = name;
970 op->x = x; 946 ob->x = x;
971 op->y = y; 947 ob->y = y;
972 SET_ANIMATION (op, 2); /* So player faces south */ 948 SET_ANIMATION (ob, 2); /* So player faces south */
973 insert_ob_in_map (op, op->map, op, 0); 949 insert_ob_in_map (ob, ob->map, ob, 0);
974 assign (op->contr->title, op->arch->clone.name); 950 assign (ob->contr->title, ob->arch->clone.name);
975 op->add_statbonus (); 951 ob->add_statbonus ();
976 tmp_loop = allowed_class (op);
977 } 952 }
953 while (!allowed_class (ob));
978 954
979 update_object (op, UP_OBJ_FACE); 955 update_object (ob, UP_OBJ_FACE);
980 esrv_update_item (UPD_FACE, op, op); 956 esrv_update_item (UPD_FACE, ob, ob);
981 op->update_stats (); 957 ob->update_stats ();
982 op->stats.hp = op->stats.maxhp; 958 ob->stats.hp = ob->stats.maxhp;
983 op->stats.sp = op->stats.maxsp; 959 ob->stats.sp = ob->stats.maxsp;
984 op->stats.grace = 0; 960 ob->stats.grace = 0;
985
986 if (op->msg)
987 new_draw_info (NDI_BLUE, 0, op, op->msg);
988
989 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
990 return 0;
991} 961}
992 962
993void 963void
994flee_player (object *op) 964flee_player (object *op)
995{ 965{
… …
1042 /* Cornered, get rid of scared */ 1012 /* Cornered, get rid of scared */
1043 CLEAR_FLAG (op, FLAG_SCARED); 1013 CLEAR_FLAG (op, FLAG_SCARED);
1044 op->enemy = NULL; 1014 op->enemy = NULL;
1045} 1015}
1046 1016
1047
1048/* 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.
1049 * 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
1050 * stop. 1019 * stop.
1051 */ 1020 */
1052int 1021int
1053check_pick (object *op) 1022check_pick (object *op)
1054{ 1023{
1055 object *tmp, *next; 1024 object *tmp, *next;
1056 int stop = 0; 1025 int stop = 0;
1057 int j, k, wvratio; 1026 int wvratio;
1058 char putstring[128], tmpstr[16]; 1027 char putstring[128];
1059 1028
1060 /* if you're flying, you cna't pick up anything */ 1029 /* if you're flying, you cna't pick up anything */
1061 if (op->move_type & MOVE_FLYING) 1030 if (op->move_type & MOVE_FLYING)
1062 return 1; 1031 return 1;
1063 1032
… …
1400 * found object is returned. 1369 * found object is returned.
1401 */ 1370 */
1402object * 1371object *
1403find_arrow (object *op, const char *type) 1372find_arrow (object *op, const char *type)
1404{ 1373{
1405 object *tmp = NULL; 1374 object *tmp = 0;
1406 1375
1407 for (op = op->inv; op; op = op->below) 1376 for (op = op->inv; op; op = op->below)
1408 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))
1409 tmp = find_arrow (op, type); 1378 tmp = find_arrow (op, type);
1410 else if (op->type == ARROW && op->race == type) 1379 else if (op->type == ARROW && op->race == type)
1411 return op; 1380 return op;
1381
1412 return tmp; 1382 return tmp;
1413} 1383}
1414 1384
1415/* 1385/*
1416 * 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
1417 * 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
1418 * 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
1419 * 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.
1420 */ 1390 */
1421
1422object * 1391object *
1423find_better_arrow (object *op, object *target, const char *type, int *better) 1392find_better_arrow (object *op, object *target, const char *type, int *better)
1424{ 1393{
1425 object *tmp = NULL, *arrow, *ntmp; 1394 object *tmp = NULL, *arrow, *ntmp;
1426 int attacknum, attacktype, betterby = 0, i; 1395 int attacknum, attacktype, betterby = 0, i;
… …
1492 * find_better_arrow to find a decent arrow to use. 1461 * find_better_arrow to find a decent arrow to use.
1493 * op = the shooter 1462 * op = the shooter
1494 * type = bow->race 1463 * type = bow->race
1495 * dir = fire direction 1464 * dir = fire direction
1496 */ 1465 */
1497
1498object * 1466object *
1499pick_arrow_target (object *op, const char *type, int dir) 1467pick_arrow_target (object *op, const char *type, int dir)
1500{ 1468{
1501 object *tmp = NULL; 1469 object *tmp = NULL;
1502 maptile *m; 1470 maptile *m;
… …
1567 */ 1535 */
1568int 1536int
1569fire_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)
1570{ 1538{
1571 object *left, *bow; 1539 object *left, *bow;
1572 int bowspeed, mflags; 1540 int mflags;
1573 maptile *m; 1541 maptile *m;
1574 1542
1575 if (!dir) 1543 if (!dir)
1576 { 1544 {
1577 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!");
1578 return 0; 1546 return 0;
1579 } 1547 }
1580 1548
1581 if (op->type == PLAYER) 1549 if (player *pl = op->contr)
1582 bow = op->contr->ranges[range_bow]; 1550 {
1551 bow = pl->ranged_ob;
1552 if (!op->change_weapon (bow))
1553 return 0;
1554 }
1583 else 1555 else
1584 { 1556 {
1585 for (bow = op->inv; bow; bow = bow->below) 1557 for (bow = op->inv; bow; bow = bow->below)
1586 /* 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
1587 * 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.
… …
1592 if (!bow) 1564 if (!bow)
1593 { 1565 {
1594 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1566 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1595 return 0; 1567 return 0;
1596 } 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
1597 } 1577 }
1598 1578
1599 if (!bow->race || !bow->skill) 1579 if (!bow->race || !bow->skill)
1600 { 1580 {
1601 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);
1602 return 0; 1582 return 0;
1603 } 1583 }
1604
1605 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1606
1607 /* penalize ROF for bestarrow */
1608 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1609 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1610
1611 if (bowspeed < 1)
1612 bowspeed = 1;
1613 1584
1614 if (arrow == NULL) 1585 if (arrow == NULL)
1615 { 1586 {
1616 if ((arrow = find_arrow (op, bow->race)) == NULL) 1587 if ((arrow = find_arrow (op, bow->race)) == NULL)
1617 { 1588 {
1618 if (op->type == PLAYER) 1589 if (op->type == PLAYER)
1619 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);
1620 /* 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 */
1621 else 1592 else
1622 CLEAR_FLAG (op, FLAG_READY_BOW); 1593 CLEAR_FLAG (op, FLAG_READY_BOW);
1594
1623 return 0; 1595 return 0;
1624 } 1596 }
1625 } 1597 }
1626 1598
1627 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1599 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
… …
1651 1623
1652 arrow->set_owner (op); 1624 arrow->set_owner (op);
1653 arrow->skill = bow->skill; 1625 arrow->skill = bow->skill;
1654 arrow->direction = dir; 1626 arrow->direction = dir;
1655 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 pl->has_hit = 1;
1638#if 0
1639 float speed = pl->weapon_sp;
1640
1641 /* penalize ROF for bestarrow */
1642 if (pl->bowtype == bow_bestarrow)
1643 speed *= .9f;
1644 else
1645 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1646
1647 op->speed_left += speed - op->speed;
1648#endif
1649 }
1650
1651 SET_ANIMATION (arrow, arrow->direction);
1652
1653 /* update the speed */
1654 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0
1655 + bow->stats.dam / 7.0;
1656
1657 arrow->set_speed (max (arrow->speed, 2.0));
1658 arrow->speed_left = 0;
1659
1660 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1661
1656 if (op->type == PLAYER) 1662 if (op->type == PLAYER)
1657 { 1663 {
1658 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1659 op->update_stats ();
1660 }
1661
1662 SET_ANIMATION (arrow, arrow->direction);
1663 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1664 arrow->stats.hp = arrow->stats.dam;
1665 arrow->stats.grace = arrow->attacktype;
1666 if (arrow->slaying != NULL)
1667 arrow->spellarg = strdup (arrow->slaying);
1668
1669 /* Note that this was different for monsters - they got their level
1670 * added to the damage. I think the strength bonus is more proper.
1671 */
1672
1673 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1674
1675 /* update the speed */
1676 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1677 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1678
1679 arrow->set_speed (max (arrow->speed, 1.0));
1680 arrow->speed_left = 0;
1681
1682 if (op->type == PLAYER)
1683 {
1684 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1685 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1686 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1687
1688 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1664 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1665 wc -= dex_bonus[op->stats.Dex];
1666
1667 if (!arrow->slaying)
1668 arrow->slaying = op->slaying;
1669
1670 arrow->attacktype |= op->attacktype;
1689 } 1671 }
1690 else 1672 else
1691 { 1673 {
1692 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1693 arrow->level = op->level; 1674 arrow->level = op->level;
1694 } 1675 arrow->stats.wc -= bow->magic;
1695 1676
1696 if (arrow->attacktype == AT_PHYSICAL) 1677 if (!arrow->slaying)
1678 arrow->slaying = bow->slaying;
1679
1697 arrow->attacktype |= bow->attacktype; 1680 arrow->attacktype |= bow->attacktype;
1681 }
1698 1682
1699 if (bow->slaying) 1683 wc -= arrow->level;
1700 arrow->slaying = bow->slaying; 1684 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1701 1685
1686 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1702 arrow->move_type = MOVE_FLY_LOW; 1687 arrow->move_type = MOVE_FLY_LOW;
1703 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1688 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1704 1689
1705 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1690 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1706 m->insert (arrow, sx, sy, op); 1691 m->insert (arrow, sx, sy, op);
… …
1731{ 1716{
1732 int ret = 0, wcmod = 0; 1717 int ret = 0, wcmod = 0;
1733 1718
1734 if (op->contr->bowtype == bow_bestarrow) 1719 if (op->contr->bowtype == bow_bestarrow)
1735 { 1720 {
1736 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1721 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1737 } 1722 }
1738 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1723 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1739 { 1724 {
1740 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1725 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1741 wcmod = -1; 1726 wcmod = -1;
… …
1751 else if (op->contr->bowtype == bow_spreadshot) 1736 else if (op->contr->bowtype == bow_spreadshot)
1752 { 1737 {
1753 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1738 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1754 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1739 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1755 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1740 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1756
1757 } 1741 }
1758 else 1742 else
1759 { 1743 {
1760 /* Simple case */ 1744 /* Simple case */
1761 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1745 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1762 } 1746 }
1747
1763 return ret; 1748 return ret;
1764} 1749}
1765 1750
1766 1751
1767/* Fires a misc (wand/rod/horn) object in 'dir'. 1752/* Fires a misc (wand/rod/horn) object in 'dir'.
1768 * Broken apart from 'fire' to keep it more readable. 1753 * Broken apart from 'fire' to keep it more readable.
1769 */ 1754 */
1770void 1755void
1771fire_misc_object (object *op, int dir) 1756fire_misc_object (object *op, int dir)
1772{ 1757{
1773 object *item; 1758 object *item = op->contr->ranged_ob;
1774 1759
1775 if (!op->contr->ranges[range_misc]) 1760 if (!item)
1776 { 1761 {
1777 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1762 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1778 return; 1763 return;
1779 } 1764 }
1780 1765
1781 item = op->contr->ranges[range_misc];
1782 if (!item->inv) 1766 if (!item->inv)
1783 { 1767 {
1784 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1768 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1785 return; 1769 return;
1786 } 1770 }
1771
1772 if (!op->change_weapon (item))
1773 return;
1774
1787 if (item->type == WAND) 1775 if (item->type == WAND)
1788 { 1776 {
1789 if (item->stats.food <= 0) 1777 if (item->stats.food <= 0)
1790 { 1778 {
1791 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1779 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1792 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1780 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1781
1793 return; 1782 return;
1794 } 1783 }
1795 } 1784 }
1796 else if (item->type == ROD || item->type == HORN) 1785 else if (item->type == ROD || item->type == HORN)
1797 { 1786 {
1798 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1787 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1799 { 1788 {
1800 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1789 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1790
1801 if (item->type == ROD) 1791 if (item->type == ROD)
1802 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1792 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1803 else 1793 else
1804 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1794 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1795
1805 return; 1796 return;
1806 } 1797 }
1807 } 1798 }
1808 1799
1809 if (cast_spell (op, item, dir, item->inv, NULL)) 1800 if (cast_spell (op, item, dir, item->inv, NULL))
… …
1840 1831
1841 /* check for loss of invisiblity/hide */ 1832 /* check for loss of invisiblity/hide */
1842 if (action_makes_visible (op)) 1833 if (action_makes_visible (op))
1843 make_visible (op); 1834 make_visible (op);
1844 1835
1845 switch (op->contr->shoottype) 1836 player *pl = op->contr;
1837
1838 if (pl->golem)
1846 { 1839 {
1847 case range_none: 1840 control_golem (op->contr->golem, dir);
1848 return; 1841 return;
1842 }
1849 1843
1850 case range_bow: 1844 object *ob = pl->ranged_ob;
1845
1846 if (!ob)
1847 return;
1848
1849 switch (ob->type)
1850 {
1851 case BOW:
1851 player_fire_bow (op, dir); 1852 player_fire_bow (op, dir);
1852 return; 1853 break;
1853 1854
1854 case range_magic: /* Casting spells */ 1855 case SPELL:
1855 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1856 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1856 return; 1857 break;
1857 1858
1858 case range_misc: 1859 case BUILDER:
1860 apply_map_builder (op, dir);
1861 break;
1862
1863 case SKILL:
1864 case SKILL_TOOL:
1865 do_skill (op, op, ob, dir, 0);
1866 break;
1867
1868 default:
1859 fire_misc_object (op, dir); 1869 fire_misc_object (op, dir);
1860 return; 1870 break;
1861
1862 case range_golem: /* Control summoned monsters from scrolls */
1863 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1864 {
1865 op->contr->ranges[range_golem] = 0;
1866 op->contr->shoottype = range_none;
1867 }
1868 else
1869 control_golem (op->contr->ranges[range_golem], dir);
1870 return;
1871
1872 case range_skill:
1873 if (!op->chosen_skill)
1874 {
1875 if (op->type == PLAYER)
1876 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1877 return;
1878 }
1879
1880 do_skill (op, op, op->chosen_skill, dir, NULL);
1881 return;
1882 case range_builder:
1883 apply_map_builder (op, dir);
1884 return;
1885 default:
1886 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1887 return;
1888 } 1871 }
1889} 1872}
1890
1891
1892 1873
1893/* find_key 1874/* find_key
1894 * We try to find a key for the door as passed. If we find a key 1875 * We try to find a key for the door as passed. If we find a key
1895 * and successfully use it, we return the key, otherwise NULL 1876 * and successfully use it, we return the key, otherwise NULL
1896 * This function merges both normal and locked door, since the logic 1877 * This function merges both normal and locked door, since the logic
… …
1898 * pl is the player, 1879 * pl is the player,
1899 * inv is the objects inventory to searched 1880 * inv is the objects inventory to searched
1900 * door is the door we are trying to match against. 1881 * door is the door we are trying to match against.
1901 * This function can be called recursively to search containers. 1882 * This function can be called recursively to search containers.
1902 */ 1883 */
1903
1904object * 1884object *
1905find_key (object *pl, object *container, object *door) 1885find_key (object *pl, object *container, object *door)
1906{ 1886{
1907 object *tmp, *key; 1887 object *tmp, *key;
1908 1888
1909 /* Should not happen, but sanity checking is never bad */ 1889 /* Should not happen, but sanity checking is never bad */
1910 if (container->inv == NULL) 1890 if (!container->inv)
1911 return NULL; 1891 return 0;
1912 1892
1913 /* First, lets try to find a key in the top level inventory */ 1893 /* First, lets try to find a key in the top level inventory */
1914 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1894 for (tmp = container->inv; tmp; tmp = tmp->below)
1915 { 1895 {
1916 if (door->type == DOOR && tmp->type == KEY) 1896 if (door->type == DOOR && tmp->type == KEY)
1917 break; 1897 break;
1918 /* For sanity, we should really check door type, but other stuff 1898 /* For sanity, we should really check door type, but other stuff
1919 * (like containers) can be locked with special keys 1899 * (like containers) can be locked with special keys
1920 */ 1900 */
1921 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1901 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1922 break; 1902 break;
1923 } 1903 }
1904
1924 /* No key found - lets search inventories now */ 1905 /* No key found - lets search inventories now */
1925 /* If we find and use a key in an inventory, return at that time. 1906 /* If we find and use a key in an inventory, return at that time.
1926 * otherwise, if we search all the inventories and still don't find 1907 * otherwise, if we search all the inventories and still don't find
1927 * a key, return 1908 * a key, return
1928 */ 1909 */
1929 if (!tmp) 1910 if (!tmp)
1930 { 1911 {
1931 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1912 for (tmp = container->inv; tmp; tmp = tmp->below)
1932 { 1913 {
1933 /* No reason to search empty containers */ 1914 /* No reason to search empty containers */
1934 if (tmp->type == CONTAINER && tmp->inv) 1915 if (tmp->type == CONTAINER && tmp->inv)
1935 { 1916 {
1936 if ((key = find_key (pl, tmp, door)) != NULL) 1917 if ((key = find_key (pl, tmp, door)))
1937 return key; 1918 return key;
1938 } 1919 }
1939 } 1920 }
1921
1940 if (!tmp) 1922 if (!tmp)
1941 return NULL; 1923 return NULL;
1942 } 1924 }
1925
1943 /* We get down here if we have found a key. Now if its in a container, 1926 /* We get down here if we have found a key. Now if its in a container,
1944 * see if we actually want to use it 1927 * see if we actually want to use it
1945 */ 1928 */
1946 if (pl != container) 1929 if (pl != container)
1947 { 1930 {
… …
1968 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1951 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1969 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1952 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1970 return NULL; 1953 return NULL;
1971 } 1954 }
1972 } 1955 }
1956
1973 return tmp; 1957 return tmp;
1974} 1958}
1975 1959
1976/* moved door processing out of move_player_attack. 1960/* moved door processing out of move_player_attack.
1977 * returns 1 if player has opened the door with a key 1961 * returns 1 if player has opened the door with a key
… …
1991 if (key) 1975 if (key)
1992 { 1976 {
1993 object *container = key->env; 1977 object *container = key->env;
1994 1978
1995 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1979 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1980
1996 if (action_makes_visible (op)) 1981 if (action_makes_visible (op))
1997 make_visible (op); 1982 make_visible (op);
1983
1998 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1984 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1999 spring_trap (door->inv, op); 1985 spring_trap (door->inv, op);
1986
2000 if (door->type == DOOR) 1987 if (door->type == DOOR)
2001 {
2002 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1988 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2003 }
2004 else if (door->type == LOCKED_DOOR) 1989 else if (door->type == LOCKED_DOOR)
2005 { 1990 {
2006 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1991 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
2007 remove_door2 (door); /* remove door without violence ;-) */ 1992 remove_door2 (door); /* remove door without violence ;-) */
2008 } 1993 }
1994
2009 /* Do this after we print the message */ 1995 /* Do this after we print the message */
2010 decrease_ob (key); /* Use up one of the keys */ 1996 decrease_ob (key); /* Use up one of the keys */
2011 /* Need to update the weight the container the key was in */ 1997 /* Need to update the weight the container the key was in */
2012 if (container != op) 1998 if (container != op)
2013 esrv_update_item (UPD_WEIGHT, op, container); 1999 esrv_update_item (UPD_WEIGHT, op, container);
2000
2014 return 1; /* Nothing more to do below */ 2001 return 1; /* Nothing more to do below */
2015 } 2002 }
2016 else if (door->type == LOCKED_DOOR) 2003 else if (door->type == LOCKED_DOOR)
2017 { 2004 {
2018 /* Might as well return now - no other way to open this */ 2005 /* Might as well return now - no other way to open this */
2019 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 2006 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2020 return 1; 2007 return 1;
2021 } 2008 }
2009
2022 return 0; 2010 return 0;
2023} 2011}
2024 2012
2025/* This function is just part of a breakup from move_player. 2013/* This function is just part of a breakup from move_player.
2026 * It should keep the code cleaner. 2014 * It should keep the code cleaner.
… …
2030 */ 2018 */
2031void 2019void
2032move_player_attack (object *op, int dir) 2020move_player_attack (object *op, int dir)
2033{ 2021{
2034 object *tmp, *mon; 2022 object *tmp, *mon;
2035 sint16 nx, ny;
2036 int on_battleground; 2023 int on_battleground;
2037 maptile *m; 2024 maptile *m;
2038 2025
2039 nx = freearr_x[dir] + op->x; 2026 sint16 nx = freearr_x[dir] + op->x;
2040 ny = freearr_y[dir] + op->y; 2027 sint16 ny = freearr_y[dir] + op->y;
2041 2028
2042 on_battleground = op_on_battleground (op, 0, 0); 2029 on_battleground = op_on_battleground (op, 0, 0);
2043 2030
2044 /* If braced, or can't move to the square, and it is not out of the 2031 /* If braced, or can't move to the square, and it is not out of the
2045 * map, attack it. Note order of if statement is important - don't 2032 * map, attack it. Note order of if statement is important - don't
… …
2125 /* If we're braced, we don't want to switch places with it */ 2112 /* If we're braced, we don't want to switch places with it */
2126 if (op->contr->braced) 2113 if (op->contr->braced)
2127 return; 2114 return;
2128 2115
2129 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2116 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2130 (void) push_ob (mon, dir, op); 2117 push_ob (mon, dir, op);
2131 if (op->contr->tmp_invis || op->hide) 2118 if (op->contr->tmp_invis || op->hide)
2132 make_visible (op); 2119 make_visible (op);
2133 2120
2134 return; 2121 return;
2135 } 2122 }
… …
2180 * that party_number -1 is no party, so attacks can still happen. 2167 * that party_number -1 is no party, so attacks can still happen.
2181 */ 2168 */
2182 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2169 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2183 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2170 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2184 { 2171 {
2185
2186 /* If the player hasn't hit something this tick, and does
2187 * so, give them speed boost based on weapon speed. Doing
2188 * it here is better than process_players2, which basically
2189 * incurred a 1 tick offset.
2190 */
2191 if (!op->contr->has_hit) 2172 op->contr->has_hit = 1;
2192 {
2193 op->speed_left += op->speed / op->contr->weapon_sp;
2194
2195 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2196 }
2197 2173
2198 skill_attack (mon, op, 0, 0, 0); 2174 skill_attack (mon, op, 0, 0, 0);
2199 2175
2200 /* If attacking another player, that player gets automatic 2176 /* If attacking another player, that player gets automatic
2201 * hitback, and doesn't loose luck either. 2177 * hitback, and doesn't loose luck either.
… …
2232 return 0; 2208 return 0;
2233 } 2209 }
2234 2210
2235 /* peterm: added following line */ 2211 /* peterm: added following line */
2236 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2212 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2237 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2213 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2238 2214
2239 op->facing = dir; 2215 op->facing = dir;
2240 2216
2241 if (op->hide) 2217 if (op->hide)
2242 do_hidden_move (op); 2218 do_hidden_move (op);
… …
2275 * Returns true if there are more actions we can do. 2251 * Returns true if there are more actions we can do.
2276 */ 2252 */
2277int 2253int
2278handle_newcs_player (object *op) 2254handle_newcs_player (object *op)
2279{ 2255{
2280 if (op->contr->hidden)
2281 {
2282 op->invisible = 1000;
2283 /* the socket code flashes the player visible/invisible
2284 * depending on the value of invisible, so we need to
2285 * alternate it here for it to work correctly.
2286 */
2287 if (pticks & 2)
2288 op->invisible--;
2289 }
2290 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2291 {
2292 op->invisible--;
2293 if (!op->invisible)
2294 {
2295 make_visible (op);
2296 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2297 }
2298 }
2299
2300 if (QUERY_FLAG (op, FLAG_SCARED)) 2256 if (QUERY_FLAG (op, FLAG_SCARED))
2301 { 2257 {
2302 flee_player (op); 2258 flee_player (op);
2259
2303 /* If player is still scared, that is his action for this tick */ 2260 /* If player is still scared, that is his action for this tick */
2304 if (QUERY_FLAG (op, FLAG_SCARED)) 2261 if (op->flag [FLAG_SCARED])
2305 { 2262 {
2306 op->speed_left--; 2263 --op->speed_left;
2307 return 0; 2264 return 0;
2308 } 2265 }
2309 } 2266 }
2310
2311 /* I've been seeing crashes where the golem has been destroyed, but
2312 * the player object still points to the defunct golem. The code that
2313 * destroys the golem looks correct, and it doesn't always happen, so
2314 * put this in a a workaround to clean up the golem pointer.
2315 */
2316 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2317 op->contr->ranges[range_golem] = 0;
2318 2267
2319 /* call this here - we also will call this in do_ericserver, but 2268 /* call this here - we also will call this in do_ericserver, but
2320 * the players time has been increased when doericserver has been 2269 * the players time has been increased when doericserver has been
2321 * called, so we recheck it here. 2270 * called, so we recheck it here.
2322 */ 2271 */
2323 if (op->contr->ns->handle_command ()) 2272 if (op->contr->ns->handle_command ())
2324 return 1; 2273 return 1;
2325 2274
2326 if (op->speed_left > 0) 2275 if (op->speed_left > 0.f)
2327 { 2276 {
2328 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2277 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2329 { 2278 {
2330 /* All move commands take 1 tick, at least for now */ 2279 /* All move commands take 1 tick, at least for now */
2331 op->speed_left--; 2280 --op->speed_left;
2332 2281
2333 /* Instead of all the stuff below, let move_player take care 2282 /* Instead of all the stuff below, let move_player take care
2334 * of it. Also, some of the skill stuff is only put in 2283 * of it. Also, some of the skill stuff is only put in
2335 * there, as well as the confusion stuff. 2284 * there, as well as the confusion stuff.
2336 */ 2285 */
2337 move_player (op, op->direction); 2286 move_player (op, op->direction);
2338 2287
2339 return op->speed_left > 0; 2288 return op->speed_left > 0.f;
2340 } 2289 }
2341 } 2290 }
2342 2291
2343 return 0; 2292 return 0;
2344} 2293}
… …
2383 * from. 2332 * from.
2384 */ 2333 */
2385void 2334void
2386remove_unpaid_objects (object *op, object *env) 2335remove_unpaid_objects (object *op, object *env)
2387{ 2336{
2388 object *next;
2389
2390 while (op) 2337 while (op)
2391 { 2338 {
2392 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2339 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2393 2340
2394 if (QUERY_FLAG (op, FLAG_UNPAID)) 2341 if (QUERY_FLAG (op, FLAG_UNPAID))
… …
2460 int rate_grace = 2000; 2407 int rate_grace = 2000;
2461 const int max_hp = 1; 2408 const int max_hp = 1;
2462 const int max_sp = 1; 2409 const int max_sp = 1;
2463 const int max_grace = 1; 2410 const int max_grace = 1;
2464 2411
2465 if (op->contr->outputs_sync) 2412 if (op->contr->hidden)
2413 {
2414 op->invisible = 1000;
2415 /* the socket code flashes the player visible/invisible
2416 * depending on the value of invisible, so we need to
2417 * alternate it here for it to work correctly.
2418 */
2419 if (pticks & 2)
2420 op->invisible--;
2466 { 2421 }
2467 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2422 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2468 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2423 {
2469 flush_output_element (op, &op->contr->outputs[i]); 2424 if (!op->invisible--)
2425 {
2426 make_visible (op);
2427 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2428 }
2470 } 2429 }
2471 2430
2472 if (op->contr->ns->state == ST_PLAYING) 2431 if (op->contr->ns->state == ST_PLAYING)
2473 { 2432 {
2474 /* these next three if clauses make it possible to SLOW DOWN 2433 /* these next three if clauses make it possible to SLOW DOWN
… …
2496 gen_grace = op->stats.maxgrace; 2455 gen_grace = op->stats.maxgrace;
2497 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2456 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2498 } 2457 }
2499 2458
2500 /* Regenerate Spell Points */ 2459 /* Regenerate Spell Points */
2501 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0) 2460 if (!op->contr->golem && --op->last_sp < 0)
2502 { 2461 {
2503 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); 2462 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2504 if (op->stats.sp < op->stats.maxsp) 2463 if (op->stats.sp < op->stats.maxsp)
2505 { 2464 {
2506 op->stats.sp++; 2465 op->stats.sp++;
… …
2724 tmp->name = buf; 2683 tmp->name = buf;
2725 sprintf (buf, " This finger has been cut off %s\n" 2684 sprintf (buf, " This finger has been cut off %s\n"
2726 " the %s, when he was defeated at\n level %d by %s.\n", 2685 " the %s, when he was defeated at\n level %d by %s.\n",
2727 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2686 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2728 tmp->msg = buf; 2687 tmp->msg = buf;
2729 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2688 tmp->value = 0, tmp->type = 0;
2730 tmp->materialname = NULL; 2689 tmp->materialname = "organics";
2731 tmp->insert_at (op, tmp); 2690 tmp->insert_at (op, tmp);
2732 } 2691 }
2733 2692
2734 /* teleport defeated player to new destination */ 2693 /* teleport defeated player to new destination */
2735 transfer_ob (op, x, y, 0, NULL); 2694 transfer_ob (op, x, y, 0, NULL);
… …
2931 op->stats.hp = op->stats.maxhp; 2890 op->stats.hp = op->stats.maxhp;
2932 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2891 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2933 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2892 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2934 2893
2935 /* 2894 /*
2936 * Check to see if the player is in a shop. IF so, then check to see if
2937 * the player has any unpaid items. If so, remove them and put them back 2895 * Check to see if the player has any unpaid items. If so, remove them
2938 * in the map. 2896 * and put them back in the map.
2939 */ 2897 */
2940
2941 if (is_in_shop (op))
2942 remove_unpaid_objects (op->inv, op); 2898 remove_unpaid_objects (op->inv, op);
2943 2899
2944 /****************************************/ 2900 /****************************************/
2945 /* */ 2901 /* */
2946 /* Move player to his current respawn- */ 2902 /* Move player to his current respawn- */
2947 /* position (usually last savebed) */ 2903 /* position (usually last savebed) */
… …
2967 object *force; 2923 object *force;
2968 int at; 2924 int at;
2969 2925
2970 force = get_archetype (FORCE_NAME); 2926 force = get_archetype (FORCE_NAME);
2971 /* 50 ticks should be enough time for the spell to abate */ 2927 /* 50 ticks should be enough time for the spell to abate */
2972 force->speed = 0.1; 2928 force->speed = 0.1f;
2973 force->speed_left = -5.0; 2929 force->speed_left = -5.f;
2974 SET_FLAG (force, FLAG_APPLIED); 2930 SET_FLAG (force, FLAG_APPLIED);
2975 for (at = 0; at < NROFATTACKS; at++) 2931 for (at = 0; at < NROFATTACKS; at++)
2976 if (will_kill_again & (1 << at)) 2932 if (will_kill_again & (1 << at))
2977 force->resist[at] = 100; 2933 force->resist[at] = 100;
2978 2934
… …
2987void 2943void
2988loot_object (object *op) 2944loot_object (object *op)
2989{ /* Grab and destroy some treasure */ 2945{ /* Grab and destroy some treasure */
2990 object *tmp, *tmp2, *next; 2946 object *tmp, *tmp2, *next;
2991 2947
2992 if (op->container) 2948 op->close_container (); /* close open sack first */
2993 esrv_apply_container (op, op->container); /* close open sack first */
2994 2949
2995 for (tmp = op->inv; tmp; tmp = next) 2950 for (tmp = op->inv; tmp; tmp = next)
2996 { 2951 {
2997 next = tmp->below; 2952 next = tmp->below;
2998 2953
2999 if (tmp->invisible) 2954 if (tmp->invisible)
3000 continue; 2955 continue;
3001 2956
3002 tmp->remove (); 2957 tmp->remove ();
3003 tmp->x = op->x, tmp->y = op->y; 2958 tmp->x = op->x, tmp->y = op->y;
2959
3004 if (tmp->type == CONTAINER) 2960 if (tmp->type == CONTAINER)
3005 { /* empty container to ground */ 2961 loot_object (tmp); /* empty container to ground */
3006 loot_object (tmp); 2962
3007 }
3008 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2963 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3009 { 2964 {
3010 if (tmp->nrof > 1) 2965 if (tmp->nrof > 1)
3011 { 2966 {
3012 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2967 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3013 tmp2->destroy (); 2968 tmp2->destroy ();
… …
3024/* 2979/*
3025 * fix_weight(): Check recursively the weight of all players, and fix 2980 * fix_weight(): Check recursively the weight of all players, and fix
3026 * what needs to be fixed. Refresh windows and fix speed if anything 2981 * what needs to be fixed. Refresh windows and fix speed if anything
3027 * was changed. 2982 * was changed.
3028 */ 2983 */
3029
3030void 2984void
3031fix_weight (void) 2985fix_weight (void)
3032{ 2986{
3033 for_all_players (pl) 2987 for_all_players (pl)
3034 { 2988 {
… …
3094 if (op->type == PLAYER) 3048 if (op->type == PLAYER)
3095 { 3049 {
3096 op->contr->tmp_invis = 0; 3050 op->contr->tmp_invis = 0;
3097 op->contr->invis_race = 0; 3051 op->contr->invis_race = 0;
3098 } 3052 }
3053
3099 update_object (op, UP_OBJ_FACE); 3054 update_object (op, UP_OBJ_CHANGE);
3100} 3055}
3101 3056
3102int 3057int
3103is_true_undead (object *op) 3058is_true_undead (object *op)
3104{ 3059{
3105 object *tmp = NULL;
3106
3107 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3060 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3108 return 1; 3061 return 1;
3109 3062
3110 return 0; 3063 return 0;
3111} 3064}
… …
3399 char buf[MAX_BUF]; /* tmp. string buffer */ 3352 char buf[MAX_BUF]; /* tmp. string buffer */
3400 int i = 0, j = 0; 3353 int i = 0, j = 0;
3401 3354
3402 /* get the appropriate treasurelist */ 3355 /* get the appropriate treasurelist */
3403 if (atnr == ATNR_FIRE) 3356 if (atnr == ATNR_FIRE)
3404 trlist = find_treasurelist ("dragon_ability_fire"); 3357 trlist = treasurelist::find ("dragon_ability_fire");
3405 else if (atnr == ATNR_COLD) 3358 else if (atnr == ATNR_COLD)
3406 trlist = find_treasurelist ("dragon_ability_cold"); 3359 trlist = treasurelist::find ("dragon_ability_cold");
3407 else if (atnr == ATNR_ELECTRICITY) 3360 else if (atnr == ATNR_ELECTRICITY)
3408 trlist = find_treasurelist ("dragon_ability_elec"); 3361 trlist = treasurelist::find ("dragon_ability_elec");
3409 else if (atnr == ATNR_POISON) 3362 else if (atnr == ATNR_POISON)
3410 trlist = find_treasurelist ("dragon_ability_poison"); 3363 trlist = treasurelist::find ("dragon_ability_poison");
3411 3364
3412 if (trlist == NULL || who->type != PLAYER) 3365 if (trlist == NULL || who->type != PLAYER)
3413 return; 3366 return;
3414 3367
3415 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3368 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
… …
3547 * not readied. 3500 * not readied.
3548 */ 3501 */
3549void 3502void
3550player_unready_range_ob (player *pl, object *ob) 3503player_unready_range_ob (player *pl, object *ob)
3551{ 3504{
3552 rangetype i; 3505 if (pl->ob->current_weapon == ob)
3506 pl->ob->current_weapon = 0;
3553 3507
3554 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3508 if (pl->combat_ob == ob)
3555 { 3509 pl->combat_ob = 0;
3510
3556 if (pl->ranges[i] == ob) 3511 if (pl->ranged_ob == ob)
3557 { 3512 pl->ranged_ob = 0;
3558 pl->ranges[i] = NULL;
3559 if (pl->shoottype == i)
3560 {
3561 pl->shoottype = range_none;
3562 }
3563 }
3564 }
3565} 3513}
3514
3515sint8
3516player::visibility_at (maptile *map, int x, int y) const
3517{
3518 if (!ns)
3519 return 0;
3520
3521 int dx, dy;
3522 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3523 return 0;
3524
3525 x += dx - ns->current_x + ns->mapx / 2;
3526 y += dy - ns->current_y + ns->mapy / 2;
3527
3528 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3529 return 0;
3530
3531 return 100 - blocked_los [x][y];
3532}

Diff Legend

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