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.102 by root, Wed Feb 7 02:04:47 2007 UTC vs.
Revision 1.133 by root, Sat May 12 22:04:20 2007 UTC

… …
21 * 21 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <pwd.h>
27#include <sproto.h> 26#include <sproto.h>
28#include <sounds.h> 27#include <sounds.h>
29#include <living.h> 28#include <living.h>
30#include <object.h> 29#include <object.h>
31#include <spells.h> 30#include <spells.h>
… …
116 115
117 news[0] = '\0'; 116 news[0] = '\0';
118 subject[0] = '\0'; 117 subject[0] = '\0';
119 size = 0; 118 size = 0;
120 119
121 while (fgets (buf, MAX_BUF, fp) != NULL) 120 while (fgets (buf, MAX_BUF, fp))
122 { 121 {
123 if (*buf == '#') 122 if (*buf == '#')
124 continue; 123 continue;
125 124
126 if (*buf == '%') 125 if (*buf == '%')
127 { /* send one news */ 126 { /* send one news */
128 if (size > 0) 127 if (size > 0)
129 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /*send previously read news */ 128 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news); /*send previously read news */
130 129
131 strcpy (subject, buf + 1); 130 strcpy (subject, buf + 1);
132 strip_endline (subject); 131 strip_endline (subject);
133 size = 0; 132 size = 0;
134 news[0] = '\0'; 133 news[0] = '\0';
… …
144 size += strlen (buf); 143 size += strlen (buf);
145 } 144 }
146 } 145 }
147 146
148 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 147 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
149 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news); 148 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
150 close_and_delete (fp, comp); 149 close_and_delete (fp, comp);
151} 150}
152 151
153/* This loads the first map an puts the player on it. */ 152/* This loads the first map an puts the player on it. */
154static void 153static void
… …
194 return; 193 return;
195 194
196 terminate_all_pets (ob); 195 terminate_all_pets (ob);
197 remove_friendly_object (ob); 196 remove_friendly_object (ob);
198 ob->deactivate_recursive (); 197 ob->deactivate_recursive ();
198
199 if (ob->map)
199 maplevel = ob->map->path; 200 maplevel = ob->map->path;
201
200 ob->remove (); 202 ob->remove ();
201 ob->map = 0; 203 ob->map = 0;
204 party = 0;
202 205
203 // for weird reasons, this is often "ob", keeping a circular reference 206 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
204 ranges [range_skill] = 0;
205 207
206 players.erase (this); 208 players.erase (this);
207} 209}
208 210
209// connect the player with a specific client 211// connect the player with a specific client
210// also changed, rationalises, and fixes some incorrect settings 212// also changes, rationalises, and fixes some incorrect settings
211void 213void
212player::connect (client *ns) 214player::connect (client *ns)
213{ 215{
214 this->ns = ns; 216 this->ns = ns;
215 ns->pl = this; 217 ns->pl = this;
216 218
217 run_on = 0; 219 run_on = 0;
218 fire_on = 0; 220 fire_on = 0;
219 ob->container = 0; //TODO: client-specific 221 ob->close_container (); //TODO: client-specific
220 222
221 ns->update_look = 0; 223 ns->update_look = 0;
222 ns->look_position = 0; 224 ns->look_position = 0;
223 225
224 clear_los (ob); 226 clear_los (ob);
… …
227 229
228 /* make sure he's a player -- needed because of class change. */ 230 /* make sure he's a player -- needed because of class change. */
229 ob->type = PLAYER; // we are paranoid 231 ob->type = PLAYER; // we are paranoid
230 ob->race = ob->arch->clone.race; 232 ob->race = ob->arch->clone.race;
231 233
232 if (!legal_range (ob, shoottype))
233 shoottype = range_none;
234
235 ob->carrying = sum_weight (ob); 234 ob->carrying = sum_weight (ob);
236 link_player_skills (ob); 235 link_player_skills (ob);
237 236
238 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 237 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
239 238
240 assign (title, ob->arch->clone.name); 239 assign (title, ob->arch->clone.name);
241
242 /* can_use_shield is a new flag. However, the can_use.. seems to largely come
243 * from the class, and not race. I don't see any way to get the class information
244 * to then update this. I don't think this will actually break anything - anyone
245 * that can use armour should be able to use a shield. What this may 'break'
246 * are features new characters get, eg, if someone starts up with a Q, they
247 * should be able to use a shield. However, old Q's won't get that advantage.
248 */
249 if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
250 SET_FLAG (ob, FLAG_USE_SHIELD);
251 240
252 /* if it's a dragon player, set the correct title here */ 241 /* if it's a dragon player, set the correct title here */
253 if (is_dragon_pl (ob)) 242 if (is_dragon_pl (ob))
254 { 243 {
255 object *tmp, *abil = 0, *skin = 0; 244 object *tmp, *abil = 0, *skin = 0;
… …
269 258
270 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 259 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
271 260
272 esrv_new_player (this, ob->weight + ob->carrying); 261 esrv_new_player (this, ob->weight + ob->carrying);
273 262
263 for (object *op = ob->inv; op; op = op->below)
264 if (op->flag [FLAG_APPLIED])
265 switch (op->type)
266 {
267 case WAND:
268 case ROD:
269 case HORN:
270 case BOW:
271 case SKILL:
272 case SKILL_TOOL:
273 case WEAPON:
274 apply_special (ob, op, AP_UNAPPLY);
275 apply_special (ob, op, AP_APPLY);
276 break;
277 }
278
274 ob->update_stats (); 279 ob->update_stats ();
275 ns->floorbox_update (); 280 ns->floorbox_update ();
276 281
277 esrv_send_inventory (ob, ob); 282 esrv_send_inventory (ob, ob);
278 esrv_add_spells (this, 0); 283 esrv_add_spells (this, 0);
… …
297 302
298 INVOKE_PLAYER (DISCONNECT, this); 303 INVOKE_PLAYER (DISCONNECT, this);
299 304
300 ns->reset_stats (); 305 ns->reset_stats ();
301 ns->pl = 0; 306 ns->pl = 0;
302 this->ns = 0; 307 ns = 0;
303 } 308 }
304 309
310 if (ob)
305 ob->container = 0; //TODO: client-specific 311 ob->close_container (); //TODO: client-specific
312
306 deactivate (); 313 deactivate ();
307} 314}
308 315
309// the need for this function can be explained 316// the need for this function can be explained
310// by load_object not returning the object 317// by load_object not returning the object
311void 318void
312player::set_object (object *op) 319player::set_object (object *op)
313{ 320{
314 ob = op; 321 ob = op;
315 ob->contr = this; /* this aren't yet in archetype */ 322 ob->contr = this; /* this aren't yet in archetype */
316 323
317 ob->speed_left = 0.5; 324 ob->speed_left = 0.5f;
318 ob->speed = 1.0; 325 ob->speed = 1.0f;
319 ob->direction = 5; /* So player faces south */ 326 ob->direction = 5; /* So player faces south */
320 ob->stats.wc = 2;
321 ob->run_away = 25; /* Then we panick... */
322
323 ob->roll_stats ();
324} 327}
325 328
326player::player () 329player::player ()
327{ 330{
328 /* There are some elements we want initialised to non zero value - 331 /* There are some elements we want initialised to non zero value -
329 * we deal with that below this point. 332 * we deal with that below this point.
330 */ 333 */
331 outputs_sync = 16; /* Every 2 seconds */ 334 outputs_sync = 4;
332 outputs_count = 8; /* Keeps present behaviour */ 335 outputs_count = 4;
333 unapply = unapply_nochoice; 336 unapply = unapply_nochoice;
334 337
335 savebed_map = first_map_path; /* Init. respawn position */ 338 savebed_map = first_map_path; /* Init. respawn position */
336 339
337 gen_sp_armour = 10; 340 gen_sp_armour = 10;
338 shoottype = range_none;
339 bowtype = bow_normal; 341 bowtype = bow_normal;
340 petmode = pet_normal; 342 petmode = pet_normal;
341 listening = 10; 343 listening = 10;
342 usekeys = containers; 344 usekeys = containers;
343 peaceful = 1; /* default peaceful */ 345 peaceful = 1; /* default peaceful */
… …
372player::create () 374player::create ()
373{ 375{
374 player *pl = new player; 376 player *pl = new player;
375 377
376 pl->set_object (arch_to_object (get_player_archetype (0))); 378 pl->set_object (arch_to_object (get_player_archetype (0)));
379
380 pl->ob->roll_stats ();
381 pl->ob->stats.wc = 2;
382 pl->ob->run_away = 25; /* Then we panick... */
383
377 set_first_map (pl->ob); 384 set_first_map (pl->ob);
378 385
379 return pl; 386 return pl;
380} 387}
381 388
… …
777} 784}
778 785
779void 786void
780object::roll_stats () 787object::roll_stats ()
781{ 788{
782 int statsort [7]; 789 int statsort [NUM_STATS];
783 790
784 for (;;) 791 for (;;)
785 { 792 {
786 int sum = 0; 793 int sum = 0;
787 for (int i = 7; i--; ) 794 for (int i = NUM_STATS; i--; )
788 sum += statsort [i] = roll_stat (); 795 sum += statsort [i] = roll_stat ();
789 796
790 if (sum >= 82 && sum <= 116) 797 if (sum >= 82 && sum <= 116)
791 break; 798 break;
792 } 799 }
793 800
794 // Sort the stats so that rerolling is easier... 801 // Sort the stats so that rerolling is easier...
795 std::sort (statsort, statsort + 7, std::greater<int>()); 802 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
796 803
804 for (int i = 0; i < NUM_STATS; ++i)
797 stats.Str = statsort[0]; 805 stats.stat (i) = statsort [i];
798 stats.Dex = statsort[1];
799 stats.Con = statsort[2];
800 stats.Int = statsort[3];
801 stats.Wis = statsort[4];
802 stats.Pow = statsort[5];
803 stats.Cha = statsort[6];
804 806
805 stats.exp = 0; 807 stats.exp = 0;
806 stats.ac = 0; 808 stats.ac = 0;
807 809
808 stats.hp = stats.maxhp; 810 stats.hp = stats.maxhp;
… …
820} 822}
821 823
822void 824void
823object::swap_stats (int a, int b) 825object::swap_stats (int a, int b)
824{ 826{
825 int tmp = get_attr_value (&contr->orig_stats, a); 827 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
826 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
827 set_attr_value (&contr->orig_stats, b, tmp);
828 828
829 for (int i = 0; i < NUM_STATS; ++i)
829 stats.Str = contr->orig_stats.Str; 830 stats.stat (i) = contr->orig_stats.stat (i);
830 stats.Dex = contr->orig_stats.Dex;
831 stats.Con = contr->orig_stats.Con;
832 stats.Int = contr->orig_stats.Int;
833 stats.Wis = contr->orig_stats.Wis;
834 stats.Pow = contr->orig_stats.Pow;
835 stats.Cha = contr->orig_stats.Cha;
836 831
837 //TODO: the following code looks so borked and should, at the very least, 832 //TODO: the following code looks so borked and should, at the very least,
838 // be merged with the similar code in roll_stats 833 // be merged with the similar code in roll_stats
839 stats.ac = 0; 834 stats.ac = 0;
840 835
… …
871 * appropriate action with it (change race, or other things). 866 * appropriate action with it (change race, or other things).
872 * The function name is for historical reasons - now we have 867 * The function name is for historical reasons - now we have
873 * separate race and class; this actually changes the RACE, 868 * separate race and class; this actually changes the RACE,
874 * not the class. 869 * not the class.
875 */ 870 */
876int 871void
877key_change_class (object *op, char key) 872player::chargen_race_done ()
878{ 873{
879 int tmp_loop;
880
881 if (key == 'd' || key == 'D')
882 {
883 char buf[MAX_BUF];
884
885 /* this must before then initial items are given */ 874 /* this must before then initial items are given */
886 esrv_new_player (op->contr, op->weight + op->carrying); 875 esrv_new_player (ob->contr, ob->weight + ob->carrying);
887 876
888 treasurelist *tl = find_treasurelist ("starting_wealth"); 877 treasurelist *tl = treasurelist::find ("starting_wealth");
889 if (tl) 878 if (tl)
890 create_treasure (tl, op, 0, 0, 0); 879 create_treasure (tl, ob, 0, 0, 0);
891 880
892 INVOKE_PLAYER (BIRTH, op->contr); 881 INVOKE_PLAYER (BIRTH, ob->contr);
893 INVOKE_PLAYER (LOGIN, op->contr); 882 INVOKE_PLAYER (LOGIN, ob->contr);
894 883
895 op->contr->ns->state = ST_PLAYING; 884 ob->contr->ns->state = ST_PLAYING;
896 885
897 if (op->msg) 886 if (ob->msg)
898 op->msg = NULL; 887 ob->msg = 0;
899 888
900 /* We create this now because some of the unique maps will need it 889 /* We create this now because some of the unique maps will need it
901 * to save here. 890 * to save here.
902 */ 891 */
892 {
893 char buf[MAX_BUF];
903 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 894 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
904 make_path_to_file (buf); 895 make_path_to_file (buf);
896 }
905 897
906 start_info (op); 898 start_info (ob);
907 CLEAR_FLAG (op, FLAG_WIZ); 899 CLEAR_FLAG (ob, FLAG_WIZ);
908 give_initial_items (op, op->randomitems); 900 give_initial_items (ob, ob->randomitems);
909 link_player_skills (op); 901 link_player_skills (ob);
910 esrv_send_inventory (op, op); 902 esrv_send_inventory (ob, ob);
911 op->update_stats (); 903 ob->update_stats ();
912 904
913 /* This moves the player to a different start map, if there 905 /* This moves the player to a different start map, if there
914 * is one for this race 906 * is one for this race
915 */ 907 */
916 if (*first_map_ext_path) 908 if (*first_map_ext_path)
917 { 909 {
918 object *tmp; 910 object *tmp;
919 char mapname[MAX_BUF]; 911 char mapname[MAX_BUF];
920 912
921 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name); 913 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
922 tmp = object::create (); 914 tmp = object::create ();
923 EXIT_PATH (tmp) = mapname; 915 EXIT_PATH (tmp) = mapname;
924 EXIT_X (tmp) = op->x; 916 EXIT_X (tmp) = ob->x;
925 EXIT_Y (tmp) = op->y; 917 EXIT_Y (tmp) = ob->y;
926 op->enter_exit (tmp); /* we don't really care if it succeeded; 918 ob->enter_exit (tmp); /* we don't really care if it succeeded;
927 * if the map isn't there, then stay on the 919 * if the map isn't there, then stay on the
928 * default initial map */ 920 * default initial map */
929 tmp->destroy (); 921 tmp->destroy ();
930 } 922 }
931 else 923 else
932 LOG (llevDebug, "first_map_ext_path not set\n"); 924 LOG (llevDebug, "first_map_ext_path not set\n");
925}
933 926
934 return 0; 927void
935 } 928player::chargen_race_next ()
936 929{
937 /* Following actually changes the race - this is the default command 930 /* Following actually changes the race - this is the default command
938 * if we don't match with one of the options above. 931 * if we don't match with one of the options above.
939 */ 932 */
940 933
941 tmp_loop = 0; 934 do
942 while (!tmp_loop)
943 { 935 {
944 shstr name = op->name; 936 shstr name = ob->name;
945 int x = op->x, y = op->y; 937 int x = ob->x, y = ob->y;
946 938
947 op->remove_statbonus (); 939 ob->remove_statbonus ();
948 op->remove (); 940 ob->remove ();
949 op->arch = get_player_archetype (op->arch); 941 ob->arch = get_player_archetype (ob->arch);
950 op->arch->clone.copy_to (op); 942 ob->arch->clone.copy_to (ob);
951 op->instantiate (); 943 ob->instantiate ();
952 op->stats = op->contr->orig_stats; 944 ob->stats = ob->contr->orig_stats;
953 op->name = op->name_pl = name; 945 ob->name = ob->name_pl = name;
954 op->x = x; 946 ob->x = x;
955 op->y = y; 947 ob->y = y;
956 SET_ANIMATION (op, 2); /* So player faces south */ 948 SET_ANIMATION (ob, 2); /* So player faces south */
957 insert_ob_in_map (op, op->map, op, 0); 949 insert_ob_in_map (ob, ob->map, ob, 0);
958 assign (op->contr->title, op->arch->clone.name); 950 assign (ob->contr->title, ob->arch->clone.name);
959 op->add_statbonus (); 951 ob->add_statbonus ();
960 tmp_loop = allowed_class (op);
961 } 952 }
953 while (!allowed_class (ob));
962 954
963 update_object (op, UP_OBJ_FACE); 955 update_object (ob, UP_OBJ_FACE);
964 esrv_update_item (UPD_FACE, op, op); 956 esrv_update_item (UPD_FACE, ob, ob);
965 op->update_stats (); 957 ob->update_stats ();
966 op->stats.hp = op->stats.maxhp; 958 ob->stats.hp = ob->stats.maxhp;
967 op->stats.sp = op->stats.maxsp; 959 ob->stats.sp = ob->stats.maxsp;
968 op->stats.grace = 0; 960 ob->stats.grace = 0;
969
970 if (op->msg)
971 new_draw_info (NDI_BLUE, 0, op, op->msg);
972
973 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
974 return 0;
975} 961}
976 962
977void 963void
978flee_player (object *op) 964flee_player (object *op)
979{ 965{
… …
1026 /* Cornered, get rid of scared */ 1012 /* Cornered, get rid of scared */
1027 CLEAR_FLAG (op, FLAG_SCARED); 1013 CLEAR_FLAG (op, FLAG_SCARED);
1028 op->enemy = NULL; 1014 op->enemy = NULL;
1029} 1015}
1030 1016
1031
1032/* check_pick sees if there is stuff to be picked up/picks up stuff. 1017/* check_pick sees if there is stuff to be picked up/picks up stuff.
1033 * IT returns 1 if the player should keep on moving, 0 if he should 1018 * It returns 1 if the player should keep on moving, 0 if he should
1034 * stop. 1019 * stop.
1035 */ 1020 */
1036int 1021int
1037check_pick (object *op) 1022check_pick (object *op)
1038{ 1023{
1039 object *tmp, *next; 1024 object *tmp, *next;
1040 int stop = 0; 1025 int stop = 0;
1041 int j, k, wvratio; 1026 int wvratio;
1042 char putstring[128], tmpstr[16]; 1027 char putstring[128];
1043 1028
1044 /* if you're flying, you cna't pick up anything */ 1029 /* if you're flying, you cna't pick up anything */
1045 if (op->move_type & MOVE_FLYING) 1030 if (op->move_type & MOVE_FLYING)
1046 return 1; 1031 return 1;
1047 1032
… …
1384 * found object is returned. 1369 * found object is returned.
1385 */ 1370 */
1386object * 1371object *
1387find_arrow (object *op, const char *type) 1372find_arrow (object *op, const char *type)
1388{ 1373{
1389 object *tmp = NULL; 1374 object *tmp = 0;
1390 1375
1391 for (op = op->inv; op; op = op->below) 1376 for (op = op->inv; op; op = op->below)
1392 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1377 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1393 tmp = find_arrow (op, type); 1378 tmp = find_arrow (op, type);
1394 else if (op->type == ARROW && op->race == type) 1379 else if (op->type == ARROW && op->race == type)
1395 return op; 1380 return op;
1381
1396 return tmp; 1382 return tmp;
1397} 1383}
1398 1384
1399/* 1385/*
1400 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1386 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1401 * against the target. A full test is not performed, simply a basic test 1387 * against the target. A full test is not performed, simply a basic test
1402 * of resistances. The archer is making a quick guess at what he sees down 1388 * of resistances. The archer is making a quick guess at what he sees down
1403 * the hall. Failing that it does it's best to pick the highest plus arrow. 1389 * the hall. Failing that it does it's best to pick the highest plus arrow.
1404 */ 1390 */
1405
1406object * 1391object *
1407find_better_arrow (object *op, object *target, const char *type, int *better) 1392find_better_arrow (object *op, object *target, const char *type, int *better)
1408{ 1393{
1409 object *tmp = NULL, *arrow, *ntmp; 1394 object *tmp = NULL, *arrow, *ntmp;
1410 int attacknum, attacktype, betterby = 0, i; 1395 int attacknum, attacktype, betterby = 0, i;
… …
1476 * find_better_arrow to find a decent arrow to use. 1461 * find_better_arrow to find a decent arrow to use.
1477 * op = the shooter 1462 * op = the shooter
1478 * type = bow->race 1463 * type = bow->race
1479 * dir = fire direction 1464 * dir = fire direction
1480 */ 1465 */
1481
1482object * 1466object *
1483pick_arrow_target (object *op, const char *type, int dir) 1467pick_arrow_target (object *op, const char *type, int dir)
1484{ 1468{
1485 object *tmp = NULL; 1469 object *tmp = NULL;
1486 maptile *m; 1470 maptile *m;
… …
1551 */ 1535 */
1552int 1536int
1553fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) 1537fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1554{ 1538{
1555 object *left, *bow; 1539 object *left, *bow;
1556 int bowspeed, mflags; 1540 int mflags;
1557 maptile *m; 1541 maptile *m;
1558 1542
1559 if (!dir) 1543 if (!dir)
1560 { 1544 {
1561 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1545 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1562 return 0; 1546 return 0;
1563 } 1547 }
1564 1548
1565 if (op->type == PLAYER) 1549 if (player *pl = op->contr)
1566 bow = op->contr->ranges[range_bow]; 1550 {
1551 bow = pl->ranged_ob;
1552 if (!op->change_weapon (bow))
1553 return 0;
1554 }
1567 else 1555 else
1568 { 1556 {
1569 for (bow = op->inv; bow; bow = bow->below) 1557 for (bow = op->inv; bow; bow = bow->below)
1570 /* Don't check for applied - monsters don't apply bows - in that way, they 1558 /* Don't check for applied - monsters don't apply bows - in that way, they
1571 * don't need to switch back and forth between bows and weapons. 1559 * don't need to switch back and forth between bows and weapons.
… …
1576 if (!bow) 1564 if (!bow)
1577 { 1565 {
1578 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1566 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1579 return 0; 1567 return 0;
1580 } 1568 }
1569
1570 // optimisation: move object to top so we will find it quickly again
1571 if (bow->below)
1572 {
1573 bow->remove ();
1574 op->insert (bow);
1575 }
1576
1581 } 1577 }
1582 1578
1583 if (!bow->race || !bow->skill) 1579 if (!bow->race || !bow->skill)
1584 { 1580 {
1585 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1581 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1586 return 0; 1582 return 0;
1587 } 1583 }
1588
1589 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1590
1591 /* penalize ROF for bestarrow */
1592 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1593 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1594
1595 if (bowspeed < 1)
1596 bowspeed = 1;
1597 1584
1598 if (arrow == NULL) 1585 if (arrow == NULL)
1599 { 1586 {
1600 if ((arrow = find_arrow (op, bow->race)) == NULL) 1587 if ((arrow = find_arrow (op, bow->race)) == NULL)
1601 { 1588 {
1602 if (op->type == PLAYER) 1589 if (op->type == PLAYER)
1603 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1590 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1604 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1591 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1605 else 1592 else
1606 CLEAR_FLAG (op, FLAG_READY_BOW); 1593 CLEAR_FLAG (op, FLAG_READY_BOW);
1594
1607 return 0; 1595 return 0;
1608 } 1596 }
1609 } 1597 }
1610 1598
1611 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1599 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
… …
1635 1623
1636 arrow->set_owner (op); 1624 arrow->set_owner (op);
1637 arrow->skill = bow->skill; 1625 arrow->skill = bow->skill;
1638 arrow->direction = dir; 1626 arrow->direction = dir;
1639 1627
1628 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1629 arrow->stats.hp = arrow->stats.dam;
1630 arrow->stats.grace = arrow->attacktype;
1631
1632 if (arrow->slaying)
1633 arrow->spellarg = strdup (arrow->slaying);
1634
1635 if (player *pl = op->contr)
1636 {
1637 pl->has_hit = 1;
1638#if 0
1639 float speed = pl->weapon_sp;
1640
1641 /* penalize ROF for bestarrow */
1642 if (pl->bowtype == bow_bestarrow)
1643 speed *= .9f;
1644 else
1645 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1646
1647 op->speed_left += speed - op->speed;
1648#endif
1649 }
1650
1651 SET_ANIMATION (arrow, arrow->direction);
1652
1653 /* update the speed */
1654 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0
1655 + bow->stats.dam / 7.0;
1656
1657 arrow->set_speed (max (arrow->speed, 2.0));
1658 arrow->speed_left = 0;
1659
1660 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1661
1640 if (op->type == PLAYER) 1662 if (op->type == PLAYER)
1641 { 1663 {
1642 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1643 op->update_stats ();
1644 }
1645
1646 SET_ANIMATION (arrow, arrow->direction);
1647 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1648 arrow->stats.hp = arrow->stats.dam;
1649 arrow->stats.grace = arrow->attacktype;
1650 if (arrow->slaying != NULL)
1651 arrow->spellarg = strdup (arrow->slaying);
1652
1653 /* Note that this was different for monsters - they got their level
1654 * added to the damage. I think the strength bonus is more proper.
1655 */
1656
1657 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1658
1659 /* update the speed */
1660 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1661 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1662
1663 arrow->set_speed (max (arrow->speed, 1.0));
1664 arrow->speed_left = 0;
1665
1666 if (op->type == PLAYER)
1667 {
1668 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1669 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1670 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1671
1672 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1664 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1665 wc -= dex_bonus[op->stats.Dex];
1666
1667 if (!arrow->slaying)
1668 arrow->slaying = op->slaying;
1669
1670 arrow->attacktype |= op->attacktype;
1673 } 1671 }
1674 else 1672 else
1675 { 1673 {
1676 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1677 arrow->level = op->level; 1674 arrow->level = op->level;
1678 } 1675 arrow->stats.wc -= bow->magic;
1679 1676
1680 if (arrow->attacktype == AT_PHYSICAL) 1677 if (!arrow->slaying)
1678 arrow->slaying = bow->slaying;
1679
1681 arrow->attacktype |= bow->attacktype; 1680 arrow->attacktype |= bow->attacktype;
1681 }
1682 1682
1683 if (bow->slaying) 1683 wc -= arrow->level;
1684 arrow->slaying = bow->slaying; 1684 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1685 1685
1686 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1686 arrow->move_type = MOVE_FLY_LOW; 1687 arrow->move_type = MOVE_FLY_LOW;
1687 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1688 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1688 1689
1689 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1690 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1690 m->insert (arrow, sx, sy, op); 1691 m->insert (arrow, sx, sy, op);
… …
1715{ 1716{
1716 int ret = 0, wcmod = 0; 1717 int ret = 0, wcmod = 0;
1717 1718
1718 if (op->contr->bowtype == bow_bestarrow) 1719 if (op->contr->bowtype == bow_bestarrow)
1719 { 1720 {
1720 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1721 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1721 } 1722 }
1722 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1723 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1723 { 1724 {
1724 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1725 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1725 wcmod = -1; 1726 wcmod = -1;
… …
1735 else if (op->contr->bowtype == bow_spreadshot) 1736 else if (op->contr->bowtype == bow_spreadshot)
1736 { 1737 {
1737 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1738 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1738 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1739 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1739 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);
1740
1741 } 1741 }
1742 else 1742 else
1743 { 1743 {
1744 /* Simple case */ 1744 /* Simple case */
1745 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1745 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1746 } 1746 }
1747
1747 return ret; 1748 return ret;
1748} 1749}
1749 1750
1750 1751
1751/* Fires a misc (wand/rod/horn) object in 'dir'. 1752/* Fires a misc (wand/rod/horn) object in 'dir'.
1752 * Broken apart from 'fire' to keep it more readable. 1753 * Broken apart from 'fire' to keep it more readable.
1753 */ 1754 */
1754void 1755void
1755fire_misc_object (object *op, int dir) 1756fire_misc_object (object *op, int dir)
1756{ 1757{
1757 object *item; 1758 object *item = op->contr->ranged_ob;
1758 1759
1759 if (!op->contr->ranges[range_misc]) 1760 if (!item)
1760 { 1761 {
1761 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1762 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1762 return; 1763 return;
1763 } 1764 }
1764 1765
1765 item = op->contr->ranges[range_misc];
1766 if (!item->inv) 1766 if (!item->inv)
1767 { 1767 {
1768 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1768 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1769 return; 1769 return;
1770 } 1770 }
1771
1772 if (!op->change_weapon (item))
1773 return;
1774
1771 if (item->type == WAND) 1775 if (item->type == WAND)
1772 { 1776 {
1773 if (item->stats.food <= 0) 1777 if (item->stats.food <= 0)
1774 { 1778 {
1775 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1779 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1776 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1780 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1781
1777 return; 1782 return;
1778 } 1783 }
1779 } 1784 }
1780 else if (item->type == ROD || item->type == HORN) 1785 else if (item->type == ROD || item->type == HORN)
1781 { 1786 {
1782 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1787 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1783 { 1788 {
1784 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1789 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1790
1785 if (item->type == ROD) 1791 if (item->type == ROD)
1786 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1792 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1787 else 1793 else
1788 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1794 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1795
1789 return; 1796 return;
1790 } 1797 }
1791 } 1798 }
1792 1799
1793 if (cast_spell (op, item, dir, item->inv, NULL)) 1800 if (cast_spell (op, item, dir, item->inv, NULL))
… …
1824 1831
1825 /* check for loss of invisiblity/hide */ 1832 /* check for loss of invisiblity/hide */
1826 if (action_makes_visible (op)) 1833 if (action_makes_visible (op))
1827 make_visible (op); 1834 make_visible (op);
1828 1835
1829 switch (op->contr->shoottype) 1836 player *pl = op->contr;
1837
1838 if (pl->golem)
1830 { 1839 {
1831 case range_none: 1840 control_golem (op->contr->golem, dir);
1832 return; 1841 return;
1842 }
1833 1843
1834 case range_bow: 1844 object *ob = pl->ranged_ob;
1845
1846 if (!ob)
1847 return;
1848
1849 switch (ob->type)
1850 {
1851 case BOW:
1835 player_fire_bow (op, dir); 1852 player_fire_bow (op, dir);
1836 return; 1853 break;
1837 1854
1838 case range_magic: /* Casting spells */ 1855 case SPELL:
1839 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1856 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1840 return; 1857 break;
1841 1858
1842 case range_misc: 1859 case BUILDER:
1860 apply_map_builder (op, dir);
1861 break;
1862
1863 case SKILL:
1864 case SKILL_TOOL:
1865 do_skill (op, op, ob, dir, 0);
1866 break;
1867
1868 default:
1843 fire_misc_object (op, dir); 1869 fire_misc_object (op, dir);
1844 return; 1870 break;
1845
1846 case range_golem: /* Control summoned monsters from scrolls */
1847 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1848 {
1849 op->contr->ranges[range_golem] = 0;
1850 op->contr->shoottype = range_none;
1851 }
1852 else
1853 control_golem (op->contr->ranges[range_golem], dir);
1854 return;
1855
1856 case range_skill:
1857 if (!op->chosen_skill)
1858 {
1859 if (op->type == PLAYER)
1860 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1861 return;
1862 }
1863
1864 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 } 1871 }
1873} 1872}
1874
1875
1876 1873
1877/* find_key 1874/* find_key
1878 * We try to find a key for the door as passed. If we find a key 1875 * We try to find a key for the door as passed. If we find a key
1879 * and successfully use it, we return the key, otherwise NULL 1876 * and successfully use it, we return the key, otherwise NULL
1880 * This function merges both normal and locked door, since the logic 1877 * This function merges both normal and locked door, since the logic
… …
1882 * pl is the player, 1879 * pl is the player,
1883 * inv is the objects inventory to searched 1880 * inv is the objects inventory to searched
1884 * door is the door we are trying to match against. 1881 * door is the door we are trying to match against.
1885 * This function can be called recursively to search containers. 1882 * This function can be called recursively to search containers.
1886 */ 1883 */
1887
1888object * 1884object *
1889find_key (object *pl, object *container, object *door) 1885find_key (object *pl, object *container, object *door)
1890{ 1886{
1891 object *tmp, *key; 1887 object *tmp, *key;
1892 1888
1893 /* Should not happen, but sanity checking is never bad */ 1889 /* Should not happen, but sanity checking is never bad */
1894 if (container->inv == NULL) 1890 if (!container->inv)
1895 return NULL; 1891 return 0;
1896 1892
1897 /* First, lets try to find a key in the top level inventory */ 1893 /* First, lets try to find a key in the top level inventory */
1898 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1894 for (tmp = container->inv; tmp; tmp = tmp->below)
1899 { 1895 {
1900 if (door->type == DOOR && tmp->type == KEY) 1896 if (door->type == DOOR && tmp->type == KEY)
1901 break; 1897 break;
1902 /* For sanity, we should really check door type, but other stuff 1898 /* For sanity, we should really check door type, but other stuff
1903 * (like containers) can be locked with special keys 1899 * (like containers) can be locked with special keys
1904 */ 1900 */
1905 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1901 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1906 break; 1902 break;
1907 } 1903 }
1904
1908 /* No key found - lets search inventories now */ 1905 /* No key found - lets search inventories now */
1909 /* If we find and use a key in an inventory, return at that time. 1906 /* If we find and use a key in an inventory, return at that time.
1910 * otherwise, if we search all the inventories and still don't find 1907 * otherwise, if we search all the inventories and still don't find
1911 * a key, return 1908 * a key, return
1912 */ 1909 */
1913 if (!tmp) 1910 if (!tmp)
1914 { 1911 {
1915 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1912 for (tmp = container->inv; tmp; tmp = tmp->below)
1916 { 1913 {
1917 /* No reason to search empty containers */ 1914 /* No reason to search empty containers */
1918 if (tmp->type == CONTAINER && tmp->inv) 1915 if (tmp->type == CONTAINER && tmp->inv)
1919 { 1916 {
1920 if ((key = find_key (pl, tmp, door)) != NULL) 1917 if ((key = find_key (pl, tmp, door)))
1921 return key; 1918 return key;
1922 } 1919 }
1923 } 1920 }
1921
1924 if (!tmp) 1922 if (!tmp)
1925 return NULL; 1923 return NULL;
1926 } 1924 }
1925
1927 /* We get down here if we have found a key. Now if its in a container, 1926 /* We get down here if we have found a key. Now if its in a container,
1928 * see if we actually want to use it 1927 * see if we actually want to use it
1929 */ 1928 */
1930 if (pl != container) 1929 if (pl != container)
1931 { 1930 {
… …
1952 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1951 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)); 1952 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1954 return NULL; 1953 return NULL;
1955 } 1954 }
1956 } 1955 }
1956
1957 return tmp; 1957 return tmp;
1958} 1958}
1959 1959
1960/* moved door processing out of move_player_attack. 1960/* moved door processing out of move_player_attack.
1961 * returns 1 if player has opened the door with a key 1961 * returns 1 if player has opened the door with a key
… …
1975 if (key) 1975 if (key)
1976 { 1976 {
1977 object *container = key->env; 1977 object *container = key->env;
1978 1978
1979 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1979 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1980
1980 if (action_makes_visible (op)) 1981 if (action_makes_visible (op))
1981 make_visible (op); 1982 make_visible (op);
1983
1982 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1984 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1983 spring_trap (door->inv, op); 1985 spring_trap (door->inv, op);
1986
1984 if (door->type == DOOR) 1987 if (door->type == DOOR)
1985 {
1986 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1988 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1987 }
1988 else if (door->type == LOCKED_DOOR) 1989 else if (door->type == LOCKED_DOOR)
1989 { 1990 {
1990 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1991 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
1991 remove_door2 (door); /* remove door without violence ;-) */ 1992 remove_door2 (door); /* remove door without violence ;-) */
1992 } 1993 }
1994
1993 /* Do this after we print the message */ 1995 /* Do this after we print the message */
1994 decrease_ob (key); /* Use up one of the keys */ 1996 decrease_ob (key); /* Use up one of the keys */
1995 /* Need to update the weight the container the key was in */ 1997 /* Need to update the weight the container the key was in */
1996 if (container != op) 1998 if (container != op)
1997 esrv_update_item (UPD_WEIGHT, op, container); 1999 esrv_update_item (UPD_WEIGHT, op, container);
2000
1998 return 1; /* Nothing more to do below */ 2001 return 1; /* Nothing more to do below */
1999 } 2002 }
2000 else if (door->type == LOCKED_DOOR) 2003 else if (door->type == LOCKED_DOOR)
2001 { 2004 {
2002 /* Might as well return now - no other way to open this */ 2005 /* Might as well return now - no other way to open this */
2003 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 2006 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2004 return 1; 2007 return 1;
2005 } 2008 }
2009
2006 return 0; 2010 return 0;
2007} 2011}
2008 2012
2009/* This function is just part of a breakup from move_player. 2013/* This function is just part of a breakup from move_player.
2010 * It should keep the code cleaner. 2014 * It should keep the code cleaner.
… …
2014 */ 2018 */
2015void 2019void
2016move_player_attack (object *op, int dir) 2020move_player_attack (object *op, int dir)
2017{ 2021{
2018 object *tmp, *mon; 2022 object *tmp, *mon;
2019 sint16 nx, ny;
2020 int on_battleground; 2023 int on_battleground;
2021 maptile *m; 2024 maptile *m;
2022 2025
2023 nx = freearr_x[dir] + op->x; 2026 sint16 nx = freearr_x[dir] + op->x;
2024 ny = freearr_y[dir] + op->y; 2027 sint16 ny = freearr_y[dir] + op->y;
2025 2028
2026 on_battleground = op_on_battleground (op, 0, 0); 2029 on_battleground = op_on_battleground (op, 0, 0);
2027 2030
2028 /* If braced, or can't move to the square, and it is not out of the 2031 /* If braced, or can't move to the square, and it is not out of the
2029 * map, attack it. Note order of if statement is important - don't 2032 * map, attack it. Note order of if statement is important - don't
… …
2109 /* If we're braced, we don't want to switch places with it */ 2112 /* If we're braced, we don't want to switch places with it */
2110 if (op->contr->braced) 2113 if (op->contr->braced)
2111 return; 2114 return;
2112 2115
2113 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2116 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2114 (void) push_ob (mon, dir, op); 2117 push_ob (mon, dir, op);
2115 if (op->contr->tmp_invis || op->hide) 2118 if (op->contr->tmp_invis || op->hide)
2116 make_visible (op); 2119 make_visible (op);
2117 2120
2118 return; 2121 return;
2119 } 2122 }
… …
2164 * that party_number -1 is no party, so attacks can still happen. 2167 * that party_number -1 is no party, so attacks can still happen.
2165 */ 2168 */
2166 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2169 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))) 2170 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2168 { 2171 {
2169
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) 2172 op->contr->has_hit = 1;
2176 {
2177 op->speed_left += op->speed / op->contr->weapon_sp;
2178
2179 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2180 }
2181 2173
2182 skill_attack (mon, op, 0, 0, 0); 2174 skill_attack (mon, op, 0, 0, 0);
2183 2175
2184 /* If attacking another player, that player gets automatic 2176 /* If attacking another player, that player gets automatic
2185 * hitback, and doesn't loose luck either. 2177 * hitback, and doesn't loose luck either.
… …
2259 * Returns true if there are more actions we can do. 2251 * Returns true if there are more actions we can do.
2260 */ 2252 */
2261int 2253int
2262handle_newcs_player (object *op) 2254handle_newcs_player (object *op)
2263{ 2255{
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)) 2256 if (QUERY_FLAG (op, FLAG_SCARED))
2285 { 2257 {
2286 flee_player (op); 2258 flee_player (op);
2259
2287 /* If player is still scared, that is his action for this tick */ 2260 /* If player is still scared, that is his action for this tick */
2288 if (QUERY_FLAG (op, FLAG_SCARED)) 2261 if (op->flag [FLAG_SCARED])
2289 { 2262 {
2290 op->speed_left--; 2263 --op->speed_left;
2291 return 0; 2264 return 0;
2292 } 2265 }
2293 } 2266 }
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 2267
2303 /* call this here - we also will call this in do_ericserver, but 2268 /* call this here - we also will call this in do_ericserver, but
2304 * the players time has been increased when doericserver has been 2269 * the players time has been increased when doericserver has been
2305 * called, so we recheck it here. 2270 * called, so we recheck it here.
2306 */ 2271 */
2307 if (op->contr->ns->handle_command ()) 2272 if (op->contr->ns->handle_command ())
2308 return 1; 2273 return 1;
2309 2274
2310 if (op->speed_left > 0) 2275 if (op->speed_left > 0.f)
2311 { 2276 {
2312 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2277 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2313 { 2278 {
2314 /* All move commands take 1 tick, at least for now */ 2279 /* All move commands take 1 tick, at least for now */
2315 op->speed_left--; 2280 --op->speed_left;
2316 2281
2317 /* Instead of all the stuff below, let move_player take care 2282 /* Instead of all the stuff below, let move_player take care
2318 * of it. Also, some of the skill stuff is only put in 2283 * of it. Also, some of the skill stuff is only put in
2319 * there, as well as the confusion stuff. 2284 * there, as well as the confusion stuff.
2320 */ 2285 */
2321 move_player (op, op->direction); 2286 move_player (op, op->direction);
2322 2287
2323 return op->speed_left > 0; 2288 return op->speed_left > 0.f;
2324 } 2289 }
2325 } 2290 }
2326 2291
2327 return 0; 2292 return 0;
2328} 2293}
… …
2367 * from. 2332 * from.
2368 */ 2333 */
2369void 2334void
2370remove_unpaid_objects (object *op, object *env) 2335remove_unpaid_objects (object *op, object *env)
2371{ 2336{
2372 object *next;
2373
2374 while (op) 2337 while (op)
2375 { 2338 {
2376 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2339 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2377 2340
2378 if (QUERY_FLAG (op, FLAG_UNPAID)) 2341 if (QUERY_FLAG (op, FLAG_UNPAID))
… …
2444 int rate_grace = 2000; 2407 int rate_grace = 2000;
2445 const int max_hp = 1; 2408 const int max_hp = 1;
2446 const int max_sp = 1; 2409 const int max_sp = 1;
2447 const int max_grace = 1; 2410 const int max_grace = 1;
2448 2411
2449 if (op->contr->outputs_sync) 2412 if (op->contr->hidden)
2413 {
2414 op->invisible = 1000;
2415 /* the socket code flashes the player visible/invisible
2416 * depending on the value of invisible, so we need to
2417 * alternate it here for it to work correctly.
2418 */
2419 if (pticks & 2)
2420 op->invisible--;
2450 { 2421 }
2451 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2422 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) 2423 {
2453 flush_output_element (op, &op->contr->outputs[i]); 2424 if (!op->invisible--)
2425 {
2426 make_visible (op);
2427 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2428 }
2454 } 2429 }
2455 2430
2456 if (op->contr->ns->state == ST_PLAYING) 2431 if (op->contr->ns->state == ST_PLAYING)
2457 { 2432 {
2458 /* these next three if clauses make it possible to SLOW DOWN 2433 /* these next three if clauses make it possible to SLOW DOWN
… …
2480 gen_grace = op->stats.maxgrace; 2455 gen_grace = op->stats.maxgrace;
2481 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2456 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2482 } 2457 }
2483 2458
2484 /* Regenerate Spell Points */ 2459 /* Regenerate Spell Points */
2485 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0) 2460 if (!op->contr->golem && --op->last_sp < 0)
2486 { 2461 {
2487 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); 2462 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2488 if (op->stats.sp < op->stats.maxsp) 2463 if (op->stats.sp < op->stats.maxsp)
2489 { 2464 {
2490 op->stats.sp++; 2465 op->stats.sp++;
… …
2915 op->stats.hp = op->stats.maxhp; 2890 op->stats.hp = op->stats.maxhp;
2916 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2891 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2917 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2892 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2918 2893
2919 /* 2894 /*
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 2895 * Check to see if the player has any unpaid items. If so, remove them
2922 * in the map. 2896 * and put them back in the map.
2923 */ 2897 */
2924
2925 if (is_in_shop (op))
2926 remove_unpaid_objects (op->inv, op); 2898 remove_unpaid_objects (op->inv, op);
2927 2899
2928 /****************************************/ 2900 /****************************************/
2929 /* */ 2901 /* */
2930 /* Move player to his current respawn- */ 2902 /* Move player to his current respawn- */
2931 /* position (usually last savebed) */ 2903 /* position (usually last savebed) */
… …
2951 object *force; 2923 object *force;
2952 int at; 2924 int at;
2953 2925
2954 force = get_archetype (FORCE_NAME); 2926 force = get_archetype (FORCE_NAME);
2955 /* 50 ticks should be enough time for the spell to abate */ 2927 /* 50 ticks should be enough time for the spell to abate */
2956 force->speed = 0.1; 2928 force->speed = 0.1f;
2957 force->speed_left = -5.0; 2929 force->speed_left = -5.f;
2958 SET_FLAG (force, FLAG_APPLIED); 2930 SET_FLAG (force, FLAG_APPLIED);
2959 for (at = 0; at < NROFATTACKS; at++) 2931 for (at = 0; at < NROFATTACKS; at++)
2960 if (will_kill_again & (1 << at)) 2932 if (will_kill_again & (1 << at))
2961 force->resist[at] = 100; 2933 force->resist[at] = 100;
2962 2934
… …
2971void 2943void
2972loot_object (object *op) 2944loot_object (object *op)
2973{ /* Grab and destroy some treasure */ 2945{ /* Grab and destroy some treasure */
2974 object *tmp, *tmp2, *next; 2946 object *tmp, *tmp2, *next;
2975 2947
2976 if (op->container) 2948 op->close_container (); /* close open sack first */
2977 esrv_apply_container (op, op->container); /* close open sack first */
2978 2949
2979 for (tmp = op->inv; tmp; tmp = next) 2950 for (tmp = op->inv; tmp; tmp = next)
2980 { 2951 {
2981 next = tmp->below; 2952 next = tmp->below;
2982 2953
2983 if (tmp->invisible) 2954 if (tmp->invisible)
2984 continue; 2955 continue;
2985 2956
2986 tmp->remove (); 2957 tmp->remove ();
2987 tmp->x = op->x, tmp->y = op->y; 2958 tmp->x = op->x, tmp->y = op->y;
2959
2988 if (tmp->type == CONTAINER) 2960 if (tmp->type == CONTAINER)
2989 { /* empty container to ground */ 2961 loot_object (tmp); /* empty container to ground */
2990 loot_object (tmp); 2962
2991 }
2992 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3)))) 2963 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2993 { 2964 {
2994 if (tmp->nrof > 1) 2965 if (tmp->nrof > 1)
2995 { 2966 {
2996 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2967 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
… …
3008/* 2979/*
3009 * fix_weight(): Check recursively the weight of all players, and fix 2980 * fix_weight(): Check recursively the weight of all players, and fix
3010 * what needs to be fixed. Refresh windows and fix speed if anything 2981 * what needs to be fixed. Refresh windows and fix speed if anything
3011 * was changed. 2982 * was changed.
3012 */ 2983 */
3013
3014void 2984void
3015fix_weight (void) 2985fix_weight (void)
3016{ 2986{
3017 for_all_players (pl) 2987 for_all_players (pl)
3018 { 2988 {
… …
3078 if (op->type == PLAYER) 3048 if (op->type == PLAYER)
3079 { 3049 {
3080 op->contr->tmp_invis = 0; 3050 op->contr->tmp_invis = 0;
3081 op->contr->invis_race = 0; 3051 op->contr->invis_race = 0;
3082 } 3052 }
3053
3083 update_object (op, UP_OBJ_FACE); 3054 update_object (op, UP_OBJ_CHANGE);
3084} 3055}
3085 3056
3086int 3057int
3087is_true_undead (object *op) 3058is_true_undead (object *op)
3088{ 3059{
3089 object *tmp = NULL;
3090
3091 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3060 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3092 return 1; 3061 return 1;
3093 3062
3094 return 0; 3063 return 0;
3095} 3064}
… …
3383 char buf[MAX_BUF]; /* tmp. string buffer */ 3352 char buf[MAX_BUF]; /* tmp. string buffer */
3384 int i = 0, j = 0; 3353 int i = 0, j = 0;
3385 3354
3386 /* get the appropriate treasurelist */ 3355 /* get the appropriate treasurelist */
3387 if (atnr == ATNR_FIRE) 3356 if (atnr == ATNR_FIRE)
3388 trlist = find_treasurelist ("dragon_ability_fire"); 3357 trlist = treasurelist::find ("dragon_ability_fire");
3389 else if (atnr == ATNR_COLD) 3358 else if (atnr == ATNR_COLD)
3390 trlist = find_treasurelist ("dragon_ability_cold"); 3359 trlist = treasurelist::find ("dragon_ability_cold");
3391 else if (atnr == ATNR_ELECTRICITY) 3360 else if (atnr == ATNR_ELECTRICITY)
3392 trlist = find_treasurelist ("dragon_ability_elec"); 3361 trlist = treasurelist::find ("dragon_ability_elec");
3393 else if (atnr == ATNR_POISON) 3362 else if (atnr == ATNR_POISON)
3394 trlist = find_treasurelist ("dragon_ability_poison"); 3363 trlist = treasurelist::find ("dragon_ability_poison");
3395 3364
3396 if (trlist == NULL || who->type != PLAYER) 3365 if (trlist == NULL || who->type != PLAYER)
3397 return; 3366 return;
3398 3367
3399 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3368 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
… …
3531 * not readied. 3500 * not readied.
3532 */ 3501 */
3533void 3502void
3534player_unready_range_ob (player *pl, object *ob) 3503player_unready_range_ob (player *pl, object *ob)
3535{ 3504{
3536 for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3505 if (pl->ob->current_weapon == ob)
3506 pl->ob->current_weapon = 0;
3507
3508 if (pl->combat_ob == ob)
3509 pl->combat_ob = 0;
3510
3537 if (pl->ranges[i] == ob) 3511 if (pl->ranged_ob == ob)
3538 {
3539 pl->ranges[i] = 0; 3512 pl->ranged_ob = 0;
3540 if (pl->shoottype == i)
3541 pl->shoottype = range_none;
3542 }
3543} 3513}
3544 3514
3545sint8 3515sint8
3546player::visibility_at (maptile *map, int x, int y) const 3516player::visibility_at (maptile *map, int x, int y) const
3547{ 3517{

Diff Legend

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