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.91 by root, Sun Jan 7 23:10:43 2007 UTC vs.
Revision 1.142 by root, Fri May 18 19:46:22 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
180 179
181 players.insert (this); 180 players.insert (this);
182 ob->remove (); 181 ob->remove ();
183 ob->map = 0; 182 ob->map = 0;
184 ob->activate_recursive (); 183 ob->activate_recursive ();
184 CLEAR_FLAG (ob, FLAG_FRIENDLY);
185 add_friendly_object (ob);
185 enter_map (); 186 enter_map ();
186} 187}
187 188
188void 189void
189player::deactivate () 190player::deactivate ()
190{ 191{
191 if (!active) 192 if (!active)
192 return; 193 return;
193 194
194 terminate_all_pets (ob); 195 terminate_all_pets (ob);
196 remove_friendly_object (ob);
195 ob->deactivate_recursive (); 197 ob->deactivate_recursive ();
198
199 if (ob->map)
200 maplevel = ob->map->path;
201
196 ob->remove (); 202 ob->remove ();
197 ob->map = 0; 203 ob->map = 0;
204 party = 0;
205
206 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
198 207
199 players.erase (this); 208 players.erase (this);
200} 209}
201 210
202// connect the player with a specific client 211// connect the player with a specific client
203// also changed, rationalises, and fixes some incorrect settings 212// also changes, rationalises, and fixes some incorrect settings
204void 213void
205player::connect (client *ns) 214player::connect (client *ns)
206{ 215{
207 this->ns = ns; 216 this->ns = ns;
208 ns->pl = this; 217 ns->pl = this;
209 218
219 run_on = 0;
220 fire_on = 0;
221 ob->close_container (); //TODO: client-specific
222
210 ns->update_look = 0; 223 ns->update_look = 0;
211 ns->look_position = 0; 224 ns->look_position = 0;
212 225
213 clear_los (ob); 226 clear_los (ob);
227
228 ns->reset_stats ();
214 229
215 /* make sure he's a player -- needed because of class change. */ 230 /* make sure he's a player -- needed because of class change. */
216 ob->type = PLAYER; // we are paranoid 231 ob->type = PLAYER; // we are paranoid
217 ob->race = ob->arch->clone.race; 232 ob->race = ob->arch->clone.race;
218 233
219 if (!legal_range (ob, shoottype))
220 shoottype = range_none;
221
222 ob->carrying = sum_weight (ob); 234 ob->carrying = sum_weight (ob);
223 link_player_skills (ob); 235 link_player_skills (ob);
224 236
225 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 237 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
226 238
227 assign (title, ob->arch->clone.name); 239 assign (title, ob->arch->clone.name);
228
229 /* can_use_shield is a new flag. However, the can_use.. seems to largely come
230 * from the class, and not race. I don't see any way to get the class information
231 * to then update this. I don't think this will actually break anything - anyone
232 * that can use armour should be able to use a shield. What this may 'break'
233 * are features new characters get, eg, if someone starts up with a Q, they
234 * should be able to use a shield. However, old Q's won't get that advantage.
235 */
236 if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
237 SET_FLAG (ob, FLAG_USE_SHIELD);
238 240
239 /* if it's a dragon player, set the correct title here */ 241 /* if it's a dragon player, set the correct title here */
240 if (is_dragon_pl (ob)) 242 if (is_dragon_pl (ob))
241 { 243 {
242 object *tmp, *abil = 0, *skin = 0; 244 object *tmp, *abil = 0, *skin = 0;
252 skin = tmp; 254 skin = tmp;
253 255
254 set_dragon_name (ob, abil, skin); 256 set_dragon_name (ob, abil, skin);
255 } 257 }
256 258
257 CLEAR_FLAG (ob, FLAG_FRIENDLY);
258 add_friendly_object (ob);
259
260 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 259 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
261 260
262 esrv_new_player (this, ob->weight + ob->carrying); 261 esrv_new_player (this, ob->weight + ob->carrying);
263 262
263 ob->flag [FLAG_READY_WEAPON] = false;
264 ob->flag [FLAG_READY_SKILL] = false;
265 ob->flag [FLAG_READY_BOW] = false;
266
267 for (object *op = ob->inv; op; op = op->below)
268 if (op->flag [FLAG_APPLIED])
269 switch (op->type)
270 {
271 case SKILL:
272 ob->flag [FLAG_APPLIED] = false;
273 break;
274
275 case WAND:
276 case ROD:
277 case HORN:
278 case BOW:
279 ranged_ob = op;
280 break;
281
282 case WEAPON:
283 combat_ob = op;
284 break;
285 }
286
287 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
264 ob->update_stats (); 288 ob->update_stats ();
289
265 ns->floorbox_update (); 290 ns->floorbox_update ();
266
267 esrv_send_inventory (ob, ob); 291 esrv_send_inventory (ob, ob);
268 esrv_add_spells (this, 0); 292 esrv_add_spells (this, 0);
269 293
270 activate (); 294 activate ();
271 295
285 if (active) 309 if (active)
286 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); 310 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
287 311
288 INVOKE_PLAYER (DISCONNECT, this); 312 INVOKE_PLAYER (DISCONNECT, this);
289 313
314 ns->reset_stats ();
290 ns->pl = 0; 315 ns->pl = 0;
291 this->ns = 0; 316 ns = 0;
292 } 317 }
318
319 if (ob)
320 ob->close_container (); //TODO: client-specific
293 321
294 deactivate (); 322 deactivate ();
295} 323}
296 324
297// the need for this function can be explained 325// the need for this function can be explained
298// by load_object not returning the object 326// by load_object not returning the object
299void 327void
300player::set_object (object *op) 328player::set_object (object *op)
301{ 329{
302 ob = op; 330 ob = op;
303 ob->contr = this; /* this aren't yet in archetype */ 331 ob->contr = this; /* this aren't yet in archetype */
304 332
333 ob->speed = 1.0f;
305 ob->speed_left = 0.5; 334 ob->speed_left = 0.5f;
306 ob->speed = 1.0; 335
307 ob->direction = 5; /* So player faces south */ 336 ob->direction = 5; /* So player faces south */
308 ob->stats.wc = 2;
309 ob->run_away = 25; /* Then we panick... */
310
311 ob->roll_stats ();
312} 337}
313 338
314player::player () 339player::player ()
315{ 340{
316 /* There are some elements we want initialised to non zero value - 341 /* There are some elements we want initialised to non zero value -
317 * we deal with that below this point. 342 * we deal with that below this point.
318 */ 343 */
319 outputs_sync = 16; /* Every 2 seconds */ 344 outputs_sync = 4;
320 outputs_count = 8; /* Keeps present behaviour */ 345 outputs_count = 4;
321 unapply = unapply_nochoice; 346 unapply = unapply_nochoice;
322 347
323 savebed_map = first_map_path; /* Init. respawn position */ 348 savebed_map = first_map_path; /* Init. respawn position */
324 349
325 gen_sp_armour = 10; 350 gen_sp_armour = 10;
326 last_speed = -1;
327 shoottype = range_none;
328 bowtype = bow_normal; 351 bowtype = bow_normal;
329 petmode = pet_normal; 352 petmode = pet_normal;
330 listening = 10; 353 listening = 10;
331 usekeys = containers; 354 usekeys = containers;
332 last_weapon_sp = -1;
333 peaceful = 1; /* default peaceful */ 355 peaceful = 1; /* default peaceful */
334 do_los = 1; 356 do_los = 1;
335 357
336 /* we need to clear these to -1 and not zero - otherwise, 358 weapon_sp = 1.0f;
337 * if a player quits and starts a new character, we wont 359 weapon_sp_left = 0.5f;
338 * send new values to the client, as things like exp start
339 * at zero.
340 */
341 for (int i = 0; i < NUM_SKILLS; i++)
342 last_skill_exp[i] = -1;
343
344 for (int i = 0; i < NROFATTACKS; i++)
345 last_resist[i] = -1;
346
347 last_stats.exp = -1;
348 last_weight = (uint32) - 1;
349} 360}
350 361
351void 362void
352player::do_destroy () 363player::do_destroy ()
353{ 364{
376player::create () 387player::create ()
377{ 388{
378 player *pl = new player; 389 player *pl = new player;
379 390
380 pl->set_object (arch_to_object (get_player_archetype (0))); 391 pl->set_object (arch_to_object (get_player_archetype (0)));
392
393 pl->ob->roll_stats ();
394 pl->ob->stats.wc = 2;
395 pl->ob->run_away = 25; /* Then we panick... */
396
381 set_first_map (pl->ob); 397 set_first_map (pl->ob);
382 398
383 return pl; 399 return pl;
384} 400}
385 401
417 object *op = NULL; 433 object *op = NULL;
418 objectlink *ol; 434 objectlink *ol;
419 unsigned lastdist; 435 unsigned lastdist;
420 rv_vector rv; 436 rv_vector rv;
421 437
422 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 438 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
423 { 439 {
424 /* We should not find free objects on this friendly list, but it 440 /* We should not find free objects on this friendly list, but it
425 * does periodically happen. Given that, lets deal with it. 441 * does periodically happen. Given that, lets deal with it.
426 * While unlikely, it is possible the next object on the friendly 442 * While unlikely, it is possible the next object on the friendly
427 * list is also free, so encapsulate this in a while loop. 443 * list is also free, so encapsulate this in a while loop.
431 object *tmp = ol->ob; 447 object *tmp = ol->ob;
432 448
433 /* Can't do much more other than log the fact, because the object 449 /* Can't do much more other than log the fact, because the object
434 * itself will have been cleared. 450 * itself will have been cleared.
435 */ 451 */
436 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n"); 452 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
453 tmp->debug_desc ());
437 ol = ol->next; 454 ol = ol->next;
438 remove_friendly_object (tmp); 455 remove_friendly_object (tmp);
439 if (!ol) 456 if (!ol)
440 return op; 457 return op;
441 } 458 }
530 x = mon->x; 547 x = mon->x;
531 y = mon->y; 548 y = mon->y;
532 m = mon->map; 549 m = mon->map;
533 dir = rv.direction; 550 dir = rv.direction;
534 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 551 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
535 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 552 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
553
536 /* If we can't solve it within the search distance, return now. */ 554 /* If we can't solve it within the search distance, return now. */
537 if (diff > max) 555 if (diff > max)
538 return 0; 556 return 0;
557
539 while (diff > 1 && max > 0) 558 while (diff > 1 && max > 0)
540 { 559 {
541 lastx = x; 560 lastx = x;
542 lasty = y; 561 lasty = y;
543 lastmap = m; 562 lastmap = m;
625 max--; 644 max--;
626 lastdir = dir; 645 lastdir = dir;
627 if (!firstdir) 646 if (!firstdir)
628 firstdir = dir; 647 firstdir = dir;
629 } 648 }
649
630 if (diff <= 1) 650 if (diff <= 1)
631 { 651 {
632 /* Recalculate diff (distance) because we may not have actually 652 /* Recalculate diff (distance) because we may not have actually
633 * headed toward player for entire distance. 653 * headed toward player for entire distance.
634 */ 654 */
635 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 655 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
636 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 656 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
637 } 657 }
658
638 if (diff > max) 659 if (diff > max)
639 return 0; 660 return 0;
640 } 661 }
662
641 /* If we reached the max, didn't find a direction in time */ 663 /* If we reached the max, didn't find a direction in time */
642 if (!max) 664 if (!max)
643 return 0; 665 return 0;
644 666
645 return firstdir; 667 return firstdir;
759roll_stat (void) 781roll_stat (void)
760{ 782{
761 int a[4], i, j, k; 783 int a[4], i, j, k;
762 784
763 for (i = 0; i < 4; i++) 785 for (i = 0; i < 4; i++)
764 a[i] = (int) RANDOM () % 6 + 1; 786 a[i] = (int) rndm (6) + 1;
765 787
766 for (i = 0, j = 0, k = 7; i < 4; i++) 788 for (i = 0, j = 0, k = 7; i < 4; i++)
767 if (a[i] < k) 789 if (a[i] < k)
768 k = a[i], j = i; 790 k = a[i], j = i;
769 791
775} 797}
776 798
777void 799void
778object::roll_stats () 800object::roll_stats ()
779{ 801{
780 int statsort [7]; 802 int statsort [NUM_STATS];
781 803
782 for (;;) 804 for (;;)
783 { 805 {
784 int sum = 0; 806 int sum = 0;
785 for (int i = 7; i--; ) 807 for (int i = NUM_STATS; i--; )
786 sum += statsort [i] = roll_stat (); 808 sum += statsort [i] = roll_stat ();
787 809
788 if (sum >= 82 && sum <= 116) 810 if (sum >= 82 && sum <= 116)
789 break; 811 break;
790 } 812 }
791 813
792 // Sort the stats so that rerolling is easier... 814 // Sort the stats so that rerolling is easier...
793 std::sort (statsort, statsort + 7, std::greater<int>()); 815 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
794 816
817 for (int i = 0; i < NUM_STATS; ++i)
795 stats.Str = statsort[0]; 818 stats.stat (i) = statsort [i];
796 stats.Dex = statsort[1];
797 stats.Con = statsort[2];
798 stats.Int = statsort[3];
799 stats.Wis = statsort[4];
800 stats.Pow = statsort[5];
801 stats.Cha = statsort[6];
802 819
803 stats.exp = 0; 820 stats.exp = 0;
804 stats.ac = 0; 821 stats.ac = 0;
805 822
806 stats.hp = stats.maxhp; 823 stats.hp = stats.maxhp;
818} 835}
819 836
820void 837void
821object::swap_stats (int a, int b) 838object::swap_stats (int a, int b)
822{ 839{
823 int tmp = get_attr_value (&contr->orig_stats, a); 840 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
824 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
825 set_attr_value (&contr->orig_stats, b, tmp);
826 841
842 for (int i = 0; i < NUM_STATS; ++i)
827 stats.Str = contr->orig_stats.Str; 843 stats.stat (i) = contr->orig_stats.stat (i);
828 stats.Dex = contr->orig_stats.Dex;
829 stats.Con = contr->orig_stats.Con;
830 stats.Int = contr->orig_stats.Int;
831 stats.Wis = contr->orig_stats.Wis;
832 stats.Pow = contr->orig_stats.Pow;
833 stats.Cha = contr->orig_stats.Cha;
834 844
835 //TODO: the following code looks so borked and should, at the very least, 845 //TODO: the following code looks so borked and should, at the very least,
836 // be merged with the similar code in roll_stats 846 // be merged with the similar code in roll_stats
837 stats.ac = 0; 847 stats.ac = 0;
838 848
869 * appropriate action with it (change race, or other things). 879 * appropriate action with it (change race, or other things).
870 * The function name is for historical reasons - now we have 880 * The function name is for historical reasons - now we have
871 * separate race and class; this actually changes the RACE, 881 * separate race and class; this actually changes the RACE,
872 * not the class. 882 * not the class.
873 */ 883 */
874int 884void
875key_change_class (object *op, char key) 885player::chargen_race_done ()
876{ 886{
877 int tmp_loop;
878
879 if (key == 'd' || key == 'D')
880 {
881 char buf[MAX_BUF];
882
883 /* this must before then initial items are given */ 887 /* this must before then initial items are given */
884 esrv_new_player (op->contr, op->weight + op->carrying); 888 esrv_new_player (ob->contr, ob->weight + ob->carrying);
885 889
886 treasurelist *tl = find_treasurelist ("starting_wealth"); 890 treasurelist *tl = treasurelist::find ("starting_wealth");
887 if (tl) 891 if (tl)
888 create_treasure (tl, op, 0, 0, 0); 892 create_treasure (tl, ob, 0, 0, 0);
889 893
890 INVOKE_PLAYER (BIRTH, op->contr); 894 INVOKE_PLAYER (BIRTH, ob->contr);
891 INVOKE_PLAYER (LOGIN, op->contr); 895 INVOKE_PLAYER (LOGIN, ob->contr);
892 896
893 op->contr->ns->state = ST_PLAYING; 897 ob->contr->ns->state = ST_PLAYING;
894 898
895 if (op->msg) 899 if (ob->msg)
896 op->msg = NULL; 900 ob->msg = 0;
897 901
898 /* We create this now because some of the unique maps will need it 902 /* We create this now because some of the unique maps will need it
899 * to save here. 903 * to save here.
900 */ 904 */
905 {
906 char buf[MAX_BUF];
901 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 907 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
902 make_path_to_file (buf); 908 make_path_to_file (buf);
909 }
903 910
904#ifdef AUTOSAVE
905 op->contr->last_save_tick = pticks;
906#endif
907 start_info (op); 911 start_info (ob);
908 CLEAR_FLAG (op, FLAG_WIZ); 912 CLEAR_FLAG (ob, FLAG_WIZ);
909 give_initial_items (op, op->randomitems); 913 give_initial_items (ob, ob->randomitems);
910 link_player_skills (op); 914 link_player_skills (ob);
911 esrv_send_inventory (op, op); 915 esrv_send_inventory (ob, ob);
912 op->update_stats (); 916 ob->update_stats ();
913 917
914 /* This moves the player to a different start map, if there 918 /* This moves the player to a different start map, if there
915 * is one for this race 919 * is one for this race
916 */ 920 */
917 if (*first_map_ext_path) 921 if (*first_map_ext_path)
918 { 922 {
919 object *tmp; 923 object *tmp;
920 char mapname[MAX_BUF]; 924 char mapname[MAX_BUF];
921 925
922 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name); 926 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
923 tmp = object::create (); 927 tmp = object::create ();
924 EXIT_PATH (tmp) = mapname; 928 EXIT_PATH (tmp) = mapname;
925 EXIT_X (tmp) = op->x; 929 EXIT_X (tmp) = ob->x;
926 EXIT_Y (tmp) = op->y; 930 EXIT_Y (tmp) = ob->y;
927 op->enter_exit (tmp); /* we don't really care if it succeeded; 931 ob->enter_exit (tmp); /* we don't really care if it succeeded;
928 * if the map isn't there, then stay on the 932 * if the map isn't there, then stay on the
929 * default initial map */ 933 * default initial map */
930 tmp->destroy (); 934 tmp->destroy ();
931 } 935 }
932 else 936 else
933 LOG (llevDebug, "first_map_ext_path not set\n"); 937 LOG (llevDebug, "first_map_ext_path not set\n");
938}
934 939
935 return 0; 940void
936 } 941player::chargen_race_next ()
937 942{
938 /* Following actually changes the race - this is the default command 943 /* Following actually changes the race - this is the default command
939 * if we don't match with one of the options above. 944 * if we don't match with one of the options above.
940 */ 945 */
941 946
942 tmp_loop = 0; 947 do
943 while (!tmp_loop)
944 { 948 {
945 shstr name = op->name; 949 shstr name = ob->name;
946 int x = op->x, y = op->y; 950 int x = ob->x, y = ob->y;
947 951
948 op->remove_statbonus (); 952 ob->remove_statbonus ();
949 op->remove (); 953 ob->remove ();
950 op->arch = get_player_archetype (op->arch); 954 ob->arch = get_player_archetype (ob->arch);
951 op->arch->clone.copy_to (op); 955 ob->arch->clone.copy_to (ob);
952 op->instantiate (); 956 ob->instantiate ();
953 op->stats = op->contr->orig_stats; 957 ob->stats = ob->contr->orig_stats;
954 op->name = op->name_pl = name; 958 ob->name = ob->name_pl = name;
955 op->x = x; 959 ob->x = x;
956 op->y = y; 960 ob->y = y;
957 SET_ANIMATION (op, 2); /* So player faces south */ 961 SET_ANIMATION (ob, 2); /* So player faces south */
958 insert_ob_in_map (op, op->map, op, 0); 962 insert_ob_in_map (ob, ob->map, ob, 0);
959 assign (op->contr->title, op->arch->clone.name); 963 assign (ob->contr->title, ob->arch->clone.name);
960 op->add_statbonus (); 964 ob->add_statbonus ();
961 tmp_loop = allowed_class (op);
962 } 965 }
966 while (!allowed_class (ob));
963 967
964 update_object (op, UP_OBJ_FACE); 968 update_object (ob, UP_OBJ_FACE);
965 esrv_update_item (UPD_FACE, op, op); 969 esrv_update_item (UPD_FACE, ob, ob);
966 op->update_stats (); 970 ob->update_stats ();
967 op->stats.hp = op->stats.maxhp; 971 ob->stats.hp = ob->stats.maxhp;
968 op->stats.sp = op->stats.maxsp; 972 ob->stats.sp = ob->stats.maxsp;
969 op->stats.grace = 0; 973 ob->stats.grace = 0;
970
971 if (op->msg)
972 new_draw_info (NDI_BLUE, 0, op, op->msg);
973
974 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
975 return 0;
976} 974}
977 975
978void 976void
979flee_player (object *op) 977flee_player (object *op)
980{ 978{
1027 /* Cornered, get rid of scared */ 1025 /* Cornered, get rid of scared */
1028 CLEAR_FLAG (op, FLAG_SCARED); 1026 CLEAR_FLAG (op, FLAG_SCARED);
1029 op->enemy = NULL; 1027 op->enemy = NULL;
1030} 1028}
1031 1029
1032
1033/* check_pick sees if there is stuff to be picked up/picks up stuff. 1030/* check_pick sees if there is stuff to be picked up/picks up stuff.
1034 * IT returns 1 if the player should keep on moving, 0 if he should 1031 * It returns 1 if the player should keep on moving, 0 if he should
1035 * stop. 1032 * stop.
1036 */ 1033 */
1037int 1034int
1038check_pick (object *op) 1035check_pick (object *op)
1039{ 1036{
1040 object *tmp, *next; 1037 object *tmp, *next;
1041 int stop = 0; 1038 int stop = 0;
1042 int j, k, wvratio; 1039 int wvratio;
1043 char putstring[128], tmpstr[16]; 1040 char putstring[128];
1044 1041
1045 /* if you're flying, you cna't pick up anything */ 1042 /* if you're flying, you cna't pick up anything */
1046 if (op->move_type & MOVE_FLYING) 1043 if (op->move_type & MOVE_FLYING)
1047 return 1; 1044 return 1;
1048 1045
1385 * found object is returned. 1382 * found object is returned.
1386 */ 1383 */
1387object * 1384object *
1388find_arrow (object *op, const char *type) 1385find_arrow (object *op, const char *type)
1389{ 1386{
1390 object *tmp = NULL; 1387 object *tmp = 0;
1391 1388
1392 for (op = op->inv; op; op = op->below) 1389 for (op = op->inv; op; op = op->below)
1393 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1390 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1394 tmp = find_arrow (op, type); 1391 tmp = find_arrow (op, type);
1395 else if (op->type == ARROW && op->race == type) 1392 else if (op->type == ARROW && op->race == type)
1396 return op; 1393 return op;
1394
1397 return tmp; 1395 return tmp;
1398} 1396}
1399 1397
1400/* 1398/*
1401 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1399 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1402 * against the target. A full test is not performed, simply a basic test 1400 * against the target. A full test is not performed, simply a basic test
1403 * of resistances. The archer is making a quick guess at what he sees down 1401 * of resistances. The archer is making a quick guess at what he sees down
1404 * the hall. Failing that it does it's best to pick the highest plus arrow. 1402 * the hall. Failing that it does it's best to pick the highest plus arrow.
1405 */ 1403 */
1406
1407object * 1404object *
1408find_better_arrow (object *op, object *target, const char *type, int *better) 1405find_better_arrow (object *op, object *target, const char *type, int *better)
1409{ 1406{
1410 object *tmp = NULL, *arrow, *ntmp; 1407 object *tmp = NULL, *arrow, *ntmp;
1411 int attacknum, attacktype, betterby = 0, i; 1408 int attacknum, attacktype, betterby = 0, i;
1477 * find_better_arrow to find a decent arrow to use. 1474 * find_better_arrow to find a decent arrow to use.
1478 * op = the shooter 1475 * op = the shooter
1479 * type = bow->race 1476 * type = bow->race
1480 * dir = fire direction 1477 * dir = fire direction
1481 */ 1478 */
1482
1483object * 1479object *
1484pick_arrow_target (object *op, const char *type, int dir) 1480pick_arrow_target (object *op, const char *type, int dir)
1485{ 1481{
1486 object *tmp = NULL; 1482 object *tmp = NULL;
1487 maptile *m; 1483 maptile *m;
1552 */ 1548 */
1553int 1549int
1554fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) 1550fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1555{ 1551{
1556 object *left, *bow; 1552 object *left, *bow;
1557 int bowspeed, mflags; 1553 int mflags;
1558 maptile *m; 1554 maptile *m;
1559 1555
1560 if (!dir) 1556 if (!dir)
1561 { 1557 {
1562 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1558 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1563 return 0; 1559 return 0;
1564 } 1560 }
1565 1561
1566 if (op->type == PLAYER) 1562 if (op->contr)
1567 bow = op->contr->ranges[range_bow]; 1563 bow = op->current_weapon;
1568 else 1564 else
1569 { 1565 {
1570 for (bow = op->inv; bow; bow = bow->below) 1566 for (bow = op->inv; bow; bow = bow->below)
1571 /* Don't check for applied - monsters don't apply bows - in that way, they 1567 /* Don't check for applied - monsters don't apply bows - in that way, they
1572 * don't need to switch back and forth between bows and weapons. 1568 * don't need to switch back and forth between bows and weapons.
1577 if (!bow) 1573 if (!bow)
1578 { 1574 {
1579 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1575 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1580 return 0; 1576 return 0;
1581 } 1577 }
1578
1579 // optimisation: move object to top so we will find it quickly again
1580 if (bow->below)
1581 {
1582 bow->remove ();
1583 op->insert (bow);
1584 }
1585
1582 } 1586 }
1583 1587
1584 if (!bow->race || !bow->skill) 1588 if (!bow->race || !bow->skill)
1585 { 1589 {
1586 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1590 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1587 return 0; 1591 return 0;
1588 } 1592 }
1589
1590 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1591
1592 /* penalize ROF for bestarrow */
1593 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1594 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1595
1596 if (bowspeed < 1)
1597 bowspeed = 1;
1598 1593
1599 if (arrow == NULL) 1594 if (arrow == NULL)
1600 { 1595 {
1601 if ((arrow = find_arrow (op, bow->race)) == NULL) 1596 if ((arrow = find_arrow (op, bow->race)) == NULL)
1602 { 1597 {
1603 if (op->type == PLAYER) 1598 if (op->type == PLAYER)
1604 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1599 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1605 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1600 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1606 else 1601 else
1607 CLEAR_FLAG (op, FLAG_READY_BOW); 1602 CLEAR_FLAG (op, FLAG_READY_BOW);
1603
1608 return 0; 1604 return 0;
1609 } 1605 }
1610 } 1606 }
1611 1607
1612 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1608 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
1636 1632
1637 arrow->set_owner (op); 1633 arrow->set_owner (op);
1638 arrow->skill = bow->skill; 1634 arrow->skill = bow->skill;
1639 arrow->direction = dir; 1635 arrow->direction = dir;
1640 1636
1637 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1638 arrow->stats.hp = arrow->stats.dam;
1639 arrow->stats.grace = arrow->attacktype;
1640
1641 if (arrow->slaying)
1642 arrow->spellarg = strdup (arrow->slaying);
1643
1644#if 0
1645 if (player *pl = op->contr)
1646 {
1647 float speed = pl->weapon_sp;
1648
1649 /* penalize ROF for bestarrow */
1650 if (pl->bowtype == bow_bestarrow)
1651 speed *= .9f;
1652 else
1653 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1654
1655 op->speed_left += speed - op->speed;
1656 }
1657#endif
1658
1659 SET_ANIMATION (arrow, arrow->direction);
1660
1661 /* update the speed */
1662 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1663 + bow->stats.dam / 7.f;
1664
1665 arrow->set_speed (max (arrow->speed, 2.f));
1666 arrow->speed_left = 0;
1667
1668 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1669
1641 if (op->type == PLAYER) 1670 if (op->type == PLAYER)
1642 { 1671 {
1643 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1644 op->update_stats ();
1645 }
1646
1647 SET_ANIMATION (arrow, arrow->direction);
1648 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1649 arrow->stats.hp = arrow->stats.dam;
1650 arrow->stats.grace = arrow->attacktype;
1651 if (arrow->slaying != NULL)
1652 arrow->spellarg = strdup (arrow->slaying);
1653
1654 /* Note that this was different for monsters - they got their level
1655 * added to the damage. I think the strength bonus is more proper.
1656 */
1657
1658 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1659
1660 /* update the speed */
1661 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1662 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1663
1664 arrow->set_speed (max (arrow->speed, 1.0));
1665 arrow->speed_left = 0;
1666
1667 if (op->type == PLAYER)
1668 {
1669 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1670 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1671 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1672
1673 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1672 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1673 wc -= dex_bonus[op->stats.Dex];
1674
1675 if (!arrow->slaying)
1676 arrow->slaying = op->slaying;
1677
1678 arrow->attacktype |= op->attacktype;
1674 } 1679 }
1675 else 1680 else
1676 { 1681 {
1677 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1678 arrow->level = op->level; 1682 arrow->level = op->level;
1679 } 1683 arrow->stats.wc -= bow->magic;
1680 1684
1681 if (arrow->attacktype == AT_PHYSICAL) 1685 if (!arrow->slaying)
1686 arrow->slaying = bow->slaying;
1687
1682 arrow->attacktype |= bow->attacktype; 1688 arrow->attacktype |= bow->attacktype;
1689 }
1683 1690
1684 if (bow->slaying) 1691 wc -= arrow->level;
1685 arrow->slaying = bow->slaying; 1692 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1686 1693
1694 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1687 arrow->move_type = MOVE_FLY_LOW; 1695 arrow->move_type = MOVE_FLY_LOW;
1688 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1696 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1689 1697
1690 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1698 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1691 m->insert (arrow, sx, sy, op); 1699 m->insert (arrow, sx, sy, op);
1716{ 1724{
1717 int ret = 0, wcmod = 0; 1725 int ret = 0, wcmod = 0;
1718 1726
1719 if (op->contr->bowtype == bow_bestarrow) 1727 if (op->contr->bowtype == bow_bestarrow)
1720 { 1728 {
1721 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1729 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1722 } 1730 }
1723 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1731 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1724 { 1732 {
1725 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1733 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1726 wcmod = -1; 1734 wcmod = -1;
1736 else if (op->contr->bowtype == bow_spreadshot) 1744 else if (op->contr->bowtype == bow_spreadshot)
1737 { 1745 {
1738 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1746 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1739 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1747 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); 1748 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1741
1742 } 1749 }
1743 else 1750 else
1744 { 1751 {
1745 /* Simple case */ 1752 /* Simple case */
1746 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1753 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1747 } 1754 }
1755
1748 return ret; 1756 return ret;
1749} 1757}
1750
1751 1758
1752/* Fires a misc (wand/rod/horn) object in 'dir'. 1759/* Fires a misc (wand/rod/horn) object in 'dir'.
1753 * Broken apart from 'fire' to keep it more readable. 1760 * Broken apart from 'fire' to keep it more readable.
1754 */ 1761 */
1755void 1762void
1756fire_misc_object (object *op, int dir) 1763fire_misc_object (object *op, int dir)
1757{ 1764{
1758 object *item; 1765 object *item = op->contr->ranged_ob;
1759 1766
1760 if (!op->contr->ranges[range_misc]) 1767 if (!item)
1761 { 1768 {
1762 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1769 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1763 return; 1770 return;
1764 } 1771 }
1765 1772
1766 item = op->contr->ranges[range_misc];
1767 if (!item->inv) 1773 if (!item->inv)
1768 { 1774 {
1769 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1775 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1770 return; 1776 return;
1771 } 1777 }
1778
1779 if (!op->change_weapon (item))
1780 return;
1781
1772 if (item->type == WAND) 1782 if (item->type == WAND)
1773 { 1783 {
1774 if (item->stats.food <= 0) 1784 if (item->stats.food <= 0)
1775 { 1785 {
1776 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1786 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1777 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1787 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1788
1778 return; 1789 return;
1779 } 1790 }
1780 } 1791 }
1781 else if (item->type == ROD || item->type == HORN) 1792 else if (item->type == ROD || item->type == HORN)
1782 { 1793 {
1783 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1794 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1784 { 1795 {
1785 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1796 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1797
1786 if (item->type == ROD) 1798 if (item->type == ROD)
1787 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1799 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1788 else 1800 else
1789 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1801 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1802
1790 return; 1803 return;
1791 } 1804 }
1792 } 1805 }
1793 1806
1794 if (cast_spell (op, item, dir, item->inv, NULL)) 1807 if (cast_spell (op, item, dir, item->inv, NULL))
1816 } 1829 }
1817} 1830}
1818 1831
1819/* Received a fire command for the player - go and do it. 1832/* Received a fire command for the player - go and do it.
1820 */ 1833 */
1821void 1834bool
1822fire (object *op, int dir) 1835fire (object *op, int dir)
1823{ 1836{
1824 int spellcost = 0; 1837 int spellcost = 0;
1825 1838
1826 /* check for loss of invisiblity/hide */ 1839 /* check for loss of invisiblity/hide */
1827 if (action_makes_visible (op)) 1840 if (action_makes_visible (op))
1828 make_visible (op); 1841 make_visible (op);
1829 1842
1830 switch (op->contr->shoottype) 1843 player *pl = op->contr;
1844
1845 if (pl->golem)
1846 {
1847 control_golem (op->contr->golem, dir);
1848 return false;
1831 { 1849 }
1832 case range_none:
1833 return;
1834 1850
1835 case range_bow: 1851 object *ob = pl->ranged_ob;
1852
1853 if (!ob)
1854 return false;
1855
1856 if (!op->change_weapon (ob))
1857 return false;
1858
1859 if (op->speed_left > 0.f)
1860 --op->speed_left;
1861 else
1862 return false;
1863
1864 switch (ob->type)
1865 {
1866 case BOW:
1836 player_fire_bow (op, dir); 1867 player_fire_bow (op, dir);
1837 return; 1868 break;
1838 1869
1839 case range_magic: /* Casting spells */ 1870 case SPELL:
1840 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1871 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1841 return; 1872 break;
1842 1873
1843 case range_misc: 1874 case BUILDER:
1875 apply_map_builder (op, dir);
1876 break;
1877
1878 case SKILL:
1879 do_skill (op, op, ob, dir, 0);
1880 break;
1881
1882 default:
1844 fire_misc_object (op, dir); 1883 fire_misc_object (op, dir);
1845 return; 1884 break;
1846
1847 case range_golem: /* Control summoned monsters from scrolls */
1848 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1849 {
1850 op->contr->ranges[range_golem] = 0;
1851 op->contr->shoottype = range_none;
1852 }
1853 else
1854 control_golem (op->contr->ranges[range_golem], dir);
1855 return;
1856
1857 case range_skill:
1858 if (!op->chosen_skill)
1859 {
1860 if (op->type == PLAYER)
1861 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1862 return;
1863 }
1864 (void) do_skill (op, op, op->chosen_skill, dir, NULL);
1865 return;
1866 case range_builder:
1867 apply_map_builder (op, dir);
1868 return;
1869 default:
1870 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1871 return;
1872 } 1885 }
1873}
1874 1886
1875 1887 return true;
1888}
1876 1889
1877/* find_key 1890/* find_key
1878 * We try to find a key for the door as passed. If we find a key 1891 * We try to find a key for the door as passed. If we find a key
1879 * and successfully use it, we return the key, otherwise NULL 1892 * and successfully use it, we return the key, otherwise NULL
1880 * This function merges both normal and locked door, since the logic 1893 * This function merges both normal and locked door, since the logic
1882 * pl is the player, 1895 * pl is the player,
1883 * inv is the objects inventory to searched 1896 * inv is the objects inventory to searched
1884 * door is the door we are trying to match against. 1897 * door is the door we are trying to match against.
1885 * This function can be called recursively to search containers. 1898 * This function can be called recursively to search containers.
1886 */ 1899 */
1887
1888object * 1900object *
1889find_key (object *pl, object *container, object *door) 1901find_key (object *pl, object *container, object *door)
1890{ 1902{
1891 object *tmp, *key; 1903 object *tmp, *key;
1892 1904
1893 /* Should not happen, but sanity checking is never bad */ 1905 /* Should not happen, but sanity checking is never bad */
1894 if (container->inv == NULL) 1906 if (!container->inv)
1895 return NULL; 1907 return 0;
1896 1908
1897 /* First, lets try to find a key in the top level inventory */ 1909 /* First, lets try to find a key in the top level inventory */
1898 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1910 for (tmp = container->inv; tmp; tmp = tmp->below)
1899 { 1911 {
1900 if (door->type == DOOR && tmp->type == KEY) 1912 if (door->type == DOOR && tmp->type == KEY)
1901 break; 1913 break;
1902 /* For sanity, we should really check door type, but other stuff 1914 /* For sanity, we should really check door type, but other stuff
1903 * (like containers) can be locked with special keys 1915 * (like containers) can be locked with special keys
1904 */ 1916 */
1905 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1917 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1906 break; 1918 break;
1907 } 1919 }
1920
1908 /* No key found - lets search inventories now */ 1921 /* No key found - lets search inventories now */
1909 /* If we find and use a key in an inventory, return at that time. 1922 /* If we find and use a key in an inventory, return at that time.
1910 * otherwise, if we search all the inventories and still don't find 1923 * otherwise, if we search all the inventories and still don't find
1911 * a key, return 1924 * a key, return
1912 */ 1925 */
1913 if (!tmp) 1926 if (!tmp)
1914 { 1927 {
1915 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1928 for (tmp = container->inv; tmp; tmp = tmp->below)
1916 { 1929 {
1917 /* No reason to search empty containers */ 1930 /* No reason to search empty containers */
1918 if (tmp->type == CONTAINER && tmp->inv) 1931 if (tmp->type == CONTAINER && tmp->inv)
1919 { 1932 {
1920 if ((key = find_key (pl, tmp, door)) != NULL) 1933 if ((key = find_key (pl, tmp, door)))
1921 return key; 1934 return key;
1922 } 1935 }
1923 } 1936 }
1937
1924 if (!tmp) 1938 if (!tmp)
1925 return NULL; 1939 return NULL;
1926 } 1940 }
1941
1927 /* We get down here if we have found a key. Now if its in a container, 1942 /* We get down here if we have found a key. Now if its in a container,
1928 * see if we actually want to use it 1943 * see if we actually want to use it
1929 */ 1944 */
1930 if (pl != container) 1945 if (pl != container)
1931 { 1946 {
1952 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1967 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1953 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1968 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1954 return NULL; 1969 return NULL;
1955 } 1970 }
1956 } 1971 }
1972
1957 return tmp; 1973 return tmp;
1958} 1974}
1959 1975
1960/* moved door processing out of move_player_attack. 1976/* moved door processing out of move_player_attack.
1961 * returns 1 if player has opened the door with a key 1977 * returns 1 if player has opened the door with a key
1963 * 0 otherwise 1979 * 0 otherwise
1964 */ 1980 */
1965static int 1981static int
1966player_attack_door (object *op, object *door) 1982player_attack_door (object *op, object *door)
1967{ 1983{
1968 /* If its a door, try to find a use a key. If we do destroy the door, 1984 /* If its a door, try to find a key. If we do destroy the door,
1969 * might as well return immediately as there is nothing more to do - 1985 * might as well return immediately as there is nothing more to do -
1970 * otherwise, we fall through to the rest of the code. 1986 * otherwise, we fall through to the rest of the code.
1971 */ 1987 */
1972 object *key = find_key (op, op, door); 1988 object *key = find_key (op, op, door);
1973 1989
1974 /* IF we found a key, do some extra work */ 1990 /* If we found a key, do some extra work */
1975 if (key) 1991 if (key)
1976 { 1992 {
1977 object *container = key->env; 1993 object *container = key->env;
1978 1994
1979 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1995 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1996
1980 if (action_makes_visible (op)) 1997 if (action_makes_visible (op))
1981 make_visible (op); 1998 make_visible (op);
1999
1982 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 2000 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1983 spring_trap (door->inv, op); 2001 spring_trap (door->inv, op);
2002
1984 if (door->type == DOOR) 2003 if (door->type == DOOR)
1985 {
1986 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 2004 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1987 }
1988 else if (door->type == LOCKED_DOOR) 2005 else if (door->type == LOCKED_DOOR)
1989 { 2006 {
1990 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 2007 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
1991 remove_door2 (door); /* remove door without violence ;-) */ 2008 remove_door2 (door); /* remove door without violence ;-) */
1992 } 2009 }
2010
1993 /* Do this after we print the message */ 2011 /* Do this after we print the message */
1994 decrease_ob (key); /* Use up one of the keys */ 2012 decrease_ob (key); /* Use up one of the keys */
1995 /* Need to update the weight the container the key was in */ 2013 /* Need to update the weight the container the key was in */
1996 if (container != op) 2014 if (container != op)
1997 esrv_update_item (UPD_WEIGHT, op, container); 2015 esrv_update_item (UPD_WEIGHT, op, container);
2016
1998 return 1; /* Nothing more to do below */ 2017 return 1; /* Nothing more to do below */
1999 } 2018 }
2000 else if (door->type == LOCKED_DOOR) 2019 else if (door->type == LOCKED_DOOR)
2001 { 2020 {
2002 /* Might as well return now - no other way to open this */ 2021 /* Might as well return now - no other way to open this */
2003 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 2022 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2004 return 1; 2023 return 1;
2005 } 2024 }
2025
2006 return 0; 2026 return 0;
2007} 2027}
2008 2028
2009/* This function is just part of a breakup from move_player. 2029/* This function is just part of a breakup from move_player.
2010 * It should keep the code cleaner. 2030 * It should keep the code cleaner.
2011 * When this is called, the players direction has been updated 2031 * When this is called, the players direction has been updated
2012 * (taking into account confusion.) The player is also actually 2032 * (taking into account confusion.) The player is also actually
2013 * going to try and move (not fire weapons). 2033 * going to try and move (not fire weapons).
2014 */ 2034 */
2015void 2035bool
2016move_player_attack (object *op, int dir) 2036move_player_attack (object *op, int dir)
2017{ 2037{
2018 object *tmp, *mon;
2019 sint16 nx, ny;
2020 int on_battleground; 2038 int on_battleground;
2021 maptile *m;
2022 2039
2023 nx = freearr_x[dir] + op->x; 2040 sint16 nx = freearr_x[dir] + op->x;
2024 ny = freearr_y[dir] + op->y; 2041 sint16 ny = freearr_y[dir] + op->y;
2025 2042
2026 on_battleground = op_on_battleground (op, 0, 0); 2043 on_battleground = op_on_battleground (op, 0, 0);
2044
2045 if (out_of_map (op->map, nx, ny))
2046 return false;
2047
2048 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2049 {
2050 --op->speed_left;
2051 return true;
2052 }
2027 2053
2028 /* If braced, or can't move to the square, and it is not out of the 2054 /* If braced, or can't move to the square, and it is not out of the
2029 * map, attack it. Note order of if statement is important - don't 2055 * map, attack it. Note order of if statement is important - don't
2030 * want to be calling move_ob if braced, because move_ob will move the 2056 * want to be calling move_ob if braced, because move_ob will move the
2031 * player. This is a pretty nasty hack, because if we could 2057 * player. This is a pretty nasty hack, because if we could
2032 * move to some space, it then means that if we are braced, we should 2058 * move to some space, it then means that if we are braced, we should
2033 * do nothing at all. As it is, if we are braced, we go through 2059 * do nothing at all. As it is, if we are braced, we go through
2034 * quite a bit of processing. However, it probably is less than what 2060 * quite a bit of processing. However, it probably is less than what
2035 * move_ob uses. 2061 * move_ob uses.
2036 */ 2062 */
2037 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2038 {
2039 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2040 {
2041 m = op->map->xy_find (nx, ny); 2063 maptile *m = op->map->xy_find (nx, ny);
2042 if (!m)
2043 return; /* Don't think this should happen */
2044 }
2045 else
2046 m = op->map;
2047 2064
2048 if (!(tmp = m->at (nx, ny).bot))
2049 return;
2050
2051 mon = 0;
2052 /* Go through all the objects, and find ones of interest. Only stop if 2065 /* Go through all the objects, and find ones of interest. Only stop if
2053 * we find a monster - that is something we know we want to attack. 2066 * we find a monster - that is something we know we want to attack.
2054 * if its a door or barrel (can roll) see if there may be monsters 2067 * if its a door or barrel (can roll) see if there may be monsters
2055 * on the space 2068 * on the space
2056 */ 2069 */
2057 while (tmp) 2070 object *mon;
2058 { 2071 for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2059 if (tmp == op) 2072 {
2060 { 2073 if ((mon->flag [FLAG_ALIVE]
2061 tmp = tmp->above; 2074 || mon->type == LOCKED_DOOR
2062 continue; 2075 || mon->flag [FLAG_CAN_ROLL])
2063 }
2064
2065 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2066 {
2067 mon = tmp; 2076 && mon != op)
2068 break; 2077 break;
2069 } 2078 }
2070 2079
2071 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2072 mon = tmp;
2073
2074 tmp = tmp->above;
2075 }
2076
2077 if (!mon) /* This happens anytime the player tries to move */ 2080 if (!mon) /* This happens anytime the player tries to move */
2078 return; /* into a wall */ 2081 return false; /* into a wall */
2079 2082
2080 if (mon->head)
2081 mon = mon->head; 2083 mon = mon->head_ ();
2082 2084
2083 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2085 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2086 if (op->contr->weapon_sp_left > 0.f)
2084 if (player_attack_door (op, mon)) 2087 if (player_attack_door (op, mon))
2088 {
2089 --op->contr->weapon_sp_left;
2085 return; 2090 return true;
2091 }
2086 2092
2087 /* The following deals with possibly attacking peaceful 2093 /* The following deals with possibly attacking peaceful
2088 * or frienddly creatures. Basically, all players are considered 2094 * or friendly creatures. Basically, all players are considered
2089 * unaggressive. If the moving player has peaceful set, then the 2095 * unaggressive. If the moving player has peaceful set, then the
2090 * object should be pushed instead of attacked. It is assumed that 2096 * object should be pushed instead of attacked. It is assumed that
2091 * if you are braced, you will not attack friends accidently, 2097 * if you are braced, you will not attack friends accidently,
2092 * and thus will not push them. 2098 * and thus will not push them.
2093 */ 2099 */
2094 2100
2095 /* If the creature is a pet, push it even if the player is not 2101 /* If the creature is a pet, push it even if the player is not
2096 * peaceful. Our assumption is the creature is a pet if the 2102 * peaceful. Our assumption is the creature is a pet if the
2097 * player owns it and it is either friendly or unagressive. 2103 * player owns it and it is either friendly or unagressive.
2098 */ 2104 */
2099 if ((op->type == PLAYER) 2105 if (op->type == PLAYER
2100#if COZY_SERVER
2101 &&
2102 ((mon->owner && mon->owner->contr 2106 && ((mon->owner && mon->owner->contr
2103 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op) 2107 && same_party (mon->owner->contr->party, op->contr->party))
2104#else
2105 && mon->owner == op 2108 || mon->owner == op)
2106#endif
2107 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2109 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2108 { 2110 {
2109 /* If we're braced, we don't want to switch places with it */ 2111 /* If we're braced, we don't want to switch places with it */
2110 if (op->contr->braced) 2112 if (op->contr->braced)
2111 return; 2113 return false;
2114
2115 if (op->speed_left > 0.f)
2116 {
2117 --op->speed_left;
2112 2118
2113 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);
2114 (void) push_ob (mon, dir, op); 2120 push_ob (mon, dir, op);
2121
2115 if (op->contr->tmp_invis || op->hide) 2122 if (op->contr->tmp_invis || op->hide)
2116 make_visible (op); 2123 make_visible (op);
2117 2124
2118 return; 2125 return true;
2119 } 2126 }
2127 else
2128 return false;
2129 }
2120 2130
2121 /* in certain circumstances, you shouldn't attack friendly 2131 /* in certain circumstances, you shouldn't attack friendly
2122 * creatures. Note that if you are braced, you can't push 2132 * creatures. Note that if you are braced, you can't push
2123 * someone, but put it inside this loop so that you won't 2133 * someone, but put it inside this loop so that you won't
2124 * attack them either. 2134 * attack them either.
2125 */ 2135 */
2126 if ((mon->type == PLAYER || mon->enemy != op) && 2136 if ((mon->type == PLAYER || mon->enemy != op)
2127 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2137 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2128#ifdef PROHIBIT_PLAYERKILL
2129 (op->contr->peaceful 2138 && ((op->contr->peaceful
2130 || (mon->type == PLAYER 2139 || (mon->type == PLAYER && mon->contr->peaceful))
2131 && mon->contr->
2132 peaceful)) &&
2133#else
2134 op->contr->peaceful &&
2135#endif
2136 !on_battleground)) 2140 && !on_battleground))
2141 {
2142 if (op->speed_left > 0.f)
2137 { 2143 {
2144 --op->speed_left;
2145
2138 if (!op->contr->braced) 2146 if (!op->contr->braced)
2139 { 2147 {
2140 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2148 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2141 push_ob (mon, dir, op); 2149 push_ob (mon, dir, op);
2142 } 2150 }
2143 else 2151 else
2144 new_draw_info (0, 0, op, "You withhold your attack"); 2152 new_draw_info (0, 0, op, "You withhold your attack");
2145 2153
2146 if (op->contr->tmp_invis || op->hide) 2154 if (op->contr->tmp_invis || op->hide)
2147 make_visible (op); 2155 make_visible (op);
2148 }
2149 2156
2157 return true;
2158 }
2159 }
2150 /* If the object is a boulder or other rollable object, then 2160 /* If the object is a boulder or other rollable object, then
2151 * roll it if not braced. You can't roll it if you are braced. 2161 * roll it if not braced. You can't roll it if you are braced.
2152 */ 2162 */
2153 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 2163 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
2164 {
2165 if (op->speed_left > 0.f)
2154 { 2166 {
2167 --op->speed_left;
2168
2155 recursive_roll (mon, dir, op); 2169 recursive_roll (mon, dir, op);
2156 if (action_makes_visible (op)) 2170 if (action_makes_visible (op))
2157 make_visible (op); 2171 make_visible (op);
2158 }
2159 2172
2173 return true;
2174 }
2175 }
2160 /* Any generic living creature. Including things like doors. 2176 /* Any generic living creature. Including things like doors.
2161 * Way it works is like this: First, it must have some hit points 2177 * Way it works is like this: First, it must have some hit points
2162 * and be living. Then, it must be one of the following: 2178 * and be living. Then, it must be one of the following:
2163 * 1) Not a player, 2) A player, but of a different party. Note 2179 * 1) Not a player, 2) A player, but of a different party. Note
2164 * that party_number -1 is no party, so attacks can still happen. 2180 * that party_number -1 is no party, so attacks can still happen.
2165 */ 2181 */
2166 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2182 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2167 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2183 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2168 { 2184 {
2169 2185 if (op->contr->weapon_sp_left > 0.f)
2170 /* If the player hasn't hit something this tick, and does
2171 * so, give them speed boost based on weapon speed. Doing
2172 * it here is better than process_players2, which basically
2173 * incurred a 1 tick offset.
2174 */
2175 if (!op->contr->has_hit)
2176 { 2186 {
2177 op->speed_left += op->speed / op->contr->weapon_sp; 2187 --op->contr->weapon_sp_left;
2178
2179 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2180 }
2181 2188
2182 skill_attack (mon, op, 0, 0, 0); 2189 skill_attack (mon, op, 0, 0, 0);
2183
2184 /* If attacking another player, that player gets automatic
2185 * hitback, and doesn't loose luck either.
2186 * Disable hitback on the battleground or if the target is
2187 * the wiz.
2188 */
2189 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2190 {
2191 short luck = mon->stats.luck;
2192
2193 mon->contr->has_hit = 1;
2194 skill_attack (op, mon, 0, 0, 0);
2195 mon->stats.luck = luck;
2196 }
2197 2190
2198 if (action_makes_visible (op)) 2191 if (action_makes_visible (op))
2199 make_visible (op); 2192 make_visible (op);
2200 }
2201 } /* if player should attack something */
2202}
2203 2193
2204int 2194 return true;
2195 }
2196 }
2197
2198 return false;
2199}
2200
2201bool
2205move_player (object *op, int dir) 2202move_player (object *op, int dir)
2206{ 2203{
2207 int pick; 2204 int pick;
2208 2205
2209 if (!op->map || op->map->in_memory != MAP_IN_MEMORY) 2206 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2216 return 0; 2213 return 0;
2217 } 2214 }
2218 2215
2219 /* peterm: added following line */ 2216 /* peterm: added following line */
2220 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2217 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2221 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2218 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2222 2219
2223 op->facing = dir; 2220 op->facing = dir;
2224 2221
2225 if (op->hide) 2222 if (op->hide)
2226 do_hidden_move (op); 2223 do_hidden_move (op);
2227 2224
2225 bool retval;
2226
2228 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2227 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2229 /*nop */ ; 2228 retval = RESULT_INT (0);
2230 else if (op->contr->fire_on) 2229 else if (op->contr->fire_on)
2231 fire (op, dir); 2230 retval = fire (op, dir);
2232 else 2231 else
2233 { 2232 {
2234 move_player_attack (op, dir); 2233 retval = move_player_attack (op, dir);
2235 pick = check_pick (op); 2234 pick = check_pick (op);
2236 } 2235 }
2237 2236
2238 /* Add special check for newcs players and fire on - this way, the 2237 /* Add special check for newcs players and fire on - this way, the
2239 * server can handle repeat firing. 2238 * server can handle repeat firing.
2246 /* Update how the player looks. Use the facing, so direction may 2245 /* Update how the player looks. Use the facing, so direction may
2247 * get reset to zero. This allows for full animation capabilities 2246 * get reset to zero. This allows for full animation capabilities
2248 * for players. 2247 * for players.
2249 */ 2248 */
2250 animate_object (op, op->facing); 2249 animate_object (op, op->facing);
2251 return 0; 2250
2251 return retval;
2252} 2252}
2253 2253
2254/* This is similar to handle_player, below, but is only used by the 2254/* This is similar to handle_player, below, but is only used by the
2255 * new client/server stuff. 2255 * new client/server stuff.
2256 * This is sort of special, in that the new client/server actually uses 2256 * This is sort of special, in that the new client/server actually uses
2257 * the new speed values for commands. 2257 * the new speed values for commands.
2258 * 2258 *
2259 * Returns true if there are more actions we can do. 2259 * Returns true if there are more actions we can do. Should not do
2260 * many actions in a row, as that would be too unfair to other
2261 * players.
2260 */ 2262 */
2261int 2263bool
2262handle_newcs_player (object *op) 2264handle_newcs_player (object *op)
2263{ 2265{
2264 if (op->contr->hidden)
2265 {
2266 op->invisible = 1000;
2267 /* the socket code flashes the player visible/invisible
2268 * depending on the value of invisible, so we need to
2269 * alternate it here for it to work correctly.
2270 */
2271 if (pticks & 2)
2272 op->invisible--;
2273 }
2274 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2275 {
2276 op->invisible--;
2277 if (!op->invisible)
2278 {
2279 make_visible (op);
2280 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2281 }
2282 }
2283
2284 if (QUERY_FLAG (op, FLAG_SCARED)) 2266 if (QUERY_FLAG (op, FLAG_SCARED))
2285 { 2267 {
2286 flee_player (op); 2268 if (op->speed_left > 0.f)
2287 /* If player is still scared, that is his action for this tick */
2288 if (QUERY_FLAG (op, FLAG_SCARED))
2289 { 2269 {
2290 op->speed_left--; 2270 --op->speed_left;
2271 flee_player (op);
2272
2291 return 0; 2273 return true;
2292 } 2274 }
2275 else
2276 return false;
2293 } 2277 }
2294
2295 /* I've been seeing crashes where the golem has been destroyed, but
2296 * the player object still points to the defunct golem. The code that
2297 * destroys the golem looks correct, and it doesn't always happen, so
2298 * put this in a a workaround to clean up the golem pointer.
2299 */
2300 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2301 op->contr->ranges[range_golem] = 0;
2302 2278
2303 /* call this here - we also will call this in do_ericserver, but 2279 /* call this here - we also will call this in do_ericserver, but
2304 * the players time has been increased when doericserver has been 2280 * the players time has been increased when doericserver has been
2305 * called, so we recheck it here. 2281 * called, so we recheck it here.
2306 */ 2282 */
2307 if (op->contr->ns->handle_command ()) 2283 if (op->contr->ns->handle_command ())
2308 return 1; 2284 return true;
2309 2285
2310 if (op->speed_left > 0)
2311 {
2312 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2286 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2313 {
2314 /* All move commands take 1 tick, at least for now */
2315 op->speed_left--;
2316
2317 /* Instead of all the stuff below, let move_player take care
2318 * of it. Also, some of the skill stuff is only put in
2319 * there, as well as the confusion stuff.
2320 */
2321 move_player (op, op->direction); 2287 return move_player (op, op->direction);
2322 2288
2323 return op->speed_left > 0;
2324 }
2325 }
2326
2327 return 0; 2289 return false;
2328} 2290}
2329 2291
2330int 2292int
2331save_life (object *op) 2293save_life (object *op)
2332{ 2294{
2367 * from. 2329 * from.
2368 */ 2330 */
2369void 2331void
2370remove_unpaid_objects (object *op, object *env) 2332remove_unpaid_objects (object *op, object *env)
2371{ 2333{
2372 object *next;
2373
2374 while (op) 2334 while (op)
2375 { 2335 {
2376 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2336 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2377 2337
2378 if (QUERY_FLAG (op, FLAG_UNPAID)) 2338 if (QUERY_FLAG (op, FLAG_UNPAID))
2444 int rate_grace = 2000; 2404 int rate_grace = 2000;
2445 const int max_hp = 1; 2405 const int max_hp = 1;
2446 const int max_sp = 1; 2406 const int max_sp = 1;
2447 const int max_grace = 1; 2407 const int max_grace = 1;
2448 2408
2449 if (op->contr->outputs_sync) 2409 if (op->contr->hidden)
2410 {
2411 op->invisible = 1000;
2412 /* the socket code flashes the player visible/invisible
2413 * depending on the value of invisible, so we need to
2414 * alternate it here for it to work correctly.
2415 */
2416 if (pticks & 2)
2417 op->invisible--;
2450 { 2418 }
2451 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2419 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2452 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2420 {
2453 flush_output_element (op, &op->contr->outputs[i]); 2421 if (!op->invisible--)
2422 {
2423 make_visible (op);
2424 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2425 }
2454 } 2426 }
2455 2427
2456 if (op->contr->ns->state == ST_PLAYING) 2428 if (op->contr->ns->state == ST_PLAYING)
2457 { 2429 {
2458 /* these next three if clauses make it possible to SLOW DOWN 2430 /* these next three if clauses make it possible to SLOW DOWN
2480 gen_grace = op->stats.maxgrace; 2452 gen_grace = op->stats.maxgrace;
2481 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2453 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2482 } 2454 }
2483 2455
2484 /* Regenerate Spell Points */ 2456 /* Regenerate Spell Points */
2485 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0) 2457 if (!op->contr->golem && --op->last_sp < 0)
2486 { 2458 {
2487 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); 2459 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2488 if (op->stats.sp < op->stats.maxsp) 2460 if (op->stats.sp < op->stats.maxsp)
2489 { 2461 {
2490 op->stats.sp++; 2462 op->stats.sp++;
2588 } 2560 }
2589 2561
2590 /* Digestion */ 2562 /* Digestion */
2591 if (--op->last_eat < 0) 2563 if (--op->last_eat < 0)
2592 { 2564 {
2593#ifdef COZY_SERVER
2594 int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2595 int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2596#else
2597 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0; 2565 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2598#endif
2599 2566
2600 if (op->contr->gen_hp > 0) 2567 if (op->contr->gen_hp > 0)
2601 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2568 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2602 else 2569 else
2603 op->last_eat = 25 * (1 + bonus) / (penalty + 1); 2570 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2708 tmp->name = buf; 2675 tmp->name = buf;
2709 sprintf (buf, " This finger has been cut off %s\n" 2676 sprintf (buf, " This finger has been cut off %s\n"
2710 " the %s, when he was defeated at\n level %d by %s.\n", 2677 " the %s, when he was defeated at\n level %d by %s.\n",
2711 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2678 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2712 tmp->msg = buf; 2679 tmp->msg = buf;
2713 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2680 tmp->value = 0, tmp->type = 0;
2714 tmp->materialname = NULL; 2681 tmp->materialname = "organics";
2715 tmp->insert_at (op, tmp); 2682 tmp->insert_at (op, tmp);
2716 } 2683 }
2717 2684
2718 /* teleport defeated player to new destination */ 2685 /* teleport defeated player to new destination */
2719 transfer_ob (op, x, y, 0, NULL); 2686 transfer_ob (op, x, y, 0, NULL);
2915 op->stats.hp = op->stats.maxhp; 2882 op->stats.hp = op->stats.maxhp;
2916 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2883 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2917 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2884 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2918 2885
2919 /* 2886 /*
2920 * Check to see if the player is in a shop. IF so, then check to see if
2921 * the player has any unpaid items. If so, remove them and put them back 2887 * Check to see if the player has any unpaid items. If so, remove them
2922 * in the map. 2888 * and put them back in the map.
2923 */ 2889 */
2924
2925 if (is_in_shop (op))
2926 remove_unpaid_objects (op->inv, op); 2890 remove_unpaid_objects (op->inv, op);
2927 2891
2928 /****************************************/ 2892 /****************************************/
2929 /* */ 2893 /* */
2930 /* Move player to his current respawn- */ 2894 /* Move player to his current respawn- */
2931 /* position (usually last savebed) */ 2895 /* position (usually last savebed) */
2951 object *force; 2915 object *force;
2952 int at; 2916 int at;
2953 2917
2954 force = get_archetype (FORCE_NAME); 2918 force = get_archetype (FORCE_NAME);
2955 /* 50 ticks should be enough time for the spell to abate */ 2919 /* 50 ticks should be enough time for the spell to abate */
2956 force->speed = 0.1; 2920 force->speed = 0.1f;
2957 force->speed_left = -5.0; 2921 force->speed_left = -5.f;
2958 SET_FLAG (force, FLAG_APPLIED); 2922 SET_FLAG (force, FLAG_APPLIED);
2959 for (at = 0; at < NROFATTACKS; at++) 2923 for (at = 0; at < NROFATTACKS; at++)
2960 if (will_kill_again & (1 << at)) 2924 if (will_kill_again & (1 << at))
2961 force->resist[at] = 100; 2925 force->resist[at] = 100;
2962 2926
2971void 2935void
2972loot_object (object *op) 2936loot_object (object *op)
2973{ /* Grab and destroy some treasure */ 2937{ /* Grab and destroy some treasure */
2974 object *tmp, *tmp2, *next; 2938 object *tmp, *tmp2, *next;
2975 2939
2976 if (op->container) 2940 op->close_container (); /* close open sack first */
2977 esrv_apply_container (op, op->container); /* close open sack first */
2978 2941
2979 for (tmp = op->inv; tmp; tmp = next) 2942 for (tmp = op->inv; tmp; tmp = next)
2980 { 2943 {
2981 next = tmp->below; 2944 next = tmp->below;
2982 2945
2983 if (tmp->invisible) 2946 if (tmp->invisible)
2984 continue; 2947 continue;
2985 2948
2986 tmp->remove (); 2949 tmp->remove ();
2987 tmp->x = op->x, tmp->y = op->y; 2950 tmp->x = op->x, tmp->y = op->y;
2951
2988 if (tmp->type == CONTAINER) 2952 if (tmp->type == CONTAINER)
2989 { /* empty container to ground */ 2953 loot_object (tmp); /* empty container to ground */
2990 loot_object (tmp); 2954
2991 }
2992 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2955 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2993 { 2956 {
2994 if (tmp->nrof > 1) 2957 if (tmp->nrof > 1)
2995 { 2958 {
2996 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2959 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
2997 tmp2->destroy (); 2960 tmp2->destroy ();
3008/* 2971/*
3009 * fix_weight(): Check recursively the weight of all players, and fix 2972 * fix_weight(): Check recursively the weight of all players, and fix
3010 * what needs to be fixed. Refresh windows and fix speed if anything 2973 * what needs to be fixed. Refresh windows and fix speed if anything
3011 * was changed. 2974 * was changed.
3012 */ 2975 */
3013
3014void 2976void
3015fix_weight (void) 2977fix_weight (void)
3016{ 2978{
3017 for_all_players (pl) 2979 for_all_players (pl)
3018 { 2980 {
3078 if (op->type == PLAYER) 3040 if (op->type == PLAYER)
3079 { 3041 {
3080 op->contr->tmp_invis = 0; 3042 op->contr->tmp_invis = 0;
3081 op->contr->invis_race = 0; 3043 op->contr->invis_race = 0;
3082 } 3044 }
3045
3083 update_object (op, UP_OBJ_FACE); 3046 update_object (op, UP_OBJ_CHANGE);
3084} 3047}
3085 3048
3086int 3049int
3087is_true_undead (object *op) 3050is_true_undead (object *op)
3088{ 3051{
3089 object *tmp = NULL;
3090
3091 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3052 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3092 return 1; 3053 return 1;
3093 3054
3094 return 0; 3055 return 0;
3095} 3056}
3140/* For Hidden creatures - a chance of becoming 'unhidden' 3101/* For Hidden creatures - a chance of becoming 'unhidden'
3141 * every time they move - as we subtract off 'invisibility' 3102 * every time they move - as we subtract off 'invisibility'
3142 * AND, for players, if they move into a ridiculously unhideable 3103 * AND, for players, if they move into a ridiculously unhideable
3143 * spot (surrounded by clear terrain in broad daylight). -b.t. 3104 * spot (surrounded by clear terrain in broad daylight). -b.t.
3144 */ 3105 */
3145
3146void 3106void
3147do_hidden_move (object *op) 3107do_hidden_move (object *op)
3148{ 3108{
3149 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3109 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3150 object *skop; 3110 object *skop;
3383 char buf[MAX_BUF]; /* tmp. string buffer */ 3343 char buf[MAX_BUF]; /* tmp. string buffer */
3384 int i = 0, j = 0; 3344 int i = 0, j = 0;
3385 3345
3386 /* get the appropriate treasurelist */ 3346 /* get the appropriate treasurelist */
3387 if (atnr == ATNR_FIRE) 3347 if (atnr == ATNR_FIRE)
3388 trlist = find_treasurelist ("dragon_ability_fire"); 3348 trlist = treasurelist::find ("dragon_ability_fire");
3389 else if (atnr == ATNR_COLD) 3349 else if (atnr == ATNR_COLD)
3390 trlist = find_treasurelist ("dragon_ability_cold"); 3350 trlist = treasurelist::find ("dragon_ability_cold");
3391 else if (atnr == ATNR_ELECTRICITY) 3351 else if (atnr == ATNR_ELECTRICITY)
3392 trlist = find_treasurelist ("dragon_ability_elec"); 3352 trlist = treasurelist::find ("dragon_ability_elec");
3393 else if (atnr == ATNR_POISON) 3353 else if (atnr == ATNR_POISON)
3394 trlist = find_treasurelist ("dragon_ability_poison"); 3354 trlist = treasurelist::find ("dragon_ability_poison");
3395 3355
3396 if (trlist == NULL || who->type != PLAYER) 3356 if (trlist == NULL || who->type != PLAYER)
3397 return; 3357 return;
3398 3358
3399 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3359 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3531 * not readied. 3491 * not readied.
3532 */ 3492 */
3533void 3493void
3534player_unready_range_ob (player *pl, object *ob) 3494player_unready_range_ob (player *pl, object *ob)
3535{ 3495{
3536 rangetype i; 3496 if (pl->ob->current_weapon == ob)
3497 pl->ob->current_weapon = 0;
3537 3498
3538 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3499 if (pl->combat_ob == ob)
3539 { 3500 pl->combat_ob = 0;
3501
3540 if (pl->ranges[i] == ob) 3502 if (pl->ranged_ob == ob)
3541 { 3503 pl->ranged_ob = 0;
3542 pl->ranges[i] = NULL;
3543 if (pl->shoottype == i)
3544 {
3545 pl->shoottype = range_none;
3546 }
3547 }
3548 }
3549} 3504}
3505
3506sint8
3507player::visibility_at (maptile *map, int x, int y) const
3508{
3509 if (!ns)
3510 return 0;
3511
3512 int dx, dy;
3513 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3514 return 0;
3515
3516 x += dx - ns->current_x + ns->mapx / 2;
3517 y += dy - ns->current_y + ns->mapy / 2;
3518
3519 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3520 return 0;
3521
3522 return 100 - blocked_los [x][y];
3523}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines