… | |
… | |
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. */ |
154 | static void |
154 | static void |
… | |
… | |
194 | return; |
194 | return; |
195 | |
195 | |
196 | terminate_all_pets (ob); |
196 | terminate_all_pets (ob); |
197 | remove_friendly_object (ob); |
197 | remove_friendly_object (ob); |
198 | ob->deactivate_recursive (); |
198 | ob->deactivate_recursive (); |
|
|
199 | maplevel = ob->map->path; |
199 | ob->remove (); |
200 | ob->remove (); |
200 | ob->map = 0; |
201 | ob->map = 0; |
|
|
202 | party = 0; |
201 | |
203 | |
202 | // for weird reasons, this is often "ob", keeping a circular reference |
204 | // for weird reasons, this is often "ob", keeping a circular reference |
203 | ranges [range_skill] = 0; |
205 | ranges [range_skill] = 0; |
204 | |
206 | |
205 | players.erase (this); |
207 | players.erase (this); |
… | |
… | |
211 | player::connect (client *ns) |
213 | player::connect (client *ns) |
212 | { |
214 | { |
213 | this->ns = ns; |
215 | this->ns = ns; |
214 | ns->pl = this; |
216 | ns->pl = this; |
215 | |
217 | |
|
|
218 | run_on = 0; |
|
|
219 | fire_on = 0; |
|
|
220 | ob->close_container (); //TODO: client-specific |
|
|
221 | |
216 | ns->update_look = 0; |
222 | ns->update_look = 0; |
217 | ns->look_position = 0; |
223 | ns->look_position = 0; |
218 | |
224 | |
219 | clear_los (ob); |
225 | clear_los (ob); |
220 | |
226 | |
221 | //TODO: must move into client |
227 | ns->reset_stats (); |
222 | /* we need to clear these to -1 and not zero - otherwise, |
|
|
223 | * if a player quits and starts a new character, we wont |
|
|
224 | * send new values to the client, as things like exp start |
|
|
225 | * at zero. |
|
|
226 | */ |
|
|
227 | for (int i = 0; i < NUM_SKILLS; i++) |
|
|
228 | last_skill_exp[i] = -1; |
|
|
229 | |
|
|
230 | for (int i = 0; i < NROFATTACKS; i++) |
|
|
231 | last_resist[i] = -1; |
|
|
232 | |
|
|
233 | last_weapon_sp = -1; |
|
|
234 | last_level = -1; |
|
|
235 | last_stats.exp = -1; |
|
|
236 | last_weight = (uint32) - 1; |
|
|
237 | last_flags = 0; |
|
|
238 | last_weight = 0; |
|
|
239 | last_weight_limit = 0; |
|
|
240 | last_path_attuned = 0; |
|
|
241 | last_path_repelled = 0; |
|
|
242 | last_path_denied = 0; |
|
|
243 | last_speed = 0; |
|
|
244 | run_on = 0; |
|
|
245 | fire_on = 0; |
|
|
246 | memset (&last_stats, 0, sizeof (living)); //TODO dirty |
|
|
247 | |
228 | |
248 | /* make sure he's a player -- needed because of class change. */ |
229 | /* make sure he's a player -- needed because of class change. */ |
249 | ob->type = PLAYER; // we are paranoid |
230 | ob->type = PLAYER; // we are paranoid |
250 | ob->race = ob->arch->clone.race; |
231 | ob->race = ob->arch->clone.race; |
251 | |
232 | |
… | |
… | |
256 | link_player_skills (ob); |
237 | link_player_skills (ob); |
257 | |
238 | |
258 | CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); |
239 | CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); |
259 | |
240 | |
260 | assign (title, ob->arch->clone.name); |
241 | assign (title, ob->arch->clone.name); |
261 | |
|
|
262 | /* can_use_shield is a new flag. However, the can_use.. seems to largely come |
|
|
263 | * from the class, and not race. I don't see any way to get the class information |
|
|
264 | * to then update this. I don't think this will actually break anything - anyone |
|
|
265 | * that can use armour should be able to use a shield. What this may 'break' |
|
|
266 | * are features new characters get, eg, if someone starts up with a Q, they |
|
|
267 | * should be able to use a shield. However, old Q's won't get that advantage. |
|
|
268 | */ |
|
|
269 | if (QUERY_FLAG (ob, FLAG_USE_ARMOUR)) |
|
|
270 | SET_FLAG (ob, FLAG_USE_SHIELD); |
|
|
271 | |
242 | |
272 | /* if it's a dragon player, set the correct title here */ |
243 | /* if it's a dragon player, set the correct title here */ |
273 | if (is_dragon_pl (ob)) |
244 | if (is_dragon_pl (ob)) |
274 | { |
245 | { |
275 | object *tmp, *abil = 0, *skin = 0; |
246 | object *tmp, *abil = 0, *skin = 0; |
… | |
… | |
315 | if (active) |
286 | if (active) |
316 | INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); |
287 | INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); |
317 | |
288 | |
318 | INVOKE_PLAYER (DISCONNECT, this); |
289 | INVOKE_PLAYER (DISCONNECT, this); |
319 | |
290 | |
|
|
291 | ns->reset_stats (); |
320 | ns->pl = 0; |
292 | ns->pl = 0; |
321 | this->ns = 0; |
293 | this->ns = 0; |
322 | } |
294 | } |
|
|
295 | |
|
|
296 | if (ob) |
|
|
297 | ob->close_container (); //TODO: client-specific |
323 | |
298 | |
324 | deactivate (); |
299 | deactivate (); |
325 | } |
300 | } |
326 | |
301 | |
327 | // the need for this function can be explained |
302 | // the need for this function can be explained |
328 | // by load_object not returning the object |
303 | // by load_object not returning the object |
329 | void |
304 | void |
330 | player::set_object (object *op) |
305 | player::set_object (object *op) |
331 | { |
306 | { |
332 | ob = op; |
307 | ob = op; |
333 | ob->contr = this; /* this aren't yet in archetype */ |
308 | ob->contr = this; /* this aren't yet in archetype */ |
334 | |
309 | |
335 | ob->speed_left = 0.5; |
310 | ob->speed_left = 0.5; |
336 | ob->speed = 1.0; |
311 | ob->speed = 1.0; |
337 | ob->direction = 5; /* So player faces south */ |
312 | ob->direction = 5; /* So player faces south */ |
338 | ob->stats.wc = 2; |
|
|
339 | ob->run_away = 25; /* Then we panick... */ |
|
|
340 | |
|
|
341 | ob->roll_stats (); |
|
|
342 | } |
313 | } |
343 | |
314 | |
344 | player::player () |
315 | player::player () |
345 | { |
316 | { |
346 | /* There are some elements we want initialised to non zero value - |
317 | /* There are some elements we want initialised to non zero value - |
347 | * we deal with that below this point. |
318 | * we deal with that below this point. |
348 | */ |
319 | */ |
349 | outputs_sync = 16; /* Every 2 seconds */ |
320 | outputs_sync = 6; /* Every 2 seconds */ |
350 | outputs_count = 8; /* Keeps present behaviour */ |
321 | outputs_count = 10; /* Keeps present behaviour */ |
351 | unapply = unapply_nochoice; |
322 | unapply = unapply_nochoice; |
352 | |
323 | |
353 | savebed_map = first_map_path; /* Init. respawn position */ |
324 | savebed_map = first_map_path; /* Init. respawn position */ |
354 | |
325 | |
355 | gen_sp_armour = 10; |
326 | gen_sp_armour = 10; |
356 | last_speed = -1; |
|
|
357 | shoottype = range_none; |
327 | shoottype = range_none; |
358 | bowtype = bow_normal; |
328 | bowtype = bow_normal; |
359 | petmode = pet_normal; |
329 | petmode = pet_normal; |
360 | listening = 10; |
330 | listening = 10; |
361 | usekeys = containers; |
331 | usekeys = containers; |
362 | last_weapon_sp = -1; |
|
|
363 | peaceful = 1; /* default peaceful */ |
332 | peaceful = 1; /* default peaceful */ |
364 | do_los = 1; |
333 | do_los = 1; |
365 | } |
334 | } |
366 | |
335 | |
367 | void |
336 | void |
… | |
… | |
392 | player::create () |
361 | player::create () |
393 | { |
362 | { |
394 | player *pl = new player; |
363 | player *pl = new player; |
395 | |
364 | |
396 | pl->set_object (arch_to_object (get_player_archetype (0))); |
365 | pl->set_object (arch_to_object (get_player_archetype (0))); |
|
|
366 | |
|
|
367 | pl->ob->roll_stats (); |
|
|
368 | pl->ob->stats.wc = 2; |
|
|
369 | pl->ob->run_away = 25; /* Then we panick... */ |
|
|
370 | |
397 | set_first_map (pl->ob); |
371 | set_first_map (pl->ob); |
398 | |
372 | |
399 | return pl; |
373 | return pl; |
400 | } |
374 | } |
401 | |
375 | |
… | |
… | |
547 | x = mon->x; |
521 | x = mon->x; |
548 | y = mon->y; |
522 | y = mon->y; |
549 | m = mon->map; |
523 | m = mon->map; |
550 | dir = rv.direction; |
524 | dir = rv.direction; |
551 | lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ |
525 | lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ |
552 | diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); |
526 | diff = ::max (abs (rv.distance_x), abs (rv.distance_y)); |
|
|
527 | |
553 | /* If we can't solve it within the search distance, return now. */ |
528 | /* If we can't solve it within the search distance, return now. */ |
554 | if (diff > max) |
529 | if (diff > max) |
555 | return 0; |
530 | return 0; |
|
|
531 | |
556 | while (diff > 1 && max > 0) |
532 | while (diff > 1 && max > 0) |
557 | { |
533 | { |
558 | lastx = x; |
534 | lastx = x; |
559 | lasty = y; |
535 | lasty = y; |
560 | lastmap = m; |
536 | lastmap = m; |
… | |
… | |
642 | max--; |
618 | max--; |
643 | lastdir = dir; |
619 | lastdir = dir; |
644 | if (!firstdir) |
620 | if (!firstdir) |
645 | firstdir = dir; |
621 | firstdir = dir; |
646 | } |
622 | } |
|
|
623 | |
647 | if (diff <= 1) |
624 | if (diff <= 1) |
648 | { |
625 | { |
649 | /* Recalculate diff (distance) because we may not have actually |
626 | /* Recalculate diff (distance) because we may not have actually |
650 | * headed toward player for entire distance. |
627 | * headed toward player for entire distance. |
651 | */ |
628 | */ |
652 | get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); |
629 | get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); |
653 | diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); |
630 | diff = ::max (abs (rv.distance_x), abs (rv.distance_y)); |
654 | } |
631 | } |
|
|
632 | |
655 | if (diff > max) |
633 | if (diff > max) |
656 | return 0; |
634 | return 0; |
657 | } |
635 | } |
|
|
636 | |
658 | /* If we reached the max, didn't find a direction in time */ |
637 | /* If we reached the max, didn't find a direction in time */ |
659 | if (!max) |
638 | if (!max) |
660 | return 0; |
639 | return 0; |
661 | |
640 | |
662 | return firstdir; |
641 | return firstdir; |
… | |
… | |
776 | roll_stat (void) |
755 | roll_stat (void) |
777 | { |
756 | { |
778 | int a[4], i, j, k; |
757 | int a[4], i, j, k; |
779 | |
758 | |
780 | for (i = 0; i < 4; i++) |
759 | for (i = 0; i < 4; i++) |
781 | a[i] = (int) RANDOM () % 6 + 1; |
760 | a[i] = (int) rndm (6) + 1; |
782 | |
761 | |
783 | for (i = 0, j = 0, k = 7; i < 4; i++) |
762 | for (i = 0, j = 0, k = 7; i < 4; i++) |
784 | if (a[i] < k) |
763 | if (a[i] < k) |
785 | k = a[i], j = i; |
764 | k = a[i], j = i; |
786 | |
765 | |
… | |
… | |
898 | char buf[MAX_BUF]; |
877 | char buf[MAX_BUF]; |
899 | |
878 | |
900 | /* this must before then initial items are given */ |
879 | /* this must before then initial items are given */ |
901 | esrv_new_player (op->contr, op->weight + op->carrying); |
880 | esrv_new_player (op->contr, op->weight + op->carrying); |
902 | |
881 | |
903 | treasurelist *tl = find_treasurelist ("starting_wealth"); |
882 | treasurelist *tl = treasurelist::find ("starting_wealth"); |
904 | if (tl) |
883 | if (tl) |
905 | create_treasure (tl, op, 0, 0, 0); |
884 | create_treasure (tl, op, 0, 0, 0); |
906 | |
885 | |
907 | INVOKE_PLAYER (BIRTH, op->contr); |
886 | INVOKE_PLAYER (BIRTH, op->contr); |
908 | INVOKE_PLAYER (LOGIN, op->contr); |
887 | INVOKE_PLAYER (LOGIN, op->contr); |
… | |
… | |
916 | * to save here. |
895 | * to save here. |
917 | */ |
896 | */ |
918 | sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); |
897 | sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); |
919 | make_path_to_file (buf); |
898 | make_path_to_file (buf); |
920 | |
899 | |
921 | #ifdef AUTOSAVE |
|
|
922 | op->contr->last_save_tick = pticks; |
|
|
923 | #endif |
|
|
924 | start_info (op); |
900 | start_info (op); |
925 | CLEAR_FLAG (op, FLAG_WIZ); |
901 | CLEAR_FLAG (op, FLAG_WIZ); |
926 | give_initial_items (op, op->randomitems); |
902 | give_initial_items (op, op->randomitems); |
927 | link_player_skills (op); |
903 | link_player_skills (op); |
928 | esrv_send_inventory (op, op); |
904 | esrv_send_inventory (op, op); |
… | |
… | |
1054 | int |
1030 | int |
1055 | check_pick (object *op) |
1031 | check_pick (object *op) |
1056 | { |
1032 | { |
1057 | object *tmp, *next; |
1033 | object *tmp, *next; |
1058 | int stop = 0; |
1034 | int stop = 0; |
1059 | int j, k, wvratio; |
1035 | int wvratio; |
1060 | char putstring[128], tmpstr[16]; |
1036 | char putstring[128]; |
1061 | |
1037 | |
1062 | /* if you're flying, you cna't pick up anything */ |
1038 | /* if you're flying, you cna't pick up anything */ |
1063 | if (op->move_type & MOVE_FLYING) |
1039 | if (op->move_type & MOVE_FLYING) |
1064 | return 1; |
1040 | return 1; |
1065 | |
1041 | |
… | |
… | |
1402 | * found object is returned. |
1378 | * found object is returned. |
1403 | */ |
1379 | */ |
1404 | object * |
1380 | object * |
1405 | find_arrow (object *op, const char *type) |
1381 | find_arrow (object *op, const char *type) |
1406 | { |
1382 | { |
1407 | object *tmp = NULL; |
1383 | object *tmp = 0; |
1408 | |
1384 | |
1409 | for (op = op->inv; op; op = op->below) |
1385 | for (op = op->inv; op; op = op->below) |
1410 | if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) |
1386 | if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) |
1411 | tmp = find_arrow (op, type); |
1387 | tmp = find_arrow (op, type); |
1412 | else if (op->type == ARROW && op->race == type) |
1388 | else if (op->type == ARROW && op->race == type) |
1413 | return op; |
1389 | return op; |
|
|
1390 | |
1414 | return tmp; |
1391 | return tmp; |
1415 | } |
1392 | } |
1416 | |
1393 | |
1417 | /* |
1394 | /* |
1418 | * Similar to find_arrow, but looks for (roughly) the best arrow to use |
1395 | * Similar to find_arrow, but looks for (roughly) the best arrow to use |
1419 | * against the target. A full test is not performed, simply a basic test |
1396 | * against the target. A full test is not performed, simply a basic test |
1420 | * of resistances. The archer is making a quick guess at what he sees down |
1397 | * of resistances. The archer is making a quick guess at what he sees down |
1421 | * the hall. Failing that it does it's best to pick the highest plus arrow. |
1398 | * the hall. Failing that it does it's best to pick the highest plus arrow. |
1422 | */ |
1399 | */ |
1423 | |
|
|
1424 | object * |
1400 | object * |
1425 | find_better_arrow (object *op, object *target, const char *type, int *better) |
1401 | find_better_arrow (object *op, object *target, const char *type, int *better) |
1426 | { |
1402 | { |
1427 | object *tmp = NULL, *arrow, *ntmp; |
1403 | object *tmp = NULL, *arrow, *ntmp; |
1428 | int attacknum, attacktype, betterby = 0, i; |
1404 | int attacknum, attacktype, betterby = 0, i; |
… | |
… | |
1888 | new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type."); |
1864 | new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type."); |
1889 | return; |
1865 | return; |
1890 | } |
1866 | } |
1891 | } |
1867 | } |
1892 | |
1868 | |
1893 | |
|
|
1894 | |
|
|
1895 | /* find_key |
1869 | /* find_key |
1896 | * We try to find a key for the door as passed. If we find a key |
1870 | * We try to find a key for the door as passed. If we find a key |
1897 | * and successfully use it, we return the key, otherwise NULL |
1871 | * and successfully use it, we return the key, otherwise NULL |
1898 | * This function merges both normal and locked door, since the logic |
1872 | * This function merges both normal and locked door, since the logic |
1899 | * for both is the same - just the specific key is different. |
1873 | * for both is the same - just the specific key is different. |
1900 | * pl is the player, |
1874 | * pl is the player, |
1901 | * inv is the objects inventory to searched |
1875 | * inv is the objects inventory to searched |
1902 | * door is the door we are trying to match against. |
1876 | * door is the door we are trying to match against. |
1903 | * This function can be called recursively to search containers. |
1877 | * This function can be called recursively to search containers. |
1904 | */ |
1878 | */ |
1905 | |
|
|
1906 | object * |
1879 | object * |
1907 | find_key (object *pl, object *container, object *door) |
1880 | find_key (object *pl, object *container, object *door) |
1908 | { |
1881 | { |
1909 | object *tmp, *key; |
1882 | object *tmp, *key; |
1910 | |
1883 | |
1911 | /* Should not happen, but sanity checking is never bad */ |
1884 | /* Should not happen, but sanity checking is never bad */ |
1912 | if (container->inv == NULL) |
1885 | if (!container->inv) |
1913 | return NULL; |
1886 | return 0; |
1914 | |
1887 | |
1915 | /* First, lets try to find a key in the top level inventory */ |
1888 | /* First, lets try to find a key in the top level inventory */ |
1916 | for (tmp = container->inv; tmp != NULL; tmp = tmp->below) |
1889 | for (tmp = container->inv; tmp; tmp = tmp->below) |
1917 | { |
1890 | { |
1918 | if (door->type == DOOR && tmp->type == KEY) |
1891 | if (door->type == DOOR && tmp->type == KEY) |
1919 | break; |
1892 | break; |
1920 | /* For sanity, we should really check door type, but other stuff |
1893 | /* For sanity, we should really check door type, but other stuff |
1921 | * (like containers) can be locked with special keys |
1894 | * (like containers) can be locked with special keys |
1922 | */ |
1895 | */ |
1923 | if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) |
1896 | if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) |
1924 | break; |
1897 | break; |
1925 | } |
1898 | } |
|
|
1899 | |
1926 | /* No key found - lets search inventories now */ |
1900 | /* No key found - lets search inventories now */ |
1927 | /* If we find and use a key in an inventory, return at that time. |
1901 | /* If we find and use a key in an inventory, return at that time. |
1928 | * otherwise, if we search all the inventories and still don't find |
1902 | * otherwise, if we search all the inventories and still don't find |
1929 | * a key, return |
1903 | * a key, return |
1930 | */ |
1904 | */ |
1931 | if (!tmp) |
1905 | if (!tmp) |
1932 | { |
1906 | { |
1933 | for (tmp = container->inv; tmp != NULL; tmp = tmp->below) |
1907 | for (tmp = container->inv; tmp; tmp = tmp->below) |
1934 | { |
1908 | { |
1935 | /* No reason to search empty containers */ |
1909 | /* No reason to search empty containers */ |
1936 | if (tmp->type == CONTAINER && tmp->inv) |
1910 | if (tmp->type == CONTAINER && tmp->inv) |
1937 | { |
1911 | { |
1938 | if ((key = find_key (pl, tmp, door)) != NULL) |
1912 | if ((key = find_key (pl, tmp, door))) |
1939 | return key; |
1913 | return key; |
1940 | } |
1914 | } |
1941 | } |
1915 | } |
|
|
1916 | |
1942 | if (!tmp) |
1917 | if (!tmp) |
1943 | return NULL; |
1918 | return NULL; |
1944 | } |
1919 | } |
|
|
1920 | |
1945 | /* We get down here if we have found a key. Now if its in a container, |
1921 | /* We get down here if we have found a key. Now if its in a container, |
1946 | * see if we actually want to use it |
1922 | * see if we actually want to use it |
1947 | */ |
1923 | */ |
1948 | if (pl != container) |
1924 | if (pl != container) |
1949 | { |
1925 | { |
… | |
… | |
1970 | new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, |
1946 | new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, |
1971 | "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); |
1947 | "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); |
1972 | return NULL; |
1948 | return NULL; |
1973 | } |
1949 | } |
1974 | } |
1950 | } |
|
|
1951 | |
1975 | return tmp; |
1952 | return tmp; |
1976 | } |
1953 | } |
1977 | |
1954 | |
1978 | /* moved door processing out of move_player_attack. |
1955 | /* moved door processing out of move_player_attack. |
1979 | * returns 1 if player has opened the door with a key |
1956 | * returns 1 if player has opened the door with a key |
… | |
… | |
1997 | play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); |
1974 | play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); |
1998 | if (action_makes_visible (op)) |
1975 | if (action_makes_visible (op)) |
1999 | make_visible (op); |
1976 | make_visible (op); |
2000 | if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) |
1977 | if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) |
2001 | spring_trap (door->inv, op); |
1978 | spring_trap (door->inv, op); |
|
|
1979 | |
2002 | if (door->type == DOOR) |
1980 | if (door->type == DOOR) |
2003 | { |
|
|
2004 | hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ |
1981 | hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ |
2005 | } |
|
|
2006 | else if (door->type == LOCKED_DOOR) |
1982 | else if (door->type == LOCKED_DOOR) |
2007 | { |
1983 | { |
2008 | new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); |
1984 | new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); |
2009 | remove_door2 (door); /* remove door without violence ;-) */ |
1985 | remove_door2 (door); /* remove door without violence ;-) */ |
2010 | } |
1986 | } |
|
|
1987 | |
2011 | /* Do this after we print the message */ |
1988 | /* Do this after we print the message */ |
2012 | decrease_ob (key); /* Use up one of the keys */ |
1989 | decrease_ob (key); /* Use up one of the keys */ |
2013 | /* Need to update the weight the container the key was in */ |
1990 | /* Need to update the weight the container the key was in */ |
2014 | if (container != op) |
1991 | if (container != op) |
2015 | esrv_update_item (UPD_WEIGHT, op, container); |
1992 | esrv_update_item (UPD_WEIGHT, op, container); |
|
|
1993 | |
2016 | return 1; /* Nothing more to do below */ |
1994 | return 1; /* Nothing more to do below */ |
2017 | } |
1995 | } |
2018 | else if (door->type == LOCKED_DOOR) |
1996 | else if (door->type == LOCKED_DOOR) |
2019 | { |
1997 | { |
2020 | /* Might as well return now - no other way to open this */ |
1998 | /* Might as well return now - no other way to open this */ |
2021 | new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); |
1999 | new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); |
2022 | return 1; |
2000 | return 1; |
2023 | } |
2001 | } |
|
|
2002 | |
2024 | return 0; |
2003 | return 0; |
2025 | } |
2004 | } |
2026 | |
2005 | |
2027 | /* This function is just part of a breakup from move_player. |
2006 | /* This function is just part of a breakup from move_player. |
2028 | * It should keep the code cleaner. |
2007 | * It should keep the code cleaner. |
… | |
… | |
2234 | return 0; |
2213 | return 0; |
2235 | } |
2214 | } |
2236 | |
2215 | |
2237 | /* peterm: added following line */ |
2216 | /* peterm: added following line */ |
2238 | if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) |
2217 | if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) |
2239 | dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); |
2218 | dir = absdir (dir + rndm (3) + rndm (3) - 2); |
2240 | |
2219 | |
2241 | op->facing = dir; |
2220 | op->facing = dir; |
2242 | |
2221 | |
2243 | if (op->hide) |
2222 | if (op->hide) |
2244 | do_hidden_move (op); |
2223 | do_hidden_move (op); |
… | |
… | |
2277 | * Returns true if there are more actions we can do. |
2256 | * Returns true if there are more actions we can do. |
2278 | */ |
2257 | */ |
2279 | int |
2258 | int |
2280 | handle_newcs_player (object *op) |
2259 | handle_newcs_player (object *op) |
2281 | { |
2260 | { |
2282 | if (op->contr->hidden) |
|
|
2283 | { |
|
|
2284 | op->invisible = 1000; |
|
|
2285 | /* the socket code flashes the player visible/invisible |
|
|
2286 | * depending on the value of invisible, so we need to |
|
|
2287 | * alternate it here for it to work correctly. |
|
|
2288 | */ |
|
|
2289 | if (pticks & 2) |
|
|
2290 | op->invisible--; |
|
|
2291 | } |
|
|
2292 | else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS))) |
|
|
2293 | { |
|
|
2294 | op->invisible--; |
|
|
2295 | if (!op->invisible) |
|
|
2296 | { |
|
|
2297 | make_visible (op); |
|
|
2298 | new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out."); |
|
|
2299 | } |
|
|
2300 | } |
|
|
2301 | |
|
|
2302 | if (QUERY_FLAG (op, FLAG_SCARED)) |
2261 | if (QUERY_FLAG (op, FLAG_SCARED)) |
2303 | { |
2262 | { |
2304 | flee_player (op); |
2263 | flee_player (op); |
2305 | /* If player is still scared, that is his action for this tick */ |
2264 | /* If player is still scared, that is his action for this tick */ |
2306 | if (QUERY_FLAG (op, FLAG_SCARED)) |
2265 | if (QUERY_FLAG (op, FLAG_SCARED)) |
… | |
… | |
2385 | * from. |
2344 | * from. |
2386 | */ |
2345 | */ |
2387 | void |
2346 | void |
2388 | remove_unpaid_objects (object *op, object *env) |
2347 | remove_unpaid_objects (object *op, object *env) |
2389 | { |
2348 | { |
2390 | object *next; |
|
|
2391 | |
|
|
2392 | while (op) |
2349 | while (op) |
2393 | { |
2350 | { |
2394 | object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ |
2351 | object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ |
2395 | |
2352 | |
2396 | if (QUERY_FLAG (op, FLAG_UNPAID)) |
2353 | if (QUERY_FLAG (op, FLAG_UNPAID)) |
… | |
… | |
2462 | int rate_grace = 2000; |
2419 | int rate_grace = 2000; |
2463 | const int max_hp = 1; |
2420 | const int max_hp = 1; |
2464 | const int max_sp = 1; |
2421 | const int max_sp = 1; |
2465 | const int max_grace = 1; |
2422 | const int max_grace = 1; |
2466 | |
2423 | |
|
|
2424 | if (op->contr->hidden) |
|
|
2425 | { |
|
|
2426 | op->invisible = 1000; |
|
|
2427 | /* the socket code flashes the player visible/invisible |
|
|
2428 | * depending on the value of invisible, so we need to |
|
|
2429 | * alternate it here for it to work correctly. |
|
|
2430 | */ |
|
|
2431 | if (pticks & 2) |
|
|
2432 | op->invisible--; |
|
|
2433 | } |
|
|
2434 | else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS))) |
|
|
2435 | { |
|
|
2436 | if (!op->invisible--) |
|
|
2437 | { |
|
|
2438 | make_visible (op); |
|
|
2439 | new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out."); |
|
|
2440 | } |
|
|
2441 | } |
|
|
2442 | |
2467 | if (op->contr->outputs_sync) |
2443 | if (op->contr->outputs_sync) |
2468 | { |
|
|
2469 | for (i = 0; i < NUM_OUTPUT_BUFS; i++) |
2444 | for (i = 0; i < NUM_OUTPUT_BUFS; i++) |
2470 | if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) |
2445 | if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) |
2471 | flush_output_element (op, &op->contr->outputs[i]); |
2446 | flush_output_element (op, &op->contr->outputs[i]); |
2472 | } |
|
|
2473 | |
2447 | |
2474 | if (op->contr->ns->state == ST_PLAYING) |
2448 | if (op->contr->ns->state == ST_PLAYING) |
2475 | { |
2449 | { |
2476 | /* these next three if clauses make it possible to SLOW DOWN |
2450 | /* these next three if clauses make it possible to SLOW DOWN |
2477 | hp/grace/spellpoint regeneration. */ |
2451 | hp/grace/spellpoint regeneration. */ |
… | |
… | |
2726 | tmp->name = buf; |
2700 | tmp->name = buf; |
2727 | sprintf (buf, " This finger has been cut off %s\n" |
2701 | sprintf (buf, " This finger has been cut off %s\n" |
2728 | " the %s, when he was defeated at\n level %d by %s.\n", |
2702 | " the %s, when he was defeated at\n level %d by %s.\n", |
2729 | &op->name, op->contr->title, (int) (op->level), op->contr->killer); |
2703 | &op->name, op->contr->title, (int) (op->level), op->contr->killer); |
2730 | tmp->msg = buf; |
2704 | tmp->msg = buf; |
2731 | tmp->value = 0, tmp->material = 0, tmp->type = 0; |
2705 | tmp->value = 0, tmp->type = 0; |
2732 | tmp->materialname = NULL; |
2706 | tmp->materialname = "organics"; |
2733 | tmp->insert_at (op, tmp); |
2707 | tmp->insert_at (op, tmp); |
2734 | } |
2708 | } |
2735 | |
2709 | |
2736 | /* teleport defeated player to new destination */ |
2710 | /* teleport defeated player to new destination */ |
2737 | transfer_ob (op, x, y, 0, NULL); |
2711 | transfer_ob (op, x, y, 0, NULL); |
… | |
… | |
2933 | op->stats.hp = op->stats.maxhp; |
2907 | op->stats.hp = op->stats.maxhp; |
2934 | op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); |
2908 | op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); |
2935 | op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); |
2909 | op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); |
2936 | |
2910 | |
2937 | /* |
2911 | /* |
2938 | * Check to see if the player is in a shop. IF so, then check to see if |
|
|
2939 | * the player has any unpaid items. If so, remove them and put them back |
2912 | * Check to see if the player has any unpaid items. If so, remove them |
2940 | * in the map. |
2913 | * and put them back in the map. |
2941 | */ |
2914 | */ |
2942 | |
|
|
2943 | if (is_in_shop (op)) |
|
|
2944 | remove_unpaid_objects (op->inv, op); |
2915 | remove_unpaid_objects (op->inv, op); |
2945 | |
2916 | |
2946 | /****************************************/ |
2917 | /****************************************/ |
2947 | /* */ |
2918 | /* */ |
2948 | /* Move player to his current respawn- */ |
2919 | /* Move player to his current respawn- */ |
2949 | /* position (usually last savebed) */ |
2920 | /* position (usually last savebed) */ |
… | |
… | |
2989 | void |
2960 | void |
2990 | loot_object (object *op) |
2961 | loot_object (object *op) |
2991 | { /* Grab and destroy some treasure */ |
2962 | { /* Grab and destroy some treasure */ |
2992 | object *tmp, *tmp2, *next; |
2963 | object *tmp, *tmp2, *next; |
2993 | |
2964 | |
2994 | if (op->container) |
2965 | op->close_container (); /* close open sack first */ |
2995 | esrv_apply_container (op, op->container); /* close open sack first */ |
|
|
2996 | |
2966 | |
2997 | for (tmp = op->inv; tmp; tmp = next) |
2967 | for (tmp = op->inv; tmp; tmp = next) |
2998 | { |
2968 | { |
2999 | next = tmp->below; |
2969 | next = tmp->below; |
3000 | |
2970 | |
3001 | if (tmp->invisible) |
2971 | if (tmp->invisible) |
3002 | continue; |
2972 | continue; |
3003 | |
2973 | |
3004 | tmp->remove (); |
2974 | tmp->remove (); |
3005 | tmp->x = op->x, tmp->y = op->y; |
2975 | tmp->x = op->x, tmp->y = op->y; |
|
|
2976 | |
3006 | if (tmp->type == CONTAINER) |
2977 | if (tmp->type == CONTAINER) |
3007 | { /* empty container to ground */ |
2978 | loot_object (tmp); /* empty container to ground */ |
3008 | loot_object (tmp); |
2979 | |
3009 | } |
|
|
3010 | if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) |
2980 | if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3)))) |
3011 | { |
2981 | { |
3012 | if (tmp->nrof > 1) |
2982 | if (tmp->nrof > 1) |
3013 | { |
2983 | { |
3014 | tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); |
2984 | tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); |
3015 | tmp2->destroy (); |
2985 | tmp2->destroy (); |
… | |
… | |
3026 | /* |
2996 | /* |
3027 | * fix_weight(): Check recursively the weight of all players, and fix |
2997 | * fix_weight(): Check recursively the weight of all players, and fix |
3028 | * what needs to be fixed. Refresh windows and fix speed if anything |
2998 | * what needs to be fixed. Refresh windows and fix speed if anything |
3029 | * was changed. |
2999 | * was changed. |
3030 | */ |
3000 | */ |
3031 | |
|
|
3032 | void |
3001 | void |
3033 | fix_weight (void) |
3002 | fix_weight (void) |
3034 | { |
3003 | { |
3035 | for_all_players (pl) |
3004 | for_all_players (pl) |
3036 | { |
3005 | { |
… | |
… | |
3096 | if (op->type == PLAYER) |
3065 | if (op->type == PLAYER) |
3097 | { |
3066 | { |
3098 | op->contr->tmp_invis = 0; |
3067 | op->contr->tmp_invis = 0; |
3099 | op->contr->invis_race = 0; |
3068 | op->contr->invis_race = 0; |
3100 | } |
3069 | } |
|
|
3070 | |
3101 | update_object (op, UP_OBJ_FACE); |
3071 | update_object (op, UP_OBJ_CHANGE); |
3102 | } |
3072 | } |
3103 | |
3073 | |
3104 | int |
3074 | int |
3105 | is_true_undead (object *op) |
3075 | is_true_undead (object *op) |
3106 | { |
3076 | { |
3107 | object *tmp = NULL; |
|
|
3108 | |
|
|
3109 | if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) |
3077 | if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) |
3110 | return 1; |
3078 | return 1; |
3111 | |
3079 | |
3112 | return 0; |
3080 | return 0; |
3113 | } |
3081 | } |
… | |
… | |
3401 | char buf[MAX_BUF]; /* tmp. string buffer */ |
3369 | char buf[MAX_BUF]; /* tmp. string buffer */ |
3402 | int i = 0, j = 0; |
3370 | int i = 0, j = 0; |
3403 | |
3371 | |
3404 | /* get the appropriate treasurelist */ |
3372 | /* get the appropriate treasurelist */ |
3405 | if (atnr == ATNR_FIRE) |
3373 | if (atnr == ATNR_FIRE) |
3406 | trlist = find_treasurelist ("dragon_ability_fire"); |
3374 | trlist = treasurelist::find ("dragon_ability_fire"); |
3407 | else if (atnr == ATNR_COLD) |
3375 | else if (atnr == ATNR_COLD) |
3408 | trlist = find_treasurelist ("dragon_ability_cold"); |
3376 | trlist = treasurelist::find ("dragon_ability_cold"); |
3409 | else if (atnr == ATNR_ELECTRICITY) |
3377 | else if (atnr == ATNR_ELECTRICITY) |
3410 | trlist = find_treasurelist ("dragon_ability_elec"); |
3378 | trlist = treasurelist::find ("dragon_ability_elec"); |
3411 | else if (atnr == ATNR_POISON) |
3379 | else if (atnr == ATNR_POISON) |
3412 | trlist = find_treasurelist ("dragon_ability_poison"); |
3380 | trlist = treasurelist::find ("dragon_ability_poison"); |
3413 | |
3381 | |
3414 | if (trlist == NULL || who->type != PLAYER) |
3382 | if (trlist == NULL || who->type != PLAYER) |
3415 | return; |
3383 | return; |
3416 | |
3384 | |
3417 | for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); |
3385 | for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); |
… | |
… | |
3549 | * not readied. |
3517 | * not readied. |
3550 | */ |
3518 | */ |
3551 | void |
3519 | void |
3552 | player_unready_range_ob (player *pl, object *ob) |
3520 | player_unready_range_ob (player *pl, object *ob) |
3553 | { |
3521 | { |
3554 | rangetype i; |
|
|
3555 | |
|
|
3556 | for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) |
3522 | for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) |
3557 | { |
|
|
3558 | if (pl->ranges[i] == ob) |
3523 | if (pl->ranges[i] == ob) |
3559 | { |
3524 | { |
3560 | pl->ranges[i] = NULL; |
3525 | pl->ranges[i] = 0; |
3561 | if (pl->shoottype == i) |
3526 | if (pl->shoottype == i) |
3562 | { |
|
|
3563 | pl->shoottype = range_none; |
3527 | pl->shoottype = range_none; |
3564 | } |
|
|
3565 | } |
3528 | } |
3566 | } |
|
|
3567 | } |
3529 | } |
|
|
3530 | |
|
|
3531 | sint8 |
|
|
3532 | player::visibility_at (maptile *map, int x, int y) const |
|
|
3533 | { |
|
|
3534 | if (!ns) |
|
|
3535 | return 0; |
|
|
3536 | |
|
|
3537 | int dx, dy; |
|
|
3538 | if (!adjacent_map (map, ns->current_map, &dx, &dy)) |
|
|
3539 | return 0; |
|
|
3540 | |
|
|
3541 | x += dx - ns->current_x + ns->mapx / 2; |
|
|
3542 | y += dy - ns->current_y + ns->mapy / 2; |
|
|
3543 | |
|
|
3544 | if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy)) |
|
|
3545 | return 0; |
|
|
3546 | |
|
|
3547 | return 100 - blocked_los [x][y]; |
|
|
3548 | } |