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.90 by root, Sun Jan 7 21:54:59 2007 UTC vs.
Revision 1.115 by root, Fri Apr 27 02:43:04 2007 UTC

… …
116 116
117 news[0] = '\0'; 117 news[0] = '\0';
118 subject[0] = '\0'; 118 subject[0] = '\0';
119 size = 0; 119 size = 0;
120 120
121 while (fgets (buf, MAX_BUF, fp) != NULL) 121 while (fgets (buf, MAX_BUF, fp))
122 { 122 {
123 if (*buf == '#') 123 if (*buf == '#')
124 continue; 124 continue;
125 125
126 if (*buf == '%') 126 if (*buf == '%')
127 { /* send one news */ 127 { /* send one news */
128 if (size > 0) 128 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 */ 129 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 130
131 strcpy (subject, buf + 1); 131 strcpy (subject, buf + 1);
132 strip_endline (subject); 132 strip_endline (subject);
133 size = 0; 133 size = 0;
134 news[0] = '\0'; 134 news[0] = '\0';
… …
144 size += strlen (buf); 144 size += strlen (buf);
145 } 145 }
146 } 146 }
147 147
148 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 148 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); 149 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
150 close_and_delete (fp, comp); 150 close_and_delete (fp, comp);
151} 151}
152 152
153/* This loads the first map an puts the player on it. */ 153/* This loads the first map an puts the player on it. */
154static void 154static void
… …
180 180
181 players.insert (this); 181 players.insert (this);
182 ob->remove (); 182 ob->remove ();
183 ob->map = 0; 183 ob->map = 0;
184 ob->activate_recursive (); 184 ob->activate_recursive ();
185 CLEAR_FLAG (ob, FLAG_FRIENDLY);
186 add_friendly_object (ob);
185 enter_map (); 187 enter_map ();
186} 188}
187 189
188void 190void
189player::deactivate () 191player::deactivate ()
190{ 192{
191 if (!active) 193 if (!active)
192 return; 194 return;
193 195
194 terminate_all_pets (ob); 196 terminate_all_pets (ob);
197 remove_friendly_object (ob);
195 ob->deactivate_recursive (); 198 ob->deactivate_recursive ();
199
200 if (ob->map)
201 maplevel = ob->map->path;
202
196 ob->remove (); 203 ob->remove ();
197 ob->map = 0; 204 ob->map = 0;
205 party = 0;
206
207 // for weird reasons, this is often "ob", keeping a circular reference
208 ranges [range_skill] = 0;
198 209
199 players.erase (this); 210 players.erase (this);
200} 211}
201 212
202// connect the player with a specific client 213// connect the player with a specific client
… …
205player::connect (client *ns) 216player::connect (client *ns)
206{ 217{
207 this->ns = ns; 218 this->ns = ns;
208 ns->pl = this; 219 ns->pl = this;
209 220
221 run_on = 0;
222 fire_on = 0;
223 ob->close_container (); //TODO: client-specific
224
210 ns->update_look = 0; 225 ns->update_look = 0;
211 ns->look_position = 0; 226 ns->look_position = 0;
212 227
213 clear_los (ob); 228 clear_los (ob);
229
230 ns->reset_stats ();
214 231
215 /* make sure he's a player -- needed because of class change. */ 232 /* make sure he's a player -- needed because of class change. */
216 ob->type = PLAYER; // we are paranoid 233 ob->type = PLAYER; // we are paranoid
217 ob->race = ob->arch->clone.race; 234 ob->race = ob->arch->clone.race;
218 235
… …
223 link_player_skills (ob); 240 link_player_skills (ob);
224 241
225 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 242 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
226 243
227 assign (title, ob->arch->clone.name); 244 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 245
239 /* if it's a dragon player, set the correct title here */ 246 /* if it's a dragon player, set the correct title here */
240 if (is_dragon_pl (ob)) 247 if (is_dragon_pl (ob))
241 { 248 {
242 object *tmp, *abil = 0, *skin = 0; 249 object *tmp, *abil = 0, *skin = 0;
… …
252 skin = tmp; 259 skin = tmp;
253 260
254 set_dragon_name (ob, abil, skin); 261 set_dragon_name (ob, abil, skin);
255 } 262 }
256 263
257 CLEAR_FLAG (ob, FLAG_FRIENDLY);
258 add_friendly_object (ob);
259
260 LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
261
262 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 264 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
263 265
264 esrv_new_player (this, ob->weight + ob->carrying); 266 esrv_new_player (this, ob->weight + ob->carrying);
265 267
266 ob->update_stats (); 268 ob->update_stats ();
… …
287 if (active) 289 if (active)
288 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); 290 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
289 291
290 INVOKE_PLAYER (DISCONNECT, this); 292 INVOKE_PLAYER (DISCONNECT, this);
291 293
294 ns->reset_stats ();
292 ns->pl = 0; 295 ns->pl = 0;
293 this->ns = 0; 296 ns = 0;
294 } 297 }
298
299 if (ob)
300 ob->close_container (); //TODO: client-specific
295 301
296 deactivate (); 302 deactivate ();
297} 303}
298 304
299// the need for this function can be explained 305// the need for this function can be explained
300// by load_object not returning the object 306// by load_object not returning the object
301void 307void
302player::set_object (object *op) 308player::set_object (object *op)
303{ 309{
304 ob = op; 310 ob = op;
305 ob->contr = this; /* this aren't yet in archetype */ 311 ob->contr = this; /* this aren't yet in archetype */
306 312
307 ob->speed_left = 0.5; 313 ob->speed_left = 0.5;
308 ob->speed = 1.0; 314 ob->speed = 1.0;
309 ob->direction = 5; /* So player faces south */ 315 ob->direction = 5; /* So player faces south */
310 ob->stats.wc = 2;
311 ob->run_away = 25; /* Then we panick... */
312
313 ob->roll_stats ();
314} 316}
315 317
316player::player () 318player::player ()
317{ 319{
318 /* There are some elements we want initialised to non zero value - 320 /* There are some elements we want initialised to non zero value -
319 * we deal with that below this point. 321 * we deal with that below this point.
320 */ 322 */
321 outputs_sync = 16; /* Every 2 seconds */ 323 outputs_sync = 4;
322 outputs_count = 8; /* Keeps present behaviour */ 324 outputs_count = 4;
323 unapply = unapply_nochoice; 325 unapply = unapply_nochoice;
324 326
325 savebed_map = first_map_path; /* Init. respawn position */ 327 savebed_map = first_map_path; /* Init. respawn position */
326 328
327 gen_sp_armour = 10; 329 gen_sp_armour = 10;
328 last_speed = -1;
329 shoottype = range_none; 330 shoottype = range_none;
330 bowtype = bow_normal; 331 bowtype = bow_normal;
331 petmode = pet_normal; 332 petmode = pet_normal;
332 listening = 10; 333 listening = 10;
333 usekeys = containers; 334 usekeys = containers;
334 last_weapon_sp = -1;
335 peaceful = 1; /* default peaceful */ 335 peaceful = 1; /* default peaceful */
336 do_los = 1; 336 do_los = 1;
337
338 /* we need to clear these to -1 and not zero - otherwise,
339 * if a player quits and starts a new character, we wont
340 * send new values to the client, as things like exp start
341 * at zero.
342 */
343 for (int i = 0; i < NUM_SKILLS; i++)
344 last_skill_exp[i] = -1;
345
346 for (int i = 0; i < NROFATTACKS; i++)
347 last_resist[i] = -1;
348
349 last_stats.exp = -1;
350 last_weight = (uint32) - 1;
351} 337}
352 338
353void 339void
354player::do_destroy () 340player::do_destroy ()
355{ 341{
… …
378player::create () 364player::create ()
379{ 365{
380 player *pl = new player; 366 player *pl = new player;
381 367
382 pl->set_object (arch_to_object (get_player_archetype (0))); 368 pl->set_object (arch_to_object (get_player_archetype (0)));
369
370 pl->ob->roll_stats ();
371 pl->ob->stats.wc = 2;
372 pl->ob->run_away = 25; /* Then we panick... */
373
383 set_first_map (pl->ob); 374 set_first_map (pl->ob);
384 375
385 return pl; 376 return pl;
386} 377}
387 378
… …
419 object *op = NULL; 410 object *op = NULL;
420 objectlink *ol; 411 objectlink *ol;
421 unsigned lastdist; 412 unsigned lastdist;
422 rv_vector rv; 413 rv_vector rv;
423 414
424 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 415 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
425 { 416 {
426 /* We should not find free objects on this friendly list, but it 417 /* We should not find free objects on this friendly list, but it
427 * does periodically happen. Given that, lets deal with it. 418 * does periodically happen. Given that, lets deal with it.
428 * While unlikely, it is possible the next object on the friendly 419 * While unlikely, it is possible the next object on the friendly
429 * list is also free, so encapsulate this in a while loop. 420 * list is also free, so encapsulate this in a while loop.
… …
433 object *tmp = ol->ob; 424 object *tmp = ol->ob;
434 425
435 /* Can't do much more other than log the fact, because the object 426 /* Can't do much more other than log the fact, because the object
436 * itself will have been cleared. 427 * itself will have been cleared.
437 */ 428 */
438 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n"); 429 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
430 tmp->debug_desc ());
439 ol = ol->next; 431 ol = ol->next;
440 remove_friendly_object (tmp); 432 remove_friendly_object (tmp);
441 if (!ol) 433 if (!ol)
442 return op; 434 return op;
443 } 435 }
… …
532 x = mon->x; 524 x = mon->x;
533 y = mon->y; 525 y = mon->y;
534 m = mon->map; 526 m = mon->map;
535 dir = rv.direction; 527 dir = rv.direction;
536 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 528 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
537 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 529 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
530
538 /* If we can't solve it within the search distance, return now. */ 531 /* If we can't solve it within the search distance, return now. */
539 if (diff > max) 532 if (diff > max)
540 return 0; 533 return 0;
534
541 while (diff > 1 && max > 0) 535 while (diff > 1 && max > 0)
542 { 536 {
543 lastx = x; 537 lastx = x;
544 lasty = y; 538 lasty = y;
545 lastmap = m; 539 lastmap = m;
… …
627 max--; 621 max--;
628 lastdir = dir; 622 lastdir = dir;
629 if (!firstdir) 623 if (!firstdir)
630 firstdir = dir; 624 firstdir = dir;
631 } 625 }
626
632 if (diff <= 1) 627 if (diff <= 1)
633 { 628 {
634 /* Recalculate diff (distance) because we may not have actually 629 /* Recalculate diff (distance) because we may not have actually
635 * headed toward player for entire distance. 630 * headed toward player for entire distance.
636 */ 631 */
637 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 632 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
638 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 633 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
639 } 634 }
635
640 if (diff > max) 636 if (diff > max)
641 return 0; 637 return 0;
642 } 638 }
639
643 /* If we reached the max, didn't find a direction in time */ 640 /* If we reached the max, didn't find a direction in time */
644 if (!max) 641 if (!max)
645 return 0; 642 return 0;
646 643
647 return firstdir; 644 return firstdir;
… …
761roll_stat (void) 758roll_stat (void)
762{ 759{
763 int a[4], i, j, k; 760 int a[4], i, j, k;
764 761
765 for (i = 0; i < 4; i++) 762 for (i = 0; i < 4; i++)
766 a[i] = (int) RANDOM () % 6 + 1; 763 a[i] = (int) rndm (6) + 1;
767 764
768 for (i = 0, j = 0, k = 7; i < 4; i++) 765 for (i = 0, j = 0, k = 7; i < 4; i++)
769 if (a[i] < k) 766 if (a[i] < k)
770 k = a[i], j = i; 767 k = a[i], j = i;
771 768
… …
871 * appropriate action with it (change race, or other things). 868 * appropriate action with it (change race, or other things).
872 * The function name is for historical reasons - now we have 869 * The function name is for historical reasons - now we have
873 * separate race and class; this actually changes the RACE, 870 * separate race and class; this actually changes the RACE,
874 * not the class. 871 * not the class.
875 */ 872 */
876int 873void
877key_change_class (object *op, char key) 874player::chargen_race_done ()
878{ 875{
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 */ 876 /* this must before then initial items are given */
886 esrv_new_player (op->contr, op->weight + op->carrying); 877 esrv_new_player (ob->contr, ob->weight + ob->carrying);
887 878
888 treasurelist *tl = find_treasurelist ("starting_wealth"); 879 treasurelist *tl = treasurelist::find ("starting_wealth");
889 if (tl) 880 if (tl)
890 create_treasure (tl, op, 0, 0, 0); 881 create_treasure (tl, ob, 0, 0, 0);
891 882
892 INVOKE_PLAYER (BIRTH, op->contr); 883 INVOKE_PLAYER (BIRTH, ob->contr);
893 INVOKE_PLAYER (LOGIN, op->contr); 884 INVOKE_PLAYER (LOGIN, ob->contr);
894 885
895 op->contr->ns->state = ST_PLAYING; 886 ob->contr->ns->state = ST_PLAYING;
896 887
897 if (op->msg) 888 if (ob->msg)
898 op->msg = NULL; 889 ob->msg = 0;
899 890
900 /* We create this now because some of the unique maps will need it 891 /* We create this now because some of the unique maps will need it
901 * to save here. 892 * to save here.
902 */ 893 */
894 {
895 char buf[MAX_BUF];
903 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 896 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
904 make_path_to_file (buf); 897 make_path_to_file (buf);
898 }
905 899
906#ifdef AUTOSAVE
907 op->contr->last_save_tick = pticks;
908#endif
909 start_info (op); 900 start_info (ob);
910 CLEAR_FLAG (op, FLAG_WIZ); 901 CLEAR_FLAG (ob, FLAG_WIZ);
911 give_initial_items (op, op->randomitems); 902 give_initial_items (ob, ob->randomitems);
912 link_player_skills (op); 903 link_player_skills (ob);
913 esrv_send_inventory (op, op); 904 esrv_send_inventory (ob, ob);
914 op->update_stats (); 905 ob->update_stats ();
915 906
916 /* This moves the player to a different start map, if there 907 /* This moves the player to a different start map, if there
917 * is one for this race 908 * is one for this race
918 */ 909 */
919 if (*first_map_ext_path) 910 if (*first_map_ext_path)
920 { 911 {
921 object *tmp; 912 object *tmp;
922 char mapname[MAX_BUF]; 913 char mapname[MAX_BUF];
923 914
924 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name); 915 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
925 tmp = object::create (); 916 tmp = object::create ();
926 EXIT_PATH (tmp) = mapname; 917 EXIT_PATH (tmp) = mapname;
927 EXIT_X (tmp) = op->x; 918 EXIT_X (tmp) = ob->x;
928 EXIT_Y (tmp) = op->y; 919 EXIT_Y (tmp) = ob->y;
929 op->enter_exit (tmp); /* we don't really care if it succeeded; 920 ob->enter_exit (tmp); /* we don't really care if it succeeded;
930 * if the map isn't there, then stay on the 921 * if the map isn't there, then stay on the
931 * default initial map */ 922 * default initial map */
932 tmp->destroy (); 923 tmp->destroy ();
933 } 924 }
934 else 925 else
935 LOG (llevDebug, "first_map_ext_path not set\n"); 926 LOG (llevDebug, "first_map_ext_path not set\n");
927}
936 928
937 return 0; 929void
938 } 930player::chargen_race_next ()
939 931{
940 /* Following actually changes the race - this is the default command 932 /* Following actually changes the race - this is the default command
941 * if we don't match with one of the options above. 933 * if we don't match with one of the options above.
942 */ 934 */
943 935
944 tmp_loop = 0; 936 do
945 while (!tmp_loop)
946 { 937 {
947 shstr name = op->name; 938 shstr name = ob->name;
948 int x = op->x, y = op->y; 939 int x = ob->x, y = ob->y;
949 940
950 op->remove_statbonus (); 941 ob->remove_statbonus ();
951 op->remove (); 942 ob->remove ();
952 op->arch = get_player_archetype (op->arch); 943 ob->arch = get_player_archetype (ob->arch);
953 op->arch->clone.copy_to (op); 944 ob->arch->clone.copy_to (ob);
954 op->instantiate (); 945 ob->instantiate ();
955 op->stats = op->contr->orig_stats; 946 ob->stats = ob->contr->orig_stats;
956 op->name = op->name_pl = name; 947 ob->name = ob->name_pl = name;
957 op->x = x; 948 ob->x = x;
958 op->y = y; 949 ob->y = y;
959 SET_ANIMATION (op, 2); /* So player faces south */ 950 SET_ANIMATION (ob, 2); /* So player faces south */
960 insert_ob_in_map (op, op->map, op, 0); 951 insert_ob_in_map (ob, ob->map, ob, 0);
961 assign (op->contr->title, op->arch->clone.name); 952 assign (ob->contr->title, ob->arch->clone.name);
962 op->add_statbonus (); 953 ob->add_statbonus ();
963 tmp_loop = allowed_class (op);
964 } 954 }
955 while (!allowed_class (ob));
965 956
966 update_object (op, UP_OBJ_FACE); 957 update_object (ob, UP_OBJ_FACE);
967 esrv_update_item (UPD_FACE, op, op); 958 esrv_update_item (UPD_FACE, ob, ob);
968 op->update_stats (); 959 ob->update_stats ();
969 op->stats.hp = op->stats.maxhp; 960 ob->stats.hp = ob->stats.maxhp;
970 op->stats.sp = op->stats.maxsp; 961 ob->stats.sp = ob->stats.maxsp;
971 op->stats.grace = 0; 962 ob->stats.grace = 0;
972
973 if (op->msg)
974 new_draw_info (NDI_BLUE, 0, op, op->msg);
975
976 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
977 return 0;
978} 963}
979 964
980void 965void
981flee_player (object *op) 966flee_player (object *op)
982{ 967{
… …
1039int 1024int
1040check_pick (object *op) 1025check_pick (object *op)
1041{ 1026{
1042 object *tmp, *next; 1027 object *tmp, *next;
1043 int stop = 0; 1028 int stop = 0;
1044 int j, k, wvratio; 1029 int wvratio;
1045 char putstring[128], tmpstr[16]; 1030 char putstring[128];
1046 1031
1047 /* if you're flying, you cna't pick up anything */ 1032 /* if you're flying, you cna't pick up anything */
1048 if (op->move_type & MOVE_FLYING) 1033 if (op->move_type & MOVE_FLYING)
1049 return 1; 1034 return 1;
1050 1035
… …
1387 * found object is returned. 1372 * found object is returned.
1388 */ 1373 */
1389object * 1374object *
1390find_arrow (object *op, const char *type) 1375find_arrow (object *op, const char *type)
1391{ 1376{
1392 object *tmp = NULL; 1377 object *tmp = 0;
1393 1378
1394 for (op = op->inv; op; op = op->below) 1379 for (op = op->inv; op; op = op->below)
1395 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1380 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1396 tmp = find_arrow (op, type); 1381 tmp = find_arrow (op, type);
1397 else if (op->type == ARROW && op->race == type) 1382 else if (op->type == ARROW && op->race == type)
1398 return op; 1383 return op;
1384
1399 return tmp; 1385 return tmp;
1400} 1386}
1401 1387
1402/* 1388/*
1403 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1389 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1404 * against the target. A full test is not performed, simply a basic test 1390 * against the target. A full test is not performed, simply a basic test
1405 * of resistances. The archer is making a quick guess at what he sees down 1391 * of resistances. The archer is making a quick guess at what he sees down
1406 * the hall. Failing that it does it's best to pick the highest plus arrow. 1392 * the hall. Failing that it does it's best to pick the highest plus arrow.
1407 */ 1393 */
1408
1409object * 1394object *
1410find_better_arrow (object *op, object *target, const char *type, int *better) 1395find_better_arrow (object *op, object *target, const char *type, int *better)
1411{ 1396{
1412 object *tmp = NULL, *arrow, *ntmp; 1397 object *tmp = NULL, *arrow, *ntmp;
1413 int attacknum, attacktype, betterby = 0, i; 1398 int attacknum, attacktype, betterby = 0, i;
… …
1845 case range_misc: 1830 case range_misc:
1846 fire_misc_object (op, dir); 1831 fire_misc_object (op, dir);
1847 return; 1832 return;
1848 1833
1849 case range_golem: /* Control summoned monsters from scrolls */ 1834 case range_golem: /* Control summoned monsters from scrolls */
1850 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1851 {
1852 op->contr->ranges[range_golem] = 0;
1853 op->contr->shoottype = range_none;
1854 }
1855 else
1856 control_golem (op->contr->ranges[range_golem], dir); 1835 control_golem (op->contr->ranges[range_golem], dir);
1857 return; 1836 return;
1858 1837
1859 case range_skill: 1838 case range_skill:
1860 if (!op->chosen_skill) 1839 if (!op->chosen_skill)
1861 { 1840 {
1862 if (op->type == PLAYER) 1841 if (op->type == PLAYER)
1863 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use."); 1842 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1843
1864 return; 1844 return;
1865 } 1845 }
1846
1866 (void) do_skill (op, op, op->chosen_skill, dir, NULL); 1847 do_skill (op, op, op->chosen_skill, dir, NULL);
1867 return; 1848 return;
1868 case range_builder: 1849 case range_builder:
1869 apply_map_builder (op, dir); 1850 apply_map_builder (op, dir);
1870 return; 1851 return;
1871 default: 1852 default:
1872 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type."); 1853 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1873 return; 1854 return;
1874 } 1855 }
1875} 1856}
1876
1877
1878 1857
1879/* find_key 1858/* find_key
1880 * We try to find a key for the door as passed. If we find a key 1859 * We try to find a key for the door as passed. If we find a key
1881 * and successfully use it, we return the key, otherwise NULL 1860 * and successfully use it, we return the key, otherwise NULL
1882 * This function merges both normal and locked door, since the logic 1861 * This function merges both normal and locked door, since the logic
… …
1884 * pl is the player, 1863 * pl is the player,
1885 * inv is the objects inventory to searched 1864 * inv is the objects inventory to searched
1886 * door is the door we are trying to match against. 1865 * door is the door we are trying to match against.
1887 * This function can be called recursively to search containers. 1866 * This function can be called recursively to search containers.
1888 */ 1867 */
1889
1890object * 1868object *
1891find_key (object *pl, object *container, object *door) 1869find_key (object *pl, object *container, object *door)
1892{ 1870{
1893 object *tmp, *key; 1871 object *tmp, *key;
1894 1872
1895 /* Should not happen, but sanity checking is never bad */ 1873 /* Should not happen, but sanity checking is never bad */
1896 if (container->inv == NULL) 1874 if (!container->inv)
1897 return NULL; 1875 return 0;
1898 1876
1899 /* First, lets try to find a key in the top level inventory */ 1877 /* First, lets try to find a key in the top level inventory */
1900 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1878 for (tmp = container->inv; tmp; tmp = tmp->below)
1901 { 1879 {
1902 if (door->type == DOOR && tmp->type == KEY) 1880 if (door->type == DOOR && tmp->type == KEY)
1903 break; 1881 break;
1904 /* For sanity, we should really check door type, but other stuff 1882 /* For sanity, we should really check door type, but other stuff
1905 * (like containers) can be locked with special keys 1883 * (like containers) can be locked with special keys
1906 */ 1884 */
1907 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1885 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1908 break; 1886 break;
1909 } 1887 }
1888
1910 /* No key found - lets search inventories now */ 1889 /* No key found - lets search inventories now */
1911 /* If we find and use a key in an inventory, return at that time. 1890 /* If we find and use a key in an inventory, return at that time.
1912 * otherwise, if we search all the inventories and still don't find 1891 * otherwise, if we search all the inventories and still don't find
1913 * a key, return 1892 * a key, return
1914 */ 1893 */
1915 if (!tmp) 1894 if (!tmp)
1916 { 1895 {
1917 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1896 for (tmp = container->inv; tmp; tmp = tmp->below)
1918 { 1897 {
1919 /* No reason to search empty containers */ 1898 /* No reason to search empty containers */
1920 if (tmp->type == CONTAINER && tmp->inv) 1899 if (tmp->type == CONTAINER && tmp->inv)
1921 { 1900 {
1922 if ((key = find_key (pl, tmp, door)) != NULL) 1901 if ((key = find_key (pl, tmp, door)))
1923 return key; 1902 return key;
1924 } 1903 }
1925 } 1904 }
1905
1926 if (!tmp) 1906 if (!tmp)
1927 return NULL; 1907 return NULL;
1928 } 1908 }
1909
1929 /* We get down here if we have found a key. Now if its in a container, 1910 /* We get down here if we have found a key. Now if its in a container,
1930 * see if we actually want to use it 1911 * see if we actually want to use it
1931 */ 1912 */
1932 if (pl != container) 1913 if (pl != container)
1933 { 1914 {
… …
1954 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1935 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1955 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1936 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1956 return NULL; 1937 return NULL;
1957 } 1938 }
1958 } 1939 }
1940
1959 return tmp; 1941 return tmp;
1960} 1942}
1961 1943
1962/* moved door processing out of move_player_attack. 1944/* moved door processing out of move_player_attack.
1963 * returns 1 if player has opened the door with a key 1945 * returns 1 if player has opened the door with a key
… …
1981 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1963 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1982 if (action_makes_visible (op)) 1964 if (action_makes_visible (op))
1983 make_visible (op); 1965 make_visible (op);
1984 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1966 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1985 spring_trap (door->inv, op); 1967 spring_trap (door->inv, op);
1968
1986 if (door->type == DOOR) 1969 if (door->type == DOOR)
1987 {
1988 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1970 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1989 }
1990 else if (door->type == LOCKED_DOOR) 1971 else if (door->type == LOCKED_DOOR)
1991 { 1972 {
1992 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1973 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
1993 remove_door2 (door); /* remove door without violence ;-) */ 1974 remove_door2 (door); /* remove door without violence ;-) */
1994 } 1975 }
1976
1995 /* Do this after we print the message */ 1977 /* Do this after we print the message */
1996 decrease_ob (key); /* Use up one of the keys */ 1978 decrease_ob (key); /* Use up one of the keys */
1997 /* Need to update the weight the container the key was in */ 1979 /* Need to update the weight the container the key was in */
1998 if (container != op) 1980 if (container != op)
1999 esrv_update_item (UPD_WEIGHT, op, container); 1981 esrv_update_item (UPD_WEIGHT, op, container);
1982
2000 return 1; /* Nothing more to do below */ 1983 return 1; /* Nothing more to do below */
2001 } 1984 }
2002 else if (door->type == LOCKED_DOOR) 1985 else if (door->type == LOCKED_DOOR)
2003 { 1986 {
2004 /* Might as well return now - no other way to open this */ 1987 /* Might as well return now - no other way to open this */
2005 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1988 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2006 return 1; 1989 return 1;
2007 } 1990 }
1991
2008 return 0; 1992 return 0;
2009} 1993}
2010 1994
2011/* This function is just part of a breakup from move_player. 1995/* This function is just part of a breakup from move_player.
2012 * It should keep the code cleaner. 1996 * It should keep the code cleaner.
… …
2218 return 0; 2202 return 0;
2219 } 2203 }
2220 2204
2221 /* peterm: added following line */ 2205 /* peterm: added following line */
2222 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2206 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2223 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2207 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2224 2208
2225 op->facing = dir; 2209 op->facing = dir;
2226 2210
2227 if (op->hide) 2211 if (op->hide)
2228 do_hidden_move (op); 2212 do_hidden_move (op);
… …
2261 * Returns true if there are more actions we can do. 2245 * Returns true if there are more actions we can do.
2262 */ 2246 */
2263int 2247int
2264handle_newcs_player (object *op) 2248handle_newcs_player (object *op)
2265{ 2249{
2266 if (op->contr->hidden)
2267 {
2268 op->invisible = 1000;
2269 /* the socket code flashes the player visible/invisible
2270 * depending on the value of invisible, so we need to
2271 * alternate it here for it to work correctly.
2272 */
2273 if (pticks & 2)
2274 op->invisible--;
2275 }
2276 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2277 {
2278 op->invisible--;
2279 if (!op->invisible)
2280 {
2281 make_visible (op);
2282 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2283 }
2284 }
2285
2286 if (QUERY_FLAG (op, FLAG_SCARED)) 2250 if (QUERY_FLAG (op, FLAG_SCARED))
2287 { 2251 {
2288 flee_player (op); 2252 flee_player (op);
2289 /* If player is still scared, that is his action for this tick */ 2253 /* If player is still scared, that is his action for this tick */
2290 if (QUERY_FLAG (op, FLAG_SCARED)) 2254 if (QUERY_FLAG (op, FLAG_SCARED))
2291 { 2255 {
2292 op->speed_left--; 2256 op->speed_left--;
2293 return 0; 2257 return 0;
2294 } 2258 }
2295 } 2259 }
2296
2297 /* I've been seeing crashes where the golem has been destroyed, but
2298 * the player object still points to the defunct golem. The code that
2299 * destroys the golem looks correct, and it doesn't always happen, so
2300 * put this in a a workaround to clean up the golem pointer.
2301 */
2302 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2303 op->contr->ranges[range_golem] = 0;
2304 2260
2305 /* call this here - we also will call this in do_ericserver, but 2261 /* call this here - we also will call this in do_ericserver, but
2306 * the players time has been increased when doericserver has been 2262 * the players time has been increased when doericserver has been
2307 * called, so we recheck it here. 2263 * called, so we recheck it here.
2308 */ 2264 */
… …
2369 * from. 2325 * from.
2370 */ 2326 */
2371void 2327void
2372remove_unpaid_objects (object *op, object *env) 2328remove_unpaid_objects (object *op, object *env)
2373{ 2329{
2374 object *next;
2375
2376 while (op) 2330 while (op)
2377 { 2331 {
2378 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2332 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2379 2333
2380 if (QUERY_FLAG (op, FLAG_UNPAID)) 2334 if (QUERY_FLAG (op, FLAG_UNPAID))
… …
2446 int rate_grace = 2000; 2400 int rate_grace = 2000;
2447 const int max_hp = 1; 2401 const int max_hp = 1;
2448 const int max_sp = 1; 2402 const int max_sp = 1;
2449 const int max_grace = 1; 2403 const int max_grace = 1;
2450 2404
2451 if (op->contr->outputs_sync) 2405 if (op->contr->hidden)
2406 {
2407 op->invisible = 1000;
2408 /* the socket code flashes the player visible/invisible
2409 * depending on the value of invisible, so we need to
2410 * alternate it here for it to work correctly.
2411 */
2412 if (pticks & 2)
2413 op->invisible--;
2452 { 2414 }
2453 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2415 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2454 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2416 {
2455 flush_output_element (op, &op->contr->outputs[i]); 2417 if (!op->invisible--)
2418 {
2419 make_visible (op);
2420 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2421 }
2456 } 2422 }
2457 2423
2458 if (op->contr->ns->state == ST_PLAYING) 2424 if (op->contr->ns->state == ST_PLAYING)
2459 { 2425 {
2460 /* these next three if clauses make it possible to SLOW DOWN 2426 /* these next three if clauses make it possible to SLOW DOWN
… …
2482 gen_grace = op->stats.maxgrace; 2448 gen_grace = op->stats.maxgrace;
2483 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2449 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2484 } 2450 }
2485 2451
2486 /* Regenerate Spell Points */ 2452 /* Regenerate Spell Points */
2487 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0) 2453 if (!op->contr->ranges[range_golem] && --op->last_sp < 0)
2488 { 2454 {
2489 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); 2455 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2490 if (op->stats.sp < op->stats.maxsp) 2456 if (op->stats.sp < op->stats.maxsp)
2491 { 2457 {
2492 op->stats.sp++; 2458 op->stats.sp++;
… …
2710 tmp->name = buf; 2676 tmp->name = buf;
2711 sprintf (buf, " This finger has been cut off %s\n" 2677 sprintf (buf, " This finger has been cut off %s\n"
2712 " the %s, when he was defeated at\n level %d by %s.\n", 2678 " the %s, when he was defeated at\n level %d by %s.\n",
2713 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2679 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2714 tmp->msg = buf; 2680 tmp->msg = buf;
2715 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2681 tmp->value = 0, tmp->type = 0;
2716 tmp->materialname = NULL; 2682 tmp->materialname = "organics";
2717 tmp->insert_at (op, tmp); 2683 tmp->insert_at (op, tmp);
2718 } 2684 }
2719 2685
2720 /* teleport defeated player to new destination */ 2686 /* teleport defeated player to new destination */
2721 transfer_ob (op, x, y, 0, NULL); 2687 transfer_ob (op, x, y, 0, NULL);
… …
2917 op->stats.hp = op->stats.maxhp; 2883 op->stats.hp = op->stats.maxhp;
2918 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2884 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2919 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2885 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2920 2886
2921 /* 2887 /*
2922 * Check to see if the player is in a shop. IF so, then check to see if
2923 * the player has any unpaid items. If so, remove them and put them back 2888 * Check to see if the player has any unpaid items. If so, remove them
2924 * in the map. 2889 * and put them back in the map.
2925 */ 2890 */
2926
2927 if (is_in_shop (op))
2928 remove_unpaid_objects (op->inv, op); 2891 remove_unpaid_objects (op->inv, op);
2929 2892
2930 /****************************************/ 2893 /****************************************/
2931 /* */ 2894 /* */
2932 /* Move player to his current respawn- */ 2895 /* Move player to his current respawn- */
2933 /* position (usually last savebed) */ 2896 /* position (usually last savebed) */
… …
2973void 2936void
2974loot_object (object *op) 2937loot_object (object *op)
2975{ /* Grab and destroy some treasure */ 2938{ /* Grab and destroy some treasure */
2976 object *tmp, *tmp2, *next; 2939 object *tmp, *tmp2, *next;
2977 2940
2978 if (op->container) 2941 op->close_container (); /* close open sack first */
2979 esrv_apply_container (op, op->container); /* close open sack first */
2980 2942
2981 for (tmp = op->inv; tmp; tmp = next) 2943 for (tmp = op->inv; tmp; tmp = next)
2982 { 2944 {
2983 next = tmp->below; 2945 next = tmp->below;
2984 2946
2985 if (tmp->invisible) 2947 if (tmp->invisible)
2986 continue; 2948 continue;
2987 2949
2988 tmp->remove (); 2950 tmp->remove ();
2989 tmp->x = op->x, tmp->y = op->y; 2951 tmp->x = op->x, tmp->y = op->y;
2952
2990 if (tmp->type == CONTAINER) 2953 if (tmp->type == CONTAINER)
2991 { /* empty container to ground */ 2954 loot_object (tmp); /* empty container to ground */
2992 loot_object (tmp); 2955
2993 }
2994 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2956 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2995 { 2957 {
2996 if (tmp->nrof > 1) 2958 if (tmp->nrof > 1)
2997 { 2959 {
2998 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2960 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
2999 tmp2->destroy (); 2961 tmp2->destroy ();
… …
3010/* 2972/*
3011 * fix_weight(): Check recursively the weight of all players, and fix 2973 * fix_weight(): Check recursively the weight of all players, and fix
3012 * what needs to be fixed. Refresh windows and fix speed if anything 2974 * what needs to be fixed. Refresh windows and fix speed if anything
3013 * was changed. 2975 * was changed.
3014 */ 2976 */
3015
3016void 2977void
3017fix_weight (void) 2978fix_weight (void)
3018{ 2979{
3019 for_all_players (pl) 2980 for_all_players (pl)
3020 { 2981 {
… …
3080 if (op->type == PLAYER) 3041 if (op->type == PLAYER)
3081 { 3042 {
3082 op->contr->tmp_invis = 0; 3043 op->contr->tmp_invis = 0;
3083 op->contr->invis_race = 0; 3044 op->contr->invis_race = 0;
3084 } 3045 }
3046
3085 update_object (op, UP_OBJ_FACE); 3047 update_object (op, UP_OBJ_CHANGE);
3086} 3048}
3087 3049
3088int 3050int
3089is_true_undead (object *op) 3051is_true_undead (object *op)
3090{ 3052{
3091 object *tmp = NULL;
3092
3093 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3053 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3094 return 1; 3054 return 1;
3095 3055
3096 return 0; 3056 return 0;
3097} 3057}
… …
3385 char buf[MAX_BUF]; /* tmp. string buffer */ 3345 char buf[MAX_BUF]; /* tmp. string buffer */
3386 int i = 0, j = 0; 3346 int i = 0, j = 0;
3387 3347
3388 /* get the appropriate treasurelist */ 3348 /* get the appropriate treasurelist */
3389 if (atnr == ATNR_FIRE) 3349 if (atnr == ATNR_FIRE)
3390 trlist = find_treasurelist ("dragon_ability_fire"); 3350 trlist = treasurelist::find ("dragon_ability_fire");
3391 else if (atnr == ATNR_COLD) 3351 else if (atnr == ATNR_COLD)
3392 trlist = find_treasurelist ("dragon_ability_cold"); 3352 trlist = treasurelist::find ("dragon_ability_cold");
3393 else if (atnr == ATNR_ELECTRICITY) 3353 else if (atnr == ATNR_ELECTRICITY)
3394 trlist = find_treasurelist ("dragon_ability_elec"); 3354 trlist = treasurelist::find ("dragon_ability_elec");
3395 else if (atnr == ATNR_POISON) 3355 else if (atnr == ATNR_POISON)
3396 trlist = find_treasurelist ("dragon_ability_poison"); 3356 trlist = treasurelist::find ("dragon_ability_poison");
3397 3357
3398 if (trlist == NULL || who->type != PLAYER) 3358 if (trlist == NULL || who->type != PLAYER)
3399 return; 3359 return;
3400 3360
3401 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3361 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
… …
3533 * not readied. 3493 * not readied.
3534 */ 3494 */
3535void 3495void
3536player_unready_range_ob (player *pl, object *ob) 3496player_unready_range_ob (player *pl, object *ob)
3537{ 3497{
3538 rangetype i;
3539
3540 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3498 for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))
3541 {
3542 if (pl->ranges[i] == ob) 3499 if (pl->ranges[i] == ob)
3543 { 3500 {
3544 pl->ranges[i] = NULL; 3501 pl->ranges[i] = 0;
3545 if (pl->shoottype == i) 3502 if (pl->shoottype == i)
3546 {
3547 pl->shoottype = range_none; 3503 pl->shoottype = range_none;
3548 }
3549 } 3504 }
3550 }
3551} 3505}
3506
3507sint8
3508player::visibility_at (maptile *map, int x, int y) const
3509{
3510 if (!ns)
3511 return 0;
3512
3513 int dx, dy;
3514 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3515 return 0;
3516
3517 x += dx - ns->current_x + ns->mapx / 2;
3518 y += dy - ns->current_y + ns->mapy / 2;
3519
3520 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3521 return 0;
3522
3523 return 100 - blocked_los [x][y];
3524}

Diff Legend

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