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

Diff Legend

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