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.53 by root, Mon Dec 25 14:43:23 2006 UTC

… …
25#include <living.h> 25#include <living.h>
26#include <spells.h> 26#include <spells.h>
27#include <skills.h> 27#include <skills.h>
28#include <tod.h> 28#include <tod.h>
29 29
30#ifndef __CEXTRACT__
31# include <sproto.h> 30#include <sproto.h>
32#endif
33 31
34/* Want this regardless of rplay. */ 32/* Want this regardless of rplay. */
35#include <sounds.h> 33#include <sounds.h>
36 34
37/* need math lib for double-precision and pow() in dragon_eat_flesh() */ 35/* need math lib for double-precision and pow() in dragon_eat_flesh() */
… …
195apply_potion (object *op, object *tmp) 193apply_potion (object *op, object *tmp)
196{ 194{
197 int got_one = 0, i; 195 int got_one = 0, i;
198 object *force = 0, *floor = 0; 196 object *force = 0, *floor = 0;
199 197
200 floor = get_map_ob (op->map, op->x, op->y); 198 floor = GET_MAP_OB (op->map, op->x, op->y);
201 199
202 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) 200 if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
203 { 201 {
204 if (op->type == PLAYER) 202 if (op->type == PLAYER)
205 new_draw_info (NDI_UNIQUE, 0, op, "Gods prevent you from using this here, it's sacred ground!"); 203 new_draw_info (NDI_UNIQUE, 0, op, "Gods prevent you from using this here, it's sacred ground!");
… …
219 object *depl; 217 object *depl;
220 archetype *at; 218 archetype *at;
221 219
222 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 220 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
223 { 221 {
224 drain_stat (op); 222 op->drain_stat ();
225 fix_player (op); 223 op->update_stats ();
226 decrease_ob (tmp); 224 decrease_ob (tmp);
227 return 1; 225 return 1;
228 } 226 }
229 227
230 if ((at = archetype::find (ARCH_DEPLETION)) == NULL) 228 if (!(at = archetype::find (ARCH_DEPLETION)))
231 { 229 {
232 LOG (llevError, "Could not find archetype depletion\n"); 230 LOG (llevError, "Could not find archetype depletion\n");
233 return 0; 231 return 0;
234 } 232 }
235 depl = present_arch_in_ob (at, op); 233 depl = present_arch_in_ob (at, op);
236 234
237 if (depl != NULL) 235 if (depl)
238 { 236 {
239 for (i = 0; i < NUM_STATS; i++) 237 for (i = 0; i < NUM_STATS; i++)
240 if (get_attr_value (&depl->stats, i)) 238 if (get_attr_value (&depl->stats, i))
241 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]); 239 new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]);
242 240
243 depl->destroy (); 241 depl->destroy ();
244 fix_player (op); 242 op->update_stats ();
245 } 243 }
246 else 244 else
247 new_draw_info (NDI_UNIQUE, 0, op, "You potion had no effect."); 245 new_draw_info (NDI_UNIQUE, 0, op, "You potion had no effect.");
248 246
249 decrease_ob (tmp); 247 decrease_ob (tmp);
… …
299 297
300 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)) 298 if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))
301 { 299 {
302 if (got_one) 300 if (got_one)
303 { 301 {
304 fix_player (op); 302 op->update_stats ();
305 new_draw_info (NDI_UNIQUE, 0, op, "The Gods smile upon you and remake you"); 303 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."); 304 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."); 305 new_draw_info (NDI_UNIQUE, 0, op, "You feel a little more perfect.");
308 } 306 }
309 else 307 else
… …
311 } 309 }
312 else 310 else
313 { /* cursed potion */ 311 { /* cursed potion */
314 if (got_one) 312 if (got_one)
315 { 313 {
316 fix_player (op); 314 op->update_stats ();
317 new_draw_info (NDI_UNIQUE, 0, op, "The Gods are angry and punish you."); 315 new_draw_info (NDI_UNIQUE, 0, op, "The Gods are angry and punish you.");
318 } 316 }
319 else 317 else
320 new_draw_info (NDI_UNIQUE, 0, op, "You are fortunate that you are so pathetic."); 318 new_draw_info (NDI_UNIQUE, 0, op, "You are fortunate that you are so pathetic.");
321 } 319 }
… …
349 cast_spell (op, tmp, op->facing, tmp->inv, NULL); 347 cast_spell (op, tmp, op->facing, tmp->inv, NULL);
350 348
351 decrease_ob (tmp); 349 decrease_ob (tmp);
352 /* if youre dead, no point in doing this... */ 350 /* if youre dead, no point in doing this... */
353 if (!QUERY_FLAG (op, FLAG_REMOVED)) 351 if (!QUERY_FLAG (op, FLAG_REMOVED))
354 fix_player (op); 352 op->update_stats ();
355 return 1; 353 return 1;
356 } 354 }
357 355
358 /* Deal with protection potions */ 356 /* Deal with protection potions */
359 force = NULL; 357 force = NULL;
… …
403 * that were grouped with the one consumed, his 401 * that were grouped with the one consumed, his
404 * stat will not be raised by them. fix_player just clears 402 * stat will not be raised by them. fix_player just clears
405 * up all the stats. 403 * up all the stats.
406 */ 404 */
407 CLEAR_FLAG (tmp, FLAG_APPLIED); 405 CLEAR_FLAG (tmp, FLAG_APPLIED);
408 fix_player (op); 406 op->update_stats ();
409 decrease_ob (tmp); 407 decrease_ob (tmp);
410 return 1; 408 return 1;
411} 409}
412 410
413/**************************************************************************** 411/****************************************************************************
… …
570 weapon->last_eat++; 568 weapon->last_eat++;
571 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon's bonus to %s improved by %d", statname, sacrifice_count); 569 new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon's bonus to %s improved by %d", statname, sacrifice_count);
572 decrease_ob (improver); 570 decrease_ob (improver);
573 571
574 /* So it updates the players stats and the window */ 572 /* So it updates the players stats and the window */
575 fix_player (op); 573 op->update_stats ();
576 return 1; 574 return 1;
577} 575}
578 576
579/* Types of improvements, hidden in the sp field. */ 577/* Types of improvements, hidden in the sp field. */
580#define IMPROVE_PREPARE 1 578#define IMPROVE_PREPARE 1
… …
883 881
884 if (op->type == PLAYER) 882 if (op->type == PLAYER)
885 { 883 {
886 esrv_send_item (op, armour); 884 esrv_send_item (op, armour);
887 if (QUERY_FLAG (armour, FLAG_APPLIED)) 885 if (QUERY_FLAG (armour, FLAG_APPLIED))
888 fix_player (op); 886 op->update_stats ();
889 } 887 }
890 decrease_ob (improver); 888 decrease_ob (improver);
891 if (tmp) 889 if (tmp)
892 { 890 {
893 insert_ob_in_ob (tmp, op); 891 insert_ob_in_ob (tmp, op);
… …
1029 if (sack == NULL || sack->type != CONTAINER) 1027 if (sack == NULL || sack->type != CONTAINER)
1030 { 1028 {
1031 LOG (llevError, "apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]"); 1029 LOG (llevError, "apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]");
1032 return 0; 1030 return 0;
1033 } 1031 }
1034 op->contr->last_used = NULL; 1032
1035 op->contr->last_used_id = 0; 1033 op->contr->last_used = 0;
1036 1034
1037 if (sack->env != op) 1035 if (sack->env != op)
1038 { 1036 {
1039 if (sack->other_arch == NULL || sack->env != NULL) 1037 if (sack->other_arch == NULL || sack->env != NULL)
1040 { 1038 {
1041 new_draw_info (NDI_UNIQUE, 0, op, "You must get it first."); 1039 new_draw_info (NDI_UNIQUE, 0, op, "You must get it first.");
1042 return 1; 1040 return 1;
1043 } 1041 }
1042
1044 /* It's on the ground, the problems begin */ 1043 /* It's on the ground, the problems begin */
1045 if (op->container != sack) 1044 if (op->container != sack)
1046 { 1045 {
1047 /* it's closed OR some player has opened it */ 1046 /* it's closed OR some player has opened it */
1048 if (QUERY_FLAG (sack, FLAG_APPLIED)) 1047 if (QUERY_FLAG (sack, FLAG_APPLIED))
1049 { 1048 {
1050 for (tmp = get_map_ob (sack->map, sack->x, sack->y); tmp && tmp->container != sack; tmp = tmp->above); 1049 for (tmp = GET_MAP_OB (sack->map, sack->x, sack->y); tmp && tmp->container != sack; tmp = tmp->above);
1051 if (tmp) 1050 if (tmp)
1052 { 1051 {
1053 /* some other player have opened it */ 1052 /* some other player have opened it */
1054 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already occupied.", query_name (sack)); 1053 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already occupied.", query_name (sack));
1055 return 1; 1054 return 1;
… …
1119 tmp = find_key (op, op, sack); 1118 tmp = find_key (op, op, sack);
1120 if (tmp) 1119 if (tmp)
1121 { 1120 {
1122 sprintf (buf, "You unlock %s with %s.", query_name (sack), query_name (tmp)); 1121 sprintf (buf, "You unlock %s with %s.", query_name (sack), query_name (tmp));
1123 SET_FLAG (sack, FLAG_APPLIED); 1122 SET_FLAG (sack, FLAG_APPLIED);
1123
1124 if (sack->env == NULL) 1124 if (sack->env == NULL)
1125 { /* if it's on ground,open it also */ 1125 { /* if it's on ground,open it also */
1126 new_draw_info (NDI_UNIQUE, 0, op, buf); 1126 new_draw_info (NDI_UNIQUE, 0, op, buf);
1127 apply_container (op, sack); 1127 apply_container (op, sack);
1128 return 1; 1128 return 1;
1129 } 1129 }
1130 } 1130 }
1131 else 1131 else
1132 {
1133 sprintf (buf, "You don't have the key to unlock %s.", query_name (sack)); 1132 sprintf (buf, "You don't have the key to unlock %s.", query_name (sack));
1134 }
1135 } 1133 }
1136 else 1134 else
1137 { 1135 {
1138 sprintf (buf, "You readied %s.", query_name (sack)); 1136 sprintf (buf, "You readied %s.", query_name (sack));
1139 SET_FLAG (sack, FLAG_APPLIED); 1137 SET_FLAG (sack, FLAG_APPLIED);
1138
1140 if (sack->env == NULL) 1139 if (sack->env == NULL)
1141 { /* if it's on ground,open it also */ 1140 { /* if it's on ground,open it also */
1142 new_draw_info (NDI_UNIQUE, 0, op, buf); 1141 new_draw_info (NDI_UNIQUE, 0, op, buf);
1143 apply_container (op, sack); 1142 apply_container (op, sack);
1144 return 1; 1143 return 1;
1145 } 1144 }
1146 } 1145 }
1147 } 1146 }
1147
1148 new_draw_info (NDI_UNIQUE, 0, op, buf); 1148 new_draw_info (NDI_UNIQUE, 0, op, buf);
1149
1149 if (op->contr) 1150 if (op->contr)
1150 op->contr->socket.update_look = 1; 1151 op->contr->ns->floorbox_update ();
1152
1151 return 1; 1153 return 1;
1152} 1154}
1153 1155
1154/** 1156/**
1155 * Eneq(@csd.uu.se): Handle apply on containers. This is for containers 1157 * Eneq(@csd.uu.se): Handle apply on containers. This is for containers
… …
1786 1788
1787 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1789 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1788 { 1790 {
1789 /*exp_gain *= 2; because they just identified it too */ 1791 /*exp_gain *= 2; because they just identified it too */
1790 SET_FLAG (tmp, FLAG_IDENTIFIED); 1792 SET_FLAG (tmp, FLAG_IDENTIFIED);
1793
1791 /* If in a container, update how it looks */ 1794 /* If in a container, update how it looks */
1792 if (tmp->env) 1795 if (tmp->env)
1793 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1796 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1794 else 1797 else
1795 op->contr->socket.update_look = 1; 1798 op->contr->ns->floorbox_update ();
1796 } 1799 }
1800
1797 change_exp (op, exp_gain, skill_ob->skill, 0); 1801 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 */ 1802 SET_FLAG (tmp, FLAG_NO_SKILL_IDENT); /* so no more xp gained from this book */
1799 } 1803 }
1800} 1804}
1801 1805
… …
1850 } 1854 }
1851 return; 1855 return;
1852 } 1856 }
1853 1857
1854 play_sound_player_only (op->contr, SOUND_LEARN_SPELL, 0, 0); 1858 play_sound_player_only (op->contr, SOUND_LEARN_SPELL, 0, 0);
1855 tmp = object::create (); 1859 tmp = spell->clone ();
1856 spell->copy_to (tmp);
1857 insert_ob_in_ob (tmp, op); 1860 insert_ob_in_ob (tmp, op);
1858 1861
1859 if (special_prayer) 1862 if (special_prayer)
1860 {
1861 SET_FLAG (tmp, FLAG_STARTEQUIP); 1863 SET_FLAG (tmp, FLAG_STARTEQUIP);
1862 }
1863 1864
1864 esrv_add_spells (op->contr, tmp); 1865 esrv_add_spells (op->contr, tmp);
1865} 1866}
1866 1867
1867/** 1868/**
… …
1951 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name); 1952 new_draw_info_format (NDI_UNIQUE, 0, op, "The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name);
1952 1953
1953 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED)) 1954 if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1954 { 1955 {
1955 identify (tmp); 1956 identify (tmp);
1957
1956 if (tmp->env) 1958 if (tmp->env)
1957 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp); 1959 esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
1958 else 1960 else
1959 op->contr->socket.update_look = 1; 1961 op->contr->ns->floorbox_update ();
1960 } 1962 }
1961 1963
1962 /* I removed the check for special_prayer_mark here - it didn't make 1964 /* 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 1965 * 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 1966 * if the player doesn't know the spell, doesn't make a lot of sense that
… …
2324 2326
2325 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95) 2327 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)
2326 { 2328 {
2327 /* resistance increased! */ 2329 /* resistance increased! */
2328 skin->resist[i]++; 2330 skin->resist[i]++;
2329 fix_player (op); 2331 op->update_stats ();
2330 2332
2331 sprintf (buf, "Your skin is now more resistant to %s!", change_resist_msg[i]); 2333 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); 2334 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, buf);
2333 } 2335 }
2334 2336
… …
2353 } 2355 }
2354 } 2356 }
2355 return 1; 2357 return 1;
2356} 2358}
2357 2359
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/** 2360/**
2393 * Handles applying an improve armor scroll. 2361 * Handles applying an improve armor scroll.
2394 * Does some sanity checks, then calls improve_armour. 2362 * Does some sanity checks, then calls improve_armour.
2395 */ 2363 */
2396static void 2364static void
… …
2401 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC)) 2369 if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC))
2402 { 2370 {
2403 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll."); 2371 new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll.");
2404 return; 2372 return;
2405 } 2373 }
2374
2406 armor = find_marked_object (op); 2375 armor = find_marked_object (op);
2376
2407 if (!armor) 2377 if (!armor)
2408 { 2378 {
2409 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object."); 2379 new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object.");
2410 return; 2380 return;
2411 } 2381 }
2382
2412 if (armor->type != ARMOUR 2383 if (armor->type != ARMOUR
2413 && armor->type != CLOAK 2384 && armor->type != CLOAK
2414 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET) 2385 && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET)
2415 { 2386 {
2416 new_draw_info (NDI_UNIQUE, 0, op, "Your marked item is not armour!\n"); 2387 new_draw_info (NDI_UNIQUE, 0, op, "Your marked item is not armour!\n");
… …
2418 } 2389 }
2419 2390
2420 new_draw_info (NDI_UNIQUE, 0, op, "Applying armour enchantment."); 2391 new_draw_info (NDI_UNIQUE, 0, op, "Applying armour enchantment.");
2421 improve_armour (op, tmp, armor); 2392 improve_armour (op, tmp, armor);
2422} 2393}
2423
2424 2394
2425extern void 2395extern void
2426apply_poison (object *op, object *tmp) 2396apply_poison (object *op, object *tmp)
2427{ 2397{
2428 if (op->type == PLAYER) 2398 if (op->type == PLAYER)
… …
2444/** 2414/**
2445 * This fonction return true if the exit is not a 2 ways one or it is 2 ways, valid exit. 2415 * This fonction 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: 2416 * A valid 2 way exit means:
2447 * -You can come back (there is another exit at the other side) 2417 * -You can come back (there is another exit at the other side)
2448 * -You are 2418 * -You are
2449 * ° the owner of the exit 2419 * ° the owner of the exit
2450 * ° or in the same party as the owner 2420 * ° or in the same party as the owner
2451 * 2421 *
2452 * Note: a owner in a 2 way exit is saved as the owner's name 2422 * 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 2423 * 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). 2424 * survive in the swapping (in fact the whole exit doesn't survive).
2455 */ 2425 */
2456int 2426int
2457is_legal_2ways_exit (object *op, object *exit) 2427is_legal_2ways_exit (object *op, object *exit)
2458{ 2428{
2459 object *tmp; 2429 object *tmp;
2460 object *exit_owner; 2430 object *exit_owner;
2461 player *pp;
2462 maptile *exitmap; 2431 maptile *exitmap;
2463 2432
2464 if (exit->stats.exp != 1) 2433 if (exit->stats.exp != 1)
2465 return 1; /*This is not a 2 way, so it is legal */ 2434 return 1; /*This is not a 2 way, so it is legal */
2435
2466 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race) 2436 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
2467 return 0; /* This is a reset town portal */ 2437 return 0; /* This is a reset town portal */
2438
2468 /* To know if an exit has a correspondant, we look at 2439 /* To know if an exit has a correspondant, we look at
2469 * all the exits in destination and try to find one with same path as 2440 * all the exits in destination and try to find one with same path as
2470 * the current exit's position */ 2441 * the current exit's position */
2471 if (!strncmp (EXIT_PATH (exit), settings.localdir, strlen (settings.localdir))) 2442 if (!strncmp (EXIT_PATH (exit), settings.localdir, strlen (settings.localdir)))
2472 exitmap = ready_map_name (EXIT_PATH (exit), MAP_PLAYER_UNIQUE); 2443 exitmap = ready_map_name (EXIT_PATH (exit), MAP_PLAYER_UNIQUE);
2473 else 2444 else
2474 exitmap = ready_map_name (EXIT_PATH (exit), 0); 2445 exitmap = ready_map_name (EXIT_PATH (exit), 0);
2446
2475 if (exitmap) 2447 if (exitmap)
2476 { 2448 {
2477 tmp = get_map_ob (exitmap, EXIT_X (exit), EXIT_Y (exit)); 2449 tmp = GET_MAP_OB (exitmap, EXIT_X (exit), EXIT_Y (exit));
2450
2478 if (!tmp) 2451 if (!tmp)
2479 return 0; 2452 return 0;
2453
2480 for ((tmp = get_map_ob (exitmap, EXIT_X (exit), EXIT_Y (exit))); tmp; tmp = tmp->above) 2454 for ((tmp = GET_MAP_OB (exitmap, EXIT_X (exit), EXIT_Y (exit))); tmp; tmp = tmp->above)
2481 { 2455 {
2482 if (tmp->type != EXIT) 2456 if (tmp->type != EXIT)
2483 continue; /*Not an exit */ 2457 continue; /*Not an exit */
2458
2484 if (!EXIT_PATH (tmp)) 2459 if (!EXIT_PATH (tmp))
2485 continue; /*Not a valid exit */ 2460 continue; /*Not a valid exit */
2461
2486 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y)) 2462 if ((EXIT_X (tmp) != exit->x) || (EXIT_Y (tmp) != exit->y))
2487 continue; /*Not in the same place */ 2463 continue; /*Not in the same place */
2464
2488 if (strcmp (exit->map->path, EXIT_PATH (tmp)) != 0) 2465 if (strcmp (exit->map->path, EXIT_PATH (tmp)) != 0)
2489 continue; /*Not in the same map */ 2466 continue; /*Not in the same map */
2490 2467
2491 /* From here we have found the exit is valid. However we do 2468 /* 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 2469 * here the check of the exit owner. It is important for the
2493 * town portals to prevent strangers from visiting your appartments 2470 * town portals to prevent strangers from visiting your appartments
2494 */ 2471 */
2495 if (!exit->race) 2472 if (!exit->race)
2496 return 1; /*No owner, free for all! */ 2473 return 1; /*No owner, free for all! */
2474
2497 exit_owner = NULL; 2475 exit_owner = NULL;
2498 for (pp = first_player; pp; pp = pp->next) 2476
2477 for_all_players (pp)
2499 { 2478 {
2500 if (!pp->ob) 2479 if (!pp->ob)
2501 continue; 2480 continue;
2481
2502 if (pp->ob->name != exit->race) 2482 if (pp->ob->name != exit->race)
2503 continue; 2483 continue;
2484
2504 exit_owner = pp->ob; /*We found a player which correspond to the player name */ 2485 exit_owner = pp->ob; /*We found a player which correspond to the player name */
2505 break; 2486 break;
2506 } 2487 }
2488
2507 if (!exit_owner) 2489 if (!exit_owner)
2508 return 0; /* No more owner */ 2490 return 0; /* No more owner */
2491
2509 if (exit_owner->contr == op->contr) 2492 if (exit_owner->contr == op->contr)
2510 return 1; /*It is your exit */ 2493 return 1; /*It is your exit */
2494
2511 if (exit_owner && /*There is a owner */ 2495 if (exit_owner && /*There is a owner */
2512 (op->contr) && /*A player tries to pass */ 2496 (op->contr) && /*A player tries to pass */
2513 ((exit_owner->contr->party == NULL) || /*No pass if controller has no party */ 2497 ((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 */ 2498 (exit_owner->contr->party != op->contr->party))) /* Or not the same as op */
2515 return 0; 2499 return 0;
2500
2516 return 1; 2501 return 1;
2517 } 2502 }
2518 } 2503 }
2504
2519 return 0; 2505 return 0;
2520} 2506}
2521 2507
2522 2508
2523/** 2509/**
… …
2549 { 2535 {
2550 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first."); 2536 new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first.");
2551 return 1; 2537 return 1;
2552 } 2538 }
2553 else 2539 else
2554 {
2555 return 0; /* monsters just skip unpaid items */ 2540 return 0; /* monsters just skip unpaid items */
2556 }
2557 } 2541 }
2558 2542
2559 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op))) 2543 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op)))
2560 return RESULT_INT (0); 2544 return RESULT_INT (0);
2561 2545
2562 switch (tmp->type) 2546 switch (tmp->type)
2563 { 2547 {
2564
2565 case CF_HANDLE: 2548 case CF_HANDLE:
2566 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); 2549 new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
2567 play_sound_map (op->map, op->x, op->y, SOUND_TURN_HANDLE); 2550 play_sound_map (op->map, op->x, op->y, SOUND_TURN_HANDLE);
2568 tmp->value = tmp->value ? 0 : 1; 2551 tmp->value = tmp->value ? 0 : 1;
2569 SET_ANIMATION (tmp, tmp->value); 2552 SET_ANIMATION (tmp, tmp->value);
… …
2697 case POISON: 2680 case POISON:
2698 apply_poison (op, tmp); 2681 apply_poison (op, tmp);
2699 return 1; 2682 return 1;
2700 2683
2701 case SAVEBED: 2684 case SAVEBED:
2702 if (op->type == PLAYER)
2703 {
2704 apply_savebed (op);
2705 return 1; 2685 return 1;
2706 }
2707 else
2708 {
2709 return 0;
2710 }
2711 2686
2712 case ARMOUR_IMPROVER: 2687 case ARMOUR_IMPROVER:
2713 if (op->type == PLAYER) 2688 if (op->type == PLAYER)
2714 { 2689 {
2715 apply_armour_improver (op, tmp); 2690 apply_armour_improver (op, tmp);
2716 return 1; 2691 return 1;
2717 } 2692 }
2718 else 2693 else
2719 {
2720 return 0; 2694 return 0;
2721 }
2722 2695
2723 case WEAPON_IMPROVER: 2696 case WEAPON_IMPROVER:
2724 (void) check_improve_weapon (op, tmp); 2697 (void) check_improve_weapon (op, tmp);
2725 return 1; 2698 return 1;
2726 2699
… …
2811 op->destroy (); 2784 op->destroy ();
2812 return 1; 2785 return 1;
2813 } 2786 }
2814 2787
2815 pl->contr->last_used = op; 2788 pl->contr->last_used = op;
2816 pl->contr->last_used_id = op->count;
2817 2789
2818 tmp = manual_apply (pl, op, aflag); 2790 tmp = manual_apply (pl, op, aflag);
2819 if (!quiet) 2791 if (!quiet)
2820 { 2792 {
2821 if (tmp == 0) 2793 if (tmp == 0)
… …
2952 if (who->type == PLAYER) 2924 if (who->type == PLAYER)
2953 esrv_del_item (who->contr, op->count); 2925 esrv_del_item (who->contr, op->count);
2954 2926
2955 op->destroy (); 2927 op->destroy ();
2956 insert_ob_in_ob (tmp2, who); 2928 insert_ob_in_ob (tmp2, who);
2957 fix_player (who); 2929 who->update_stats ();
2958 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 2930 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2959 { 2931 {
2960 if (who->type == PLAYER) 2932 if (who->type == PLAYER)
2961 { 2933 {
2962 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 2934 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
… …
2995 default: 2967 default:
2996 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op)); 2968 new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op));
2997 break; 2969 break;
2998 } 2970 }
2999 2971
3000 fix_player (who); 2972 who->update_stats ();
3001 2973
3002 if (!(aflags & AP_NO_MERGE)) 2974 if (!(aflags & AP_NO_MERGE))
3003 { 2975 {
3004 object *tmp; 2976 object *tmp;
3005 2977
… …
3494 { 3466 {
3495 (void) insert_ob_in_ob (tmp, who); 3467 (void) insert_ob_in_ob (tmp, who);
3496 if (who->type == PLAYER) 3468 if (who->type == PLAYER)
3497 esrv_send_item (who, tmp); 3469 esrv_send_item (who, tmp);
3498 } 3470 }
3499 fix_player (who); 3471 who->update_stats ();
3500 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3472 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3501 { 3473 {
3502 if (who->type == PLAYER) 3474 if (who->type == PLAYER)
3503 { 3475 {
3504 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!"); 3476 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
… …
3601 SET_FLAG (op, FLAG_APPLIED); 3573 SET_FLAG (op, FLAG_APPLIED);
3602 3574
3603 if (tmp != NULL) 3575 if (tmp != NULL)
3604 tmp = insert_ob_in_ob (tmp, who); 3576 tmp = insert_ob_in_ob (tmp, who);
3605 3577
3606 fix_player (who); 3578 who->update_stats ();
3607 3579
3608 /* We exclude spell casting objects. The fire code will set the 3580 /* We exclude spell casting objects. The fire code will set the
3609 * been applied flag when they are used - until that point, 3581 * been applied flag when they are used - until that point,
3610 * you don't know anything about them. 3582 * you don't know anything about them.
3611 */ 3583 */
… …
3651 int i; 3623 int i;
3652 3624
3653 switch (op->type) 3625 switch (op->type)
3654 { 3626 {
3655 case SHOP_FLOOR: 3627 case SHOP_FLOOR:
3656 if (!HAS_RANDOM_ITEMS (op)) 3628 if (!op->has_random_items ())
3657 return 0; 3629 return 0;
3658 3630
3659 do 3631 do
3660 { 3632 {
3661 i = 10; /* let's give it 10 tries */ 3633 i = 10; /* let's give it 10 tries */
… …
3722 int x, y; 3694 int x, y;
3723 3695
3724 if (m == NULL) 3696 if (m == NULL)
3725 return; 3697 return;
3726 3698
3727 for (x = 0; x < MAP_WIDTH (m); x++) 3699 for (x = 0; x < m->width; x++)
3728 for (y = 0; y < MAP_HEIGHT (m); y++) 3700 for (y = 0; y < m->height; y++)
3729 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = above) 3701 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = above)
3730 { 3702 {
3731 above = tmp->above; 3703 above = tmp->above;
3732 3704
3733 if (tmp->inv) 3705 if (tmp->inv)
3734 { 3706 {
… …
3738 { 3710 {
3739 invnext = invtmp->below; 3711 invnext = invtmp->below;
3740 3712
3741 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY)) 3713 if (QUERY_FLAG (invtmp, FLAG_AUTO_APPLY))
3742 auto_apply (invtmp); 3714 auto_apply (invtmp);
3743 else if (invtmp->type == TREASURE && HAS_RANDOM_ITEMS (invtmp)) 3715 else if (invtmp->type == TREASURE && invtmp->has_random_items ())
3744 { 3716 {
3745 while ((invtmp->stats.hp--) > 0) 3717 while ((invtmp->stats.hp--) > 0)
3746 create_treasure (invtmp->randomitems, invtmp, 0, m->difficulty, 0); 3718 create_treasure (invtmp->randomitems, invtmp, 0, m->difficulty, 0);
3747 3719
3748 invtmp->randomitems = NULL; 3720 invtmp->randomitems = NULL;
3749 } 3721 }
3750 else if (invtmp && invtmp->arch 3722 else if (invtmp && invtmp->arch
3751 && invtmp->type != TREASURE && invtmp->type != SPELL && invtmp->type != CLASS && HAS_RANDOM_ITEMS (invtmp)) 3723 && invtmp->type != TREASURE && invtmp->type != SPELL && invtmp->type != CLASS && invtmp->has_random_items ())
3752 { 3724 {
3753 create_treasure (invtmp->randomitems, invtmp, 0, m->difficulty, 0); 3725 create_treasure (invtmp->randomitems, invtmp, 0, m->difficulty, 0);
3754 /* Need to clear this so that we never try to create 3726 /* Need to clear this so that we never try to create
3755 * treasure again for this object 3727 * treasure again for this object
3756 */ 3728 */
… …
3773 3745
3774 } 3746 }
3775 3747
3776 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY)) 3748 if (QUERY_FLAG (tmp, FLAG_AUTO_APPLY))
3777 auto_apply (tmp); 3749 auto_apply (tmp);
3778 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && HAS_RANDOM_ITEMS (tmp)) 3750 else if ((tmp->type == TREASURE || (tmp->type == CONTAINER)) && tmp->has_random_items ())
3779 { 3751 {
3780 while ((tmp->stats.hp--) > 0) 3752 while ((tmp->stats.hp--) > 0)
3781 create_treasure (tmp->randomitems, tmp, 0, m->difficulty, 0); 3753 create_treasure (tmp->randomitems, tmp, 0, m->difficulty, 0);
3782 tmp->randomitems = NULL; 3754 tmp->randomitems = NULL;
3783 } 3755 }
… …
3798 * This is a problem for the above objects, because they have counters 3770 * This is a problem for the above objects, because they have counters
3799 * which say how many times to make the treasure. 3771 * which say how many times to make the treasure.
3800 */ 3772 */
3801 else if (tmp && tmp->arch && tmp->type != PLAYER 3773 else if (tmp && tmp->arch && tmp->type != PLAYER
3802 && tmp->type != TREASURE && tmp->type != SPELL 3774 && tmp->type != TREASURE && tmp->type != SPELL
3803 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && HAS_RANDOM_ITEMS (tmp)) 3775 && tmp->type != PLAYER_CHANGER && tmp->type != CLASS && tmp->has_random_items ())
3804 { 3776 {
3805 create_treasure (tmp->randomitems, tmp, GT_APPLY, m->difficulty, 0); 3777 create_treasure (tmp->randomitems, tmp, GT_APPLY, m->difficulty, 0);
3806 tmp->randomitems = NULL; 3778 tmp->randomitems = NULL;
3807 } 3779 }
3808 } 3780 }
3809 3781
3810 for (x = 0; x < MAP_WIDTH (m); x++) 3782 for (x = 0; x < m->width; x++)
3811 for (y = 0; y < MAP_HEIGHT (m); y++) 3783 for (y = 0; y < m->height; y++)
3812 for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above) 3784 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)) 3785 if (tmp->above && (tmp->type == TRIGGER_BUTTON || tmp->type == TRIGGER_PEDESTAL))
3814 check_trigger (tmp, tmp->above); 3786 check_trigger (tmp, tmp->above);
3815} 3787}
3816 3788
3817/** 3789/**
… …
3847 { 3819 {
3848 force->resist[i] = food->resist[i] / 2; 3820 force->resist[i] = food->resist[i] / 2;
3849 did_one = 1; 3821 did_one = 1;
3850 } 3822 }
3851 } 3823 }
3824
3852 if (did_one) 3825 if (did_one)
3853 { 3826 {
3854 force->speed = 0.1; 3827 force->speed = 0.1;
3855 update_ob_speed (force); 3828 update_ob_speed (force);
3856 /* bigger morsel of food = longer effect time */ 3829 /* bigger morsel of food = longer effect time */
3857 force->stats.food = food->stats.food / 5; 3830 force->duration = food->stats.food / 5;
3858 SET_FLAG (force, FLAG_IS_USED_UP);
3859 SET_FLAG (force, FLAG_APPLIED); 3831 SET_FLAG (force, FLAG_APPLIED);
3860 change_abil (who, force); 3832 change_abil (who, force);
3861 insert_ob_in_ob (force, who); 3833 insert_ob_in_ob (force, who);
3862 } 3834 }
3863 else 3835 else
… …
3895 new_draw_info (NDI_UNIQUE, 0, who, "You feel a rush of magical energy!"); 3867 new_draw_info (NDI_UNIQUE, 0, who, "You feel a rush of magical energy!");
3896 who->stats.sp += food->stats.sp; 3868 who->stats.sp += food->stats.sp;
3897 /* place limit on max sp from food? */ 3869 /* place limit on max sp from food? */
3898 } 3870 }
3899 } 3871 }
3900 fix_player (who); 3872 who->update_stats ();
3901} 3873}
3902
3903 3874
3904/** 3875/**
3905 * Designed primarily to light torches/lanterns/etc. 3876 * Designed primarily to light torches/lanterns/etc.
3906 * Also burns up burnable material too. First object in the inventory is 3877 * Also burns up burnable material too. First object in the inventory is
3907 * the selected object to "burn". -b.t. 3878 * the selected object to "burn". -b.t.
3908 */ 3879 */
3909
3910void 3880void
3911apply_lighter (object *who, object *lighter) 3881apply_lighter (object *who, object *lighter)
3912{ 3882{
3913 object *item; 3883 object *item;
3914 int is_player_env = 0; 3884 int is_player_env = 0;
3915 char item_name[MAX_BUF];
3916 3885
3917 item = find_marked_object (who); 3886 item = find_marked_object (who);
3918 if (item) 3887 if (item)
3919 { 3888 {
3920 if (lighter->last_eat && lighter->stats.food) 3889 if (lighter->last_eat && lighter->stats.food)
3921 { /* lighter gets used up */ 3890 { /* lighter gets used up */
3922 /* Split multiple lighters if they're being used up. Otherwise * 3891 /* Split multiple lighters if they're being used up. Otherwise *
3923 * one charge from each would be used up. --DAMN */ 3892 * one charge from each would be used up. --DAMN */
3924 if (lighter->nrof > 1) 3893 if (lighter->nrof > 1)
3925 { 3894 {
3926 object *oneLighter = object::create (); 3895 object *oneLighter = lighter->clone ();
3927 3896
3928 lighter->copy_to (oneLighter);
3929 lighter->nrof -= 1; 3897 lighter->nrof -= 1;
3930 oneLighter->nrof = 1; 3898 oneLighter->nrof = 1;
3931 oneLighter->stats.food--; 3899 oneLighter->stats.food--;
3932 esrv_send_item (who, lighter); 3900 esrv_send_item (who, lighter);
3933 oneLighter = insert_ob_in_ob (oneLighter, who); 3901 oneLighter = insert_ob_in_ob (oneLighter, who);
… …
3939 else if (lighter->last_eat) 3907 else if (lighter->last_eat)
3940 { /* no charges left in lighter */ 3908 { /* 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); 3909 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; 3910 return;
3943 } 3911 }
3912
3944 /* Perhaps we should split what we are trying to light on fire? 3913 /* 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 3914 * I can't see many times when you would want to light multiple
3946 * objects at once. 3915 * objects at once.
3947 */ 3916 */
3948 /* If the item is destroyed, we don't have a valid pointer to the 3917
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)) 3918 if (who == item->in_player ())
3954 is_player_env = 1; 3919 is_player_env = 1;
3955 3920
3956 save_throw_object (item, AT_FIRE, who); 3921 save_throw_object (item, AT_FIRE, who);
3957 /* Change to check count and not freed, since the object pointer 3922
3958 * may have gotten recycled
3959 */
3960 if (item->destroyed ()) 3923 if (item->destroyed ())
3961 { 3924 {
3962 new_draw_info_format (NDI_UNIQUE, 0, who, "You light the %s with the %s.", &item_name, &lighter->name); 3925 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 3926 /* Need to update the player so that the players glow radius
3964 * gets changed. 3927 * gets changed.
3965 */ 3928 */
3966 if (is_player_env) 3929 if (is_player_env)
3967 fix_player (who); 3930 who->update_stats ();
3968 } 3931 }
3969 else 3932 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); 3933 new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with the %s and fail.", &item->name, &lighter->name);
3971 } 3934 }
3972 else /* nothing to light */ 3935 else /* nothing to light */

Diff Legend

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