ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/apply.C
(Generate patch)

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.38 by root, Tue Dec 12 22:37:05 2006 UTC vs.
Revision 1.59 by pippijn, Sat Jan 6 14:42:30 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
3 3
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
6 7
7 This program is free software; you can redistribute it and/or modify 8 This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 it under the terms of the GNU General Public License as published by
… …
25#include <living.h> 26#include <living.h>
26#include <spells.h> 27#include <spells.h>
27#include <skills.h> 28#include <skills.h>
28#include <tod.h> 29#include <tod.h>
29 30
30#ifndef __CEXTRACT__
31# include <sproto.h> 31#include <sproto.h>
32#endif
33 32
34/* Want this regardless of rplay. */ 33/* Want this regardless of rplay. */
35#include <sounds.h> 34#include <sounds.h>
36 35
37/* need math lib for double-precision and pow() in dragon_eat_flesh() */ 36/* need math lib for double-precision and pow() in dragon_eat_flesh() */
… …
195apply_potion (object *op, object *tmp) 194apply_potion (object *op, object *tmp)
196{ 195{
197 int got_one = 0, i; 196 int got_one = 0, i;
198 object *force = 0, *floor = 0; 197 object *force = 0, *floor = 0;
199 198
200 floor = get_map_ob (op->map, op->x, op->y); 199 floor = GET_MAP_OB (op->map, op->x, op->y);
201 200
202 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 201 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
203 { 202 {
204 if (op->type == PLAYER) 203 if (op->type == PLAYER)
205 new_draw_info (NDI_UNIQUE, 0, op, "Gods prevent you from using this here, it's sacred ground!"); 204 new_draw_info (NDI_UNIQUE, 0, op, "Gods prevent you from using this here, it's sacred ground!");
… …
219 object *depl; 218 object *depl;
220 archetype *at; 219 archetype *at;
221 220
222 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 221 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
223 { 222 {
224 drain_stat (op); 223 op->drain_stat ();
225 fix_player (op); 224 op->update_stats ();
226 decrease_ob (tmp); 225 decrease_ob (tmp);
227 return 1; 226 return 1;
228 } 227 }
229 228
230 if ((at = archetype::find (ARCH_DEPLETION)) == NULL) 229 if (!(at = archetype::find (ARCH_DEPLETION)))
231 { 230 {
232 LOG (llevError, "Could not find archetype depletion\n"); 231 LOG (llevError, "Could not find archetype depletion\n");
233 return 0; 232 return 0;
234 } 233 }
235 depl = present_arch_in_ob (at, op); 234 depl = present_arch_in_ob (at, op);
236 235
237 if (depl != NULL) 236 if (depl)
238 { 237 {
239 for (i = 0; i < NUM_STATS; i++) 238 for (i = 0; i < NUM_STATS; i++)
240 if (get_attr_value (&depl->stats, i)) 239 if (get_attr_value (&depl->stats, i))
241 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]); 240 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]);
242 241
243 depl->destroy (); 242 depl->destroy ();
244 fix_player (op); 243 op->update_stats ();
245 } 244 }
246 else 245 else
247 new_draw_info (NDI_UNIQUE, 0, op, "You potion had no effect."); 246 new_draw_info (NDI_UNIQUE, 0, op, "You potion had no effect.");
248 247
249 decrease_ob (tmp); 248 decrease_ob (tmp);
… …
299 298
300 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)) 299 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))
301 { 300 {
302 if (got_one) 301 if (got_one)
303 { 302 {
304 fix_player (op); 303 op->update_stats ();
305 new_draw_info (NDI_UNIQUE, 0, op, "The Gods smile upon you and remake you"); 304 new_draw_info (NDI_UNIQUE, 0, op, "The Gods smile upon you and remake you");
306 new_draw_info (NDI_UNIQUE, 0, op, "a little more in their image."); 305 new_draw_info (NDI_UNIQUE, 0, op, "a little more in their image.");
307 new_draw_info (NDI_UNIQUE, 0, op, "You feel a little more perfect."); 306 new_draw_info (NDI_UNIQUE, 0, op, "You feel a little more perfect.");
308 } 307 }
309 else 308 else
… …
311 } 310 }
312 else 311 else
313 { /* cursed potion */ 312 { /* cursed potion */
314 if (got_one) 313 if (got_one)
315 { 314 {
316 fix_player (op); 315 op->update_stats ();
317 new_draw_info (NDI_UNIQUE, 0, op, "The Gods are angry and punish you."); 316 new_draw_info (NDI_UNIQUE, 0, op, "The Gods are angry and punish you.");
318 } 317 }
319 else 318 else
320 new_draw_info (NDI_UNIQUE, 0, op, "You are fortunate that you are so pathetic."); 319 new_draw_info (NDI_UNIQUE, 0, op, "You are fortunate that you are so pathetic.");
321 } 320 }
… …
349 cast_spell (op, tmp, op->facing, tmp->inv, NULL); 348 cast_spell (op, tmp, op->facing, tmp->inv, NULL);
350 349
351 decrease_ob (tmp); 350 decrease_ob (tmp);
352 /* if youre dead, no point in doing this... */ 351 /* if youre dead, no point in doing this... */
353 if (!QUERY_FLAG (op, FLAG_REMOVED)) 352 if (!QUERY_FLAG (op, FLAG_REMOVED))
354 fix_player (op); 353 op->update_stats ();
355 return 1; 354 return 1;
356 } 355 }
357 356
358 /* Deal with protection potions */ 357 /* Deal with protection potions */
359 force = NULL; 358 force = NULL;
… …
403 * that were grouped with the one consumed, his 402 * that were grouped with the one consumed, his
404 * stat will not be raised by them. fix_player just clears 403 * stat will not be raised by them. fix_player just clears
405 * up all the stats. 404 * up all the stats.
406 */ 405 */
407 CLEAR_FLAG (tmp, FLAG_APPLIED); 406 CLEAR_FLAG (tmp, FLAG_APPLIED);
408 fix_player (op); 407 op->update_stats ();
409 decrease_ob (tmp); 408 decrease_ob (tmp);
410 return 1; 409 return 1;
411} 410}
412 411
413/**************************************************************************** 412/****************************************************************************
… …
570 weapon->last_eat++; 569 weapon->last_eat++;
571 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon's bonus to %s improved by %d", statname, sacrifice_count); 570 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon's bonus to %s improved by %d", statname, sacrifice_count);
572 decrease_ob (improver); 571 decrease_ob (improver);
573 572
574 /* So it updates the players stats and the window */ 573 /* So it updates the players stats and the window */
575 fix_player (op); 574 op->update_stats ();
576 return 1; 575 return 1;
577} 576}
578 577
579/* Types of improvements, hidden in the sp field. */ 578/* Types of improvements, hidden in the sp field. */
580#define IMPROVE_PREPARE 1 579#define IMPROVE_PREPARE 1
… …
883 882
884 if (op->type == PLAYER) 883 if (op->type == PLAYER)
885 { 884 {
886 esrv_send_item (op, armour); 885 esrv_send_item (op, armour);
887 if (QUERY_FLAG (armour, FLAG_APPLIED)) 886 if (QUERY_FLAG (armour, FLAG_APPLIED))
888 fix_player (op); 887 op->update_stats ();
889 } 888 }
890 decrease_ob (improver); 889 decrease_ob (improver);
891 if (tmp) 890 if (tmp)
892 { 891 {
893 insert_ob_in_ob (tmp, op); 892 insert_ob_in_ob (tmp, op);
… …
980 else 979 else
981 { 980 {
982 if (converter->other_arch == NULL) 981 if (converter->other_arch == NULL)
983 { 982 {
984 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n", 983 LOG (llevError, "move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n",
985 &converter->name, converter->map->path, converter->x, converter->y); 984 &converter->name, &converter->map->path, converter->x, converter->y);
986 return -1; 985 return -1;
987 } 986 }
988 987
989 item = object_create_arch (converter->other_arch); 988 item = object_create_arch (converter->other_arch);
990 fix_generated_item (item, converter, 0, 0, GT_MINIMAL); 989 fix_generated_item (item, converter, 0, 0, GT_MINIMAL);
… …
997 if (is_in_shop (converter)) 996 if (is_in_shop (converter))
998 SET_FLAG (item, FLAG_UNPAID); 997 SET_FLAG (item, FLAG_UNPAID);
999 else if (price_in < item->nrof * item->value) 998 else if (price_in < item->nrof * item->value)
1000 { 999 {
1001 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 1000 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
1002 &converter->name, converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name); 1001 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1003 1002
1004 /** 1003 /**
1005 * elmex: we are going to let the game continue, as the mapcreator 1004 * elmex: we are going to let the game continue, as the mapcreator
1006 * propably had something in mind when doing this 1005 * propably had something in mind when doing this
1007 */ 1006 */
… …
1029 if (sack == NULL || sack->type != CONTAINER) 1028 if (sack == NULL || sack->type != CONTAINER)
1030 { 1029 {
1031 LOG (llevError, "apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]"); 1030 LOG (llevError, "apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]");
1032 return 0; 1031 return 0;
1033 } 1032 }
1034 op->contr->last_used = NULL; 1033
1035 op->contr->last_used_id = 0; 1034 op->contr->last_used = 0;
1036 1035
1037 if (sack->env != op) 1036 if (sack->env != op)
1038 { 1037 {
1039 if (sack->other_arch == NULL || sack->env != NULL) 1038 if (sack->other_arch == NULL || sack->env != NULL)
1040 { 1039 {
1041 new_draw_info (NDI_UNIQUE, 0, op, "You must get it first."); 1040 new_draw_info (NDI_UNIQUE, 0, op, "You must get it first.");
1042 return 1; 1041 return 1;
1043 } 1042 }
1043
1044 /* It's on the ground, the problems begin */ 1044 /* It's on the ground, the problems begin */
1045 if (op->container != sack) 1045 if (op->container != sack)
1046 { 1046 {
1047 /* it's closed OR some player has opened it */ 1047 /* it's closed OR some player has opened it */
1048 if (QUERY_FLAG (sack, FLAG_APPLIED)) 1048 if (QUERY_FLAG (sack, FLAG_APPLIED))
1049 { 1049 {
1050 for (tmp = get_map_ob (sack->map, sack->x, sack->y); tmp && tmp->container != sack; tmp = tmp->above); 1050 for (tmp = GET_MAP_OB (sack->map, sack->x, sack->y); tmp && tmp->container != sack; tmp = tmp->above);
1051 if (tmp) 1051 if (tmp)
1052 { 1052 {
1053 /* some other player have opened it */ 1053 /* some other player have opened it */
1054 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already occupied.", query_name (sack)); 1054 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already occupied.", query_name (sack));
1055 return 1; 1055 return 1;
… …
1119 tmp = find_key (op, op, sack); 1119 tmp = find_key (op, op, sack);
1120 if (tmp) 1120 if (tmp)
1121 { 1121 {
1122 sprintf (buf, "You unlock %s with %s.", query_name (sack), query_name (tmp)); 1122 sprintf (buf, "You unlock %s with %s.", query_name (sack), query_name (tmp));
1123 SET_FLAG (sack, FLAG_APPLIED); 1123 SET_FLAG (sack, FLAG_APPLIED);
1124
1124 if (sack->env == NULL) 1125 if (sack->env == NULL)
1125 { /* if it's on ground,open it also */ 1126 { /* if it's on ground,open it also */
1126 new_draw_info (NDI_UNIQUE, 0, op, buf); 1127 new_draw_info (NDI_UNIQUE, 0, op, buf);
1127 apply_container (op, sack); 1128 apply_container (op, sack);
1128 return 1; 1129 return 1;
1129 } 1130 }
1130 } 1131 }
1131 else 1132 else
1132 {
1133 sprintf (buf, "You don't have the key to unlock %s.", query_name (sack)); 1133 sprintf (buf, "You don't have the key to unlock %s.", query_name (sack));
1134 }
1135 } 1134 }
1136 else 1135 else
1137 { 1136 {
1138 sprintf (buf, "You readied %s.", query_name (sack)); 1137 sprintf (buf, "You readied %s.", query_name (sack));
1139 SET_FLAG (sack, FLAG_APPLIED); 1138 SET_FLAG (sack, FLAG_APPLIED);
1139
1140 if (sack->env == NULL) 1140 if (sack->env == NULL)
1141 { /* if it's on ground,open it also */ 1141 { /* if it's on ground,open it also */
1142 new_draw_info (NDI_UNIQUE, 0, op, buf); 1142 new_draw_info (NDI_UNIQUE, 0, op, buf);
1143 apply_container (op, sack); 1143 apply_container (op, sack);
1144 return 1; 1144 return 1;
1145 } 1145 }
1146 } 1146 }
1147 } 1147 }
1148
1148 new_draw_info (NDI_UNIQUE, 0, op, buf); 1149 new_draw_info (NDI_UNIQUE, 0, op, buf);
1150
1149 if (op->contr) 1151 if (op->contr)
1150 op->contr->socket.update_look = 1; 1152 op->contr->ns->floorbox_update ();
1153
1151 return 1; 1154 return 1;
1152} 1155}
1153 1156
1154/** 1157/**
1155 * Eneq(@csd.uu.se): Handle apply on containers. This is for containers 1158 * Eneq(@csd.uu.se): Handle apply on containers. This is for containers
… …
1675 if (victim->type == PLAYER && EXIT_PATH (trap)) 1678 if (victim->type == PLAYER && EXIT_PATH (trap))
1676 { 1679 {
1677 /* Basically, don't show exits leading to random maps the 1680 /* Basically, don't show exits leading to random maps the
1678 * players output. 1681 * players output.
1679 */ 1682 */
1680 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2) && strncmp (EXIT_PATH (trap), "/random/", 8)) 1683 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2))
1681 new_draw_info (NDI_NAVY, 0, victim, trap->msg); 1684 new_draw_info (NDI_NAVY, 0, victim, trap->msg);
1685
1682 enter_exit (victim, trap); 1686 victim->enter_exit (trap);
1683 } 1687 }
1684 goto leave; 1688 goto leave;
1685 1689
1686 case ENCOUNTER: 1690 case ENCOUNTER:
1687 /* may be some leftovers on this */ 1691 /* may be some leftovers on this */
… …
1786 1790
1787 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1791 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1788 { 1792 {
1789 /*exp_gain *= 2; because they just identified it too */ 1793 /*exp_gain *= 2; because they just identified it too */
1790 SET_FLAG (tmp, FLAG_IDENTIFIED); 1794 SET_FLAG (tmp, FLAG_IDENTIFIED);
1795
1791 /* If in a container, update how it looks */ 1796 /* If in a container, update how it looks */
1792 if (tmp->env) 1797 if (tmp->env)
1793 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1798 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1794 else 1799 else
1795 op->contr->socket.update_look = 1; 1800 op->contr->ns->floorbox_update ();
1796 } 1801 }
1802
1797 change_exp (op, exp_gain, skill_ob->skill, 0); 1803 change_exp (op, exp_gain, skill_ob->skill, 0);
1798 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */ 1804 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1799 } 1805 }
1800} 1806}
1801 1807
… …
1850 } 1856 }
1851 return; 1857 return;
1852 } 1858 }
1853 1859
1854 play_sound_player_only (op->contr, SOUND_LEARN_SPELL, 0, 0); 1860 play_sound_player_only (op->contr, SOUND_LEARN_SPELL, 0, 0);
1855 tmp = object::create (); 1861 tmp = spell->clone ();
1856 spell->copy_to (tmp);
1857 insert_ob_in_ob (tmp, op); 1862 insert_ob_in_ob (tmp, op);
1858 1863
1859 if (special_prayer) 1864 if (special_prayer)
1860 {
1861 SET_FLAG (tmp, FLAG_STARTEQUIP); 1865 SET_FLAG (tmp, FLAG_STARTEQUIP);
1862 }
1863 1866
1864 esrv_add_spells (op->contr, tmp); 1867 esrv_add_spells (op->contr, tmp);
1865} 1868}
1866 1869
1867/** 1870/**
… …
1951 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name); 1954 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name);
1952 1955
1953 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1956 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1954 { 1957 {
1955 identify (tmp); 1958 identify (tmp);
1959
1956 if (tmp->env) 1960 if (tmp->env)
1957 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1961 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1958 else 1962 else
1959 op->contr->socket.update_look = 1; 1963 op->contr->ns->floorbox_update ();
1960 } 1964 }
1961 1965
1962 /* I removed the check for special_prayer_mark here - it didn't make 1966 /* I removed the check for special_prayer_mark here - it didn't make
1963 * a lot of sense - special prayers are not found in spellbooks, and 1967 * a lot of sense - special prayers are not found in spellbooks, and
1964 * if the player doesn't know the spell, doesn't make a lot of sense that 1968 * if the player doesn't know the spell, doesn't make a lot of sense that
… …
2324 2328
2325 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95) 2329 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)
2326 { 2330 {
2327 /* resistance increased! */ 2331 /* resistance increased! */
2328 skin->resist[i]++; 2332 skin->resist[i]++;
2329 fix_player (op); 2333 op->update_stats ();
2330 2334
2331 sprintf (buf, "Your skin is now more resistant to %s!", change_resist_msg[i]); 2335 sprintf (buf, "Your skin is now more resistant to %s!", change_resist_msg[i]);
2332 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, buf); 2336 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, buf);
2333 } 2337 }
2334 2338
… …
2353 } 2357 }
2354 } 2358 }
2355 return 1; 2359 return 1;
2356} 2360}
2357 2361
2358static void
2359apply_savebed (object *pl)
2360{
2361#ifndef COZY_SERVER
2362 if (!pl->contr->name_changed || !pl->stats.exp)
2363 {
2364 new_draw_info (NDI_UNIQUE, 0, pl, "You don't deserve to save your character yet.");
2365 return;
2366 }
2367#endif
2368 INVOKE_PLAYER (LOGOUT, pl->contr);
2369 /* Need to call terminate_all_pets() before we remove the player ob */
2370 terminate_all_pets (pl);
2371 pl->remove ();
2372 pl->direction = 0;
2373 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, pl, "%s leaves the game.", &pl->name);
2374
2375 /* update respawn position */
2376 strcpy (pl->contr->savebed_map, pl->map->path);
2377 pl->contr->bed_x = pl->x;
2378 pl->contr->bed_y = pl->y;
2379
2380 strcpy (pl->contr->killer, "left");
2381 check_score (pl); /* Always check score */
2382 (void) save_player (pl, 0);
2383 pl->map->players--;
2384#if MAP_MAXTIMEOUT
2385 MAP_SWAP_TIME (pl->map) = MAP_TIMEOUT (pl->map);
2386#endif
2387 play_again (pl);
2388 pl->speed = 0;
2389 update_ob_speed (pl);
2390}
2391
2392/** 2362/**
2393 * Handles applying an improve armor scroll. 2363 * Handles applying an improve armor scroll.
2394 * Does some sanity checks, then calls improve_armour. 2364 * Does some sanity checks, then calls improve_armour.
2395 */ 2365 */
2396static void 2366static void
… …
2401 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 2371 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC))
2402 { 2372 {
2403 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 2373 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll.");
2404 return; 2374 return;
2405 } 2375 }
2376
2406 armor = find_marked_object (op); 2377 armor = find_marked_object (op);
2378
2407 if (!armor) 2379 if (!armor)
2408 { 2380 {
2409 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object."); 2381 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object.");
2410 return; 2382 return;
2411 } 2383 }
2384
2412 if (armor->type != ARMOUR 2385 if (armor->type != ARMOUR
2413 && armor->type != CLOAK 2386 && armor->type != CLOAK
2414 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET) 2387 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET)
2415 { 2388 {
2416 new_draw_info (NDI_UNIQUE, 0, op, "Your marked item is not armour!\n"); 2389 new_draw_info (NDI_UNIQUE, 0, op, "Your marked item is not armour!\n");
… …
2419 2392
2420 new_draw_info (NDI_UNIQUE, 0, op, "Applying armour enchantment."); 2393 new_draw_info (NDI_UNIQUE, 0, op, "Applying armour enchantment.");
2421 improve_armour (op, tmp, armor); 2394 improve_armour (op, tmp, armor);
2422} 2395}
2423 2396
2424
2425extern void 2397extern void
2426apply_poison (object *op, object *tmp) 2398apply_poison (object *op, object *tmp)
2427{ 2399{
2428 if (op->type == PLAYER) 2400 if (op->type == PLAYER)
2429 { 2401 {
… …
2440 handle_apply_yield (tmp); 2412 handle_apply_yield (tmp);
2441 decrease_ob (tmp); 2413 decrease_ob (tmp);
2442} 2414}
2443 2415
2444/** 2416/**
2445 * This fonction return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2417 * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit.
2446 * A valid 2 way exit means: 2418 * A valid 2 way exit means:
2447 * -You can come back (there is another exit at the other side) 2419 * -You can come back (there is another exit at the other side)
2448 * -You are 2420 * -You are
2449 * ° the owner of the exit 2421 * ° the owner of the exit
2450 * ° or in the same party as the owner 2422 * ° or in the same party as the owner
2451 * 2423 *
2452 * Note: a owner in a 2 way exit is saved as the owner's name 2424 * Note: a owner in a 2 way exit is saved as the owner's name
2453 * in the field exit->name cause the field exit->owner doesn't 2425 * in the field exit->name cause the field exit->owner doesn't
2454 * survive in the swapping (in fact the whole exit doesn't survive). 2426 * survive in the swapping (in fact the whole exit doesn't survive).
2455 */ 2427 */
2456int 2428int
2457is_legal_2ways_exit (object *op, object *exit) 2429is_legal_2ways_exit (object *op, object *exit)
2458{ 2430{
2459 object *tmp;
2460 object *exit_owner;
2461 player *pp;
2462 maptile *exitmap;
2463
2464 if (exit->stats.exp != 1) 2431 if (exit->stats.exp != 1)
2465 return 1; /*This is not a 2 way, so it is legal */ 2432 return 1; /*This is not a 2 way, so it is legal */
2433
2434#if 0 //TODO
2466 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race) 2435 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
2467 return 0; /* This is a reset town portal */ 2436 return 0; /* This is a reset town portal */
2468 /* To know if an exit has a correspondant, we look at 2437#endif
2469 * all the exits in destination and try to find one with same path as 2438
2470 * the current exit's position */ 2439 maptile *exitmap = maptile::find_sync (EXIT_PATH (exit), exit->map);
2471 if (!strncmp (EXIT_PATH (exit), settings.localdir, strlen (settings.localdir))) 2440
2472 exitmap = ready_map_name (EXIT_PATH (exit), MAP_PLAYER_UNIQUE);
2473 else
2474 exitmap = ready_map_name (EXIT_PATH (exit), 0);
2475 if (exitmap) 2441 if (exitmap)
2476 { 2442 {
2443 exitmap->load_sync ();
2444
2477 tmp = get_map_ob (exitmap, EXIT_X (exit), EXIT_Y (exit)); 2445 object *tmp = exitmap->at (EXIT_X (exit), EXIT_Y (exit)).bot;
2446
2478 if (!tmp) 2447 if (!tmp)
2479 return 0; 2448 return 0;
2480 for ((tmp = get_map_ob (exitmap, EXIT_X (exit), EXIT_Y (exit))); tmp; tmp = tmp->above) 2449
2450 for (; tmp; tmp = tmp->above)
2481 { 2451 {
2482 if (tmp->type != EXIT) 2452 if (tmp->type != EXIT)
2483 continue; /*Not an exit */ 2453 continue; /*Not an exit */
2454
2484 if (!EXIT_PATH (tmp)) 2455 if (!EXIT_PATH (tmp))
2485 continue; /*Not a valid exit */ 2456 continue; /*Not a valid exit */
2457
2486 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y)) 2458 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y))
2487 continue; /*Not in the same place */ 2459 continue; /*Not in the same place */
2460
2488 if (strcmp (exit->map->path, EXIT_PATH (tmp)) != 0) 2461 if (strcmp (exit->map->path, EXIT_PATH (tmp)) != 0)
2489 continue; /*Not in the same map */ 2462 continue; /*Not in the same map */
2490 2463
2491 /* From here we have found the exit is valid. However we do 2464 /* From here we have found the exit is valid. However we do
2492 * here the check of the exit owner. It is important for the 2465 * here the check of the exit owner. It is important for the
2493 * town portals to prevent strangers from visiting your appartments 2466 * town portals to prevent strangers from visiting your appartments
2494 */ 2467 */
2495 if (!exit->race) 2468 if (!exit->race)
2496 return 1; /*No owner, free for all! */ 2469 return 1; /*No owner, free for all! */
2470
2497 exit_owner = NULL; 2471 object *exit_owner = 0;
2498 for (pp = first_player; pp; pp = pp->next) 2472
2473 for_all_players (pp)
2499 { 2474 {
2500 if (!pp->ob) 2475 if (!pp->ob)
2501 continue; 2476 continue;
2477
2502 if (pp->ob->name != exit->race) 2478 if (pp->ob->name != exit->race)
2503 continue; 2479 continue;
2480
2504 exit_owner = pp->ob; /*We found a player which correspond to the player name */ 2481 exit_owner = pp->ob; /*We found a player which correspond to the player name */
2505 break; 2482 break;
2506 } 2483 }
2484
2507 if (!exit_owner) 2485 if (!exit_owner)
2508 return 0; /* No more owner */ 2486 return 0; /* No more owner */
2487
2509 if (exit_owner->contr == op->contr) 2488 if (exit_owner->contr == op->contr)
2510 return 1; /*It is your exit */ 2489 return 1; /*It is your exit */
2490
2511 if (exit_owner && /*There is a owner */ 2491 if (exit_owner && /*There is a owner */
2512 (op->contr) && /*A player tries to pass */ 2492 (op->contr) && /*A player tries to pass */
2513 ((exit_owner->contr->party == NULL) || /*No pass if controller has no party */ 2493 ((exit_owner->contr->party == NULL) || /*No pass if controller has no party */
2514 (exit_owner->contr->party != op->contr->party))) /* Or not the same as op */ 2494 (exit_owner->contr->party != op->contr->party))) /* Or not the same as op */
2515 return 0; 2495 return 0;
2496
2516 return 1; 2497 return 1;
2517 } 2498 }
2518 } 2499 }
2500
2519 return 0; 2501 return 0;
2520} 2502}
2521 2503
2522 2504
2523/** 2505/**
… …
2549 { 2531 {
2550 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first."); 2532 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first.");
2551 return 1; 2533 return 1;
2552 } 2534 }
2553 else 2535 else
2554 {
2555 return 0; /* monsters just skip unpaid items */ 2536 return 0; /* monsters just skip unpaid items */
2556 }
2557 } 2537 }
2558 2538
2559 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op))) 2539 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op)))
2560 return RESULT_INT (0); 2540 return RESULT_INT (0);
2561 2541
2562 switch (tmp->type) 2542 switch (tmp->type)
2563 { 2543 {
2564
2565 case CF_HANDLE: 2544 case CF_HANDLE:
2566 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2545 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2567 play_sound_map (op->map, op->x, op->y, SOUND_TURN_HANDLE); 2546 play_sound_map (op->map, op->x, op->y, SOUND_TURN_HANDLE);
2568 tmp->value = tmp->value ? 0 : 1; 2547 tmp->value = tmp->value ? 0 : 1;
2569 SET_ANIMATION (tmp, tmp->value); 2548 SET_ANIMATION (tmp, tmp->value);
… …
2576 { 2555 {
2577 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2556 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2578 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE); 2557 play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE);
2579 } 2558 }
2580 else 2559 else
2581 {
2582 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move."); 2560 new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move.");
2583 } 2561
2584 return 1; 2562 return 1;
2585 2563
2586 case EXIT: 2564 case EXIT:
2587 if (op->type != PLAYER) 2565 if (op->type != PLAYER)
2588 return 0; 2566 return 0;
2567
2589 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2568 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp))
2590 { 2569 {
2591 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp)); 2570 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp));
2592 } 2571 }
2593 else 2572 else
2594 { 2573 {
2595 /* Don't display messages for random maps. */ 2574 /* Don't display messages for random maps. */
2596 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2) && strncmp (EXIT_PATH (tmp), "/random/", 8)) 2575 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2))
2597 new_draw_info (NDI_NAVY, 0, op, tmp->msg); 2576 new_draw_info (NDI_NAVY, 0, op, tmp->msg);
2577
2598 enter_exit (op, tmp); 2578 op->enter_exit (tmp);
2599 } 2579 }
2600 return 1; 2580 return 1;
2601 2581
2602 case SIGN: 2582 case SIGN:
2603 apply_sign (op, tmp, 0); 2583 apply_sign (op, tmp, 0);
… …
2697 case POISON: 2677 case POISON:
2698 apply_poison (op, tmp); 2678 apply_poison (op, tmp);
2699 return 1; 2679 return 1;
2700 2680
2701 case SAVEBED: 2681 case SAVEBED:
2702 if (op->type == PLAYER)
2703 {
2704 apply_savebed (op);
2705 return 1; 2682 return 1;
2706 }
2707 else
2708 {
2709 return 0;
2710 }
2711 2683
2712 case ARMOUR_IMPROVER: 2684 case ARMOUR_IMPROVER:
2713 if (op->type == PLAYER) 2685 if (op->type == PLAYER)
2714 { 2686 {
2715 apply_armour_improver (op, tmp); 2687 apply_armour_improver (op, tmp);
2716 return 1; 2688 return 1;
2717 } 2689 }
2718 else 2690 else
2719 {
2720 return 0; 2691 return 0;
2721 }
2722 2692
2723 case WEAPON_IMPROVER: 2693 case WEAPON_IMPROVER:
2724 (void) check_improve_weapon (op, tmp); 2694 (void) check_improve_weapon (op, tmp);
2725 return 1; 2695 return 1;
2726 2696
… …
2811 op->destroy (); 2781 op->destroy ();
2812 return 1; 2782 return 1;
2813 } 2783 }
2814 2784
2815 pl->contr->last_used = op; 2785 pl->contr->last_used = op;
2816 pl->contr->last_used_id = op->count;
2817 2786
2818 tmp = manual_apply (pl, op, aflag); 2787 tmp = manual_apply (pl, op, aflag);
2819 if (!quiet) 2788 if (!quiet)
2820 { 2789 {
2821 if (tmp == 0) 2790 if (tmp == 0)
… …
2952 if (who->type == PLAYER) 2921 if (who->type == PLAYER)
2953 esrv_del_item (who->contr, op->count); 2922 esrv_del_item (who->contr, op->count);
2954 2923
2955 op->destroy (); 2924 op->destroy ();
2956 insert_ob_in_ob (tmp2, who); 2925 insert_ob_in_ob (tmp2, who);
2957 fix_player (who); 2926 who->update_stats ();
2958 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 2927 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2959 { 2928 {
2960 if (who->type == PLAYER) 2929 if (who->type == PLAYER)
2961 { 2930 {
2962 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 2931 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
… …
2995 default: 2964 default:
2996 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op)); 2965 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op));
2997 break; 2966 break;
2998 } 2967 }
2999 2968
3000 fix_player (who); 2969 who->update_stats ();
3001 2970
3002 if (!(aflags & AP_NO_MERGE)) 2971 if (!(aflags & AP_NO_MERGE))
3003 { 2972 {
3004 object *tmp; 2973 object *tmp;
3005 2974
… …
3371 } 3340 }
3372 else 3341 else
3373 { 3342 {
3374 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice)) 3343 if (who->contr->unapply == unapply_never || (i & CAN_APPLY_UNAPPLY_CHOICE && who->contr->unapply == unapply_nochoice))
3375 { 3344 {
3376 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some item(s):"); 3345 new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some of the following item(s) or change your applymode:");
3377 unapply_for_ob (who, op, AP_PRINT); 3346 unapply_for_ob (who, op, AP_PRINT);
3378 return 1; 3347 return 1;
3379 } 3348 }
3380 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE)) 3349 else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE))
3381 { 3350 {
… …
3383 if (i) 3352 if (i)
3384 return 1; 3353 return 1;
3385 } 3354 }
3386 } 3355 }
3387 } 3356 }
3357
3388 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL) 3358 if (op->skill && op->type != SKILL && op->type != SKILL_TOOL)
3389 { 3359 {
3390 skop = find_skill_by_name (who, op->skill); 3360 skop = find_skill_by_name (who, op->skill);
3391 if (!skop) 3361 if (!skop)
3392 { 3362 {
… …
3494 { 3464 {
3495 (void) insert_ob_in_ob (tmp, who); 3465 (void) insert_ob_in_ob (tmp, who);
3496 if (who->type == PLAYER) 3466 if (who->type == PLAYER)
3497 esrv_send_item (who, tmp); 3467 esrv_send_item (who, tmp);
3498 } 3468 }
3499 fix_player (who); 3469 who->update_stats ();
3500 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3470 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3501 { 3471 {
3502 if (who->type == PLAYER) 3472 if (who->type == PLAYER)
3503 { 3473 {
3504 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3474 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
… …
3601 SET_FLAG (op, FLAG_APPLIED); 3571 SET_FLAG (op, FLAG_APPLIED);
3602 3572
3603 if (tmp != NULL) 3573 if (tmp != NULL)
3604 tmp = insert_ob_in_ob (tmp, who); 3574 tmp = insert_ob_in_ob (tmp, who);
3605 3575
3606 fix_player (who); 3576 who->update_stats ();
3607 3577
3608 /* We exclude spell casting objects. The fire code will set the 3578 /* We exclude spell casting objects. The fire code will set the
3609 * been applied flag when they are used - until that point, 3579 * been applied flag when they are used - until that point,
3610 * you don't know anything about them. 3580 * you don't know anything about them.
3611 */ 3581 */
… …
3651 int i; 3621 int i;
3652 3622
3653 switch (op->type) 3623 switch (op->type)
3654 { 3624 {
3655 case SHOP_FLOOR: 3625 case SHOP_FLOOR:
3656 if (!HAS_RANDOM_ITEMS (op)) 3626 if (!op->has_random_items ())
3657 return 0; 3627 return 0;
3658 3628
3659 do 3629 do
3660 { 3630 {
3661 i = 10; /* let's give it 10 tries */ 3631 i = 10; /* let's give it 10 tries */
… …
3714 * when an original map is loaded) and performs special actions for 3684 * when an original map is loaded) and performs special actions for
3715 * certain objects (most initialization of chests and creation of 3685 * certain objects (most initialization of chests and creation of
3716 * treasures and stuff). Calls auto_apply if appropriate. 3686 * treasures and stuff). Calls auto_apply if appropriate.
3717 */ 3687 */
3718void 3688void
3719fix_auto_apply (maptile *m) 3689maptile::fix_auto_apply ()
3720{ 3690{
3721 object *tmp, *above = NULL; 3691 if (!spaces)
3722 int x, y;
3723
3724 if (m == NULL)
3725 return; 3692 return;
3726 3693
3727 for (x = 0; x < MAP_WIDTH (m); x++) 3694 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3728 for (y = 0; y < MAP_HEIGHT (m); y++) 3695 for (object *tmp = ms->bot; tmp; )
3729 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = above)
3730 { 3696 {
3731 above = tmp->above; 3697 object *above = tmp->above;
3732 3698
3733 if (tmp->inv) 3699 if (tmp->inv)
3734 { 3700 {
3735 object *invtmp, *invnext; 3701 object *invtmp, *invnext;
3736 3702
3737 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext) 3703 for (invtmp = tmp->inv; invtmp != NULL; invtmp = invnext)
3738 { 3704 {
3739 invnext = invtmp->below; 3705 invnext = invtmp->below;
3740 3706
3741 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) 3707 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3742 auto_apply (invtmp); 3708 auto_apply (invtmp);
3743 else if (invtmp->type == TREASURE && HAS_RANDOM_ITEMS (invtmp)) 3709 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3744 { 3710 {
3745 while ((invtmp->stats.hp--) > 0) 3711 while ((invtmp->stats.hp--) > 0)
3746 create_treasure (invtmp->randomitems, invtmp, 0, m->difficulty, 0);
3747
3748 invtmp->randomitems = NULL;
3749 }
3750 else if (invtmp && invtmp->arch
3751 && invtmp->type != TREASURE && invtmp->type != SPELL && invtmp->type != CLASS && HAS_RANDOM_ITEMS (invtmp))
3752 {
3753 create_treasure (invtmp->randomitems, invtmp, 0, m->difficulty, 0); 3712 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3713
3714 invtmp->randomitems = NULL;
3715 }
3716 else if (invtmp && invtmp->arch
3717 && invtmp->type != TREASURE && invtmp->type != SPELL && invtmp->type != CLASS && invtmp->has_random_items ())
3718 {
3719 create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
3754 /* Need to clear this so that we never try to create 3720 /* Need to clear this so that we never try to create
3755 * treasure again for this object 3721 * treasure again for this object
3756 */ 3722 */
3757 invtmp->randomitems = NULL; 3723 invtmp->randomitems = NULL;
3758 } 3724 }
3759 } 3725 }
3760 /* This is really temporary - the code at the bottom will 3726 /* This is really temporary - the code at the bottom will
3761 * also set randomitems to null. The problem is there are bunches 3727 * also set randomitems to null. The problem is there are bunches
3762 * of maps/players already out there with items that have spells 3728 * of maps/players already out there with items that have spells
3763 * which haven't had the randomitems set to null yet. 3729 * which haven't had the randomitems set to null yet.
3764 * MSW 2004-05-13 3730 * MSW 2004-05-13
3765 * 3731 *
3766 * And if it's a spellbook, it's better to set randomitems to NULL too, 3732 * And if it's a spellbook, it's better to set randomitems to NULL too,
3767 * else you get two spells in the book ^_- 3733 * else you get two spells in the book ^_-
3768 * Ryo 2004-08-16 3734 * Ryo 2004-08-16
3769 */ 3735 */
3770 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL 3736 if (tmp->type == WAND || tmp->type == ROD || tmp->type == SCROLL
3771 || tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || tmp->type == ALTAR || tmp->type == SPELLBOOK) 3737 || tmp->type == HORN || tmp->type == FIREWALL || tmp->type == POTION || tmp->type == ALTAR || tmp->type == SPELLBOOK)
3772 tmp->randomitems = NULL;
3773
3774 }
3775
3776 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
3777 auto_apply (tmp);
3778 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && HAS_RANDOM_ITEMS (tmp))
3779 {
3780 while ((tmp->stats.hp--) > 0)
3781 create_treasure (tmp->randomitems, tmp, 0, m->difficulty, 0);
3782 tmp->randomitems = NULL; 3738 tmp->randomitems = NULL;
3739
3783 } 3740 }
3741
3742 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
3743 auto_apply (tmp);
3744 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && tmp->has_random_items ())
3745 {
3746 while ((tmp->stats.hp--) > 0)
3747 create_treasure (tmp->randomitems, tmp, 0, difficulty, 0);
3748 tmp->randomitems = NULL;
3749 }
3784 else if (tmp->type == TIMED_GATE) 3750 else if (tmp->type == TIMED_GATE)
3785 { 3751 {
3786 object *head = tmp->head != NULL ? tmp->head : tmp; 3752 object *head = tmp->head != NULL ? tmp->head : tmp;
3787 3753
3788 if (QUERY_FLAG (head, FLAG_IS_LINKED)) 3754 if (QUERY_FLAG (head, FLAG_IS_LINKED))
3789 {
3790 tmp->speed = 0; 3755 tmp->set_speed (0);
3791 update_ob_speed (tmp);
3792 }
3793 } 3756 }
3794 /* This function can be called everytime a map is loaded, even when 3757 /* This function can be called everytime a map is loaded, even when
3795 * swapping back in. As such, we don't want to create the treasure 3758 * swapping back in. As such, we don't want to create the treasure
3796 * over and ove again, so after we generate the treasure, blank out 3759 * over and ove again, so after we generate the treasure, blank out
3797 * randomitems so if it is swapped in again, it won't make anything. 3760 * randomitems so if it is swapped in again, it won't make anything.
3798 * This is a problem for the above objects, because they have counters 3761 * This is a problem for the above objects, because they have counters
3799 * which say how many times to make the treasure. 3762 * which say how many times to make the treasure.
3800 */ 3763 */
3801 else if (tmp && tmp->arch && tmp->type != PLAYER 3764 else if (tmp && tmp->arch && tmp->type != PLAYER
3802 && tmp->type != TREASURE && tmp->type != SPELL 3765 && tmp->type != TREASURE && tmp->type != SPELL
3803 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && HAS_RANDOM_ITEMS (tmp)) 3766 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ())
3804 { 3767 {
3805 create_treasure (tmp->randomitems, tmp, GT_APPLY, m->difficulty, 0); 3768 create_treasure (tmp->randomitems, tmp, GT_APPLY, difficulty, 0);
3806 tmp->randomitems = NULL; 3769 tmp->randomitems = NULL;
3807 } 3770 }
3771
3772 tmp = above;
3808 } 3773 }
3809 3774
3810 for (x = 0; x < MAP_WIDTH (m); x++) 3775 for (mapspace *ms = spaces + size (); ms-- > spaces; )
3811 for (y = 0; y < MAP_HEIGHT (m); y++) 3776 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
3812 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above)
3813 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL)) 3777 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL))
3814 check_trigger (tmp, tmp->above); 3778 check_trigger (tmp, tmp->above);
3815} 3779}
3816 3780
3817/** 3781/**
3818 * Handles player eating food that temporarily changes status (resistances, stats). 3782 * Handles player eating food that temporarily changes status (resistances, stats).
3819 * This used to call cast_change_attr(), but 3783 * This used to call cast_change_attr(), but
… …
3847 { 3811 {
3848 force->resist[i] = food->resist[i] / 2; 3812 force->resist[i] = food->resist[i] / 2;
3849 did_one = 1; 3813 did_one = 1;
3850 } 3814 }
3851 } 3815 }
3816
3852 if (did_one) 3817 if (did_one)
3853 { 3818 {
3854 force->speed = 0.1; 3819 force->set_speed (0.1);
3855 update_ob_speed (force);
3856 /* bigger morsel of food = longer effect time */ 3820 /* bigger morsel of food = longer effect time */
3857 force->stats.food = food->stats.food / 5; 3821 force->duration = food->stats.food / 5;
3858 SET_FLAG (force, FLAG_IS_USED_UP);
3859 SET_FLAG (force, FLAG_APPLIED); 3822 SET_FLAG (force, FLAG_APPLIED);
3860 change_abil (who, force); 3823 change_abil (who, force);
3861 insert_ob_in_ob (force, who); 3824 insert_ob_in_ob (force, who);
3862 } 3825 }
3863 else 3826 else
… …
3895 new_draw_info (NDI_UNIQUE, 0, who, "You feel a rush of magical energy!"); 3858 new_draw_info (NDI_UNIQUE, 0, who, "You feel a rush of magical energy!");
3896 who->stats.sp += food->stats.sp; 3859 who->stats.sp += food->stats.sp;
3897 /* place limit on max sp from food? */ 3860 /* place limit on max sp from food? */
3898 } 3861 }
3899 } 3862 }
3900 fix_player (who); 3863 who->update_stats ();
3901} 3864}
3902
3903 3865
3904/** 3866/**
3905 * Designed primarily to light torches/lanterns/etc. 3867 * Designed primarily to light torches/lanterns/etc.
3906 * Also burns up burnable material too. First object in the inventory is 3868 * Also burns up burnable material too. First object in the inventory is
3907 * the selected object to "burn". -b.t. 3869 * the selected object to "burn". -b.t.
3908 */ 3870 */
3909
3910void 3871void
3911apply_lighter (object *who, object *lighter) 3872apply_lighter (object *who, object *lighter)
3912{ 3873{
3913 object *item; 3874 object *item;
3914 int is_player_env = 0; 3875 int is_player_env = 0;
3915 char item_name[MAX_BUF];
3916 3876
3917 item = find_marked_object (who); 3877 item = find_marked_object (who);
3918 if (item) 3878 if (item)
3919 { 3879 {
3920 if (lighter->last_eat && lighter->stats.food) 3880 if (lighter->last_eat && lighter->stats.food)
3921 { /* lighter gets used up */ 3881 { /* lighter gets used up */
3922 /* Split multiple lighters if they're being used up. Otherwise * 3882 /* Split multiple lighters if they're being used up. Otherwise *
3923 * one charge from each would be used up. --DAMN */ 3883 * one charge from each would be used up. --DAMN */
3924 if (lighter->nrof > 1) 3884 if (lighter->nrof > 1)
3925 { 3885 {
3926 object *oneLighter = object::create (); 3886 object *oneLighter = lighter->clone ();
3927 3887
3928 lighter->copy_to (oneLighter);
3929 lighter->nrof -= 1; 3888 lighter->nrof -= 1;
3930 oneLighter->nrof = 1; 3889 oneLighter->nrof = 1;
3931 oneLighter->stats.food--; 3890 oneLighter->stats.food--;
3932 esrv_send_item (who, lighter); 3891 esrv_send_item (who, lighter);
3933 oneLighter = insert_ob_in_ob (oneLighter, who); 3892 oneLighter = insert_ob_in_ob (oneLighter, who);
… …
3939 else if (lighter->last_eat) 3898 else if (lighter->last_eat)
3940 { /* no charges left in lighter */ 3899 { /* no charges left in lighter */
3941 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with a used up %s.", &item->name, &lighter->name); 3900 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with a used up %s.", &item->name, &lighter->name);
3942 return; 3901 return;
3943 } 3902 }
3903
3944 /* Perhaps we should split what we are trying to light on fire? 3904 /* Perhaps we should split what we are trying to light on fire?
3945 * I can't see many times when you would want to light multiple 3905 * I can't see many times when you would want to light multiple
3946 * objects at once. 3906 * objects at once.
3947 */ 3907 */
3948 /* If the item is destroyed, we don't have a valid pointer to the 3908
3949 * name object, so make a copy so the message we print out makes
3950 * some sense.
3951 */
3952 strcpy (item_name, item->name);
3953 if (who == is_player_inv (item)) 3909 if (who == item->in_player ())
3954 is_player_env = 1; 3910 is_player_env = 1;
3955 3911
3956 save_throw_object (item, AT_FIRE, who); 3912 save_throw_object (item, AT_FIRE, who);
3957 /* Change to check count and not freed, since the object pointer 3913
3958 * may have gotten recycled
3959 */
3960 if (item->destroyed ()) 3914 if (item->destroyed ())
3961 { 3915 {
3962 new_draw_info_format (NDI_UNIQUE, 0, who, "You light the %s with the %s.", &item_name, &lighter->name); 3916 new_draw_info_format (NDI_UNIQUE, 0, who, "You light the %s with the %s.", &item->name, &lighter->name);
3963 /* Need to update the player so that the players glow radius 3917 /* Need to update the player so that the players glow radius
3964 * gets changed. 3918 * gets changed.
3965 */ 3919 */
3966 if (is_player_env) 3920 if (is_player_env)
3967 fix_player (who); 3921 who->update_stats ();
3968 } 3922 }
3969 else 3923 else
3970 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with the %s and fail.", &item->name, &lighter->name); 3924 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with the %s and fail.", &item->name, &lighter->name);
3971 } 3925 }
3972 else /* nothing to light */ 3926 else /* nothing to light */

Diff Legend

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