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.29 by root, Thu Sep 14 23:13:49 2006 UTC vs.
Revision 1.31 by root, Sun Dec 3 20:26:35 2006 UTC

1942 { 1942 {
1943 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name); 1943 LOG (llevError, "apply_spellbook: Book %s has no spell in it!\n", &tmp->name);
1944 new_draw_info (NDI_UNIQUE, 0, op, "The spellbook symbols make no sense."); 1944 new_draw_info (NDI_UNIQUE, 0, op, "The spellbook symbols make no sense.");
1945 return; 1945 return;
1946 } 1946 }
1947
1947 if (spell->level > (skop->level + 10)) 1948 if (spell->level > (skop->level + 10))
1948 { 1949 {
1949 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols."); 1950 new_draw_info (NDI_UNIQUE, 0, op, "You are unable to decipher the strange symbols.");
1950 return; 1951 return;
1951 } 1952 }
2458is_legal_2ways_exit (object *op, object *exit) 2459is_legal_2ways_exit (object *op, object *exit)
2459{ 2460{
2460 object *tmp; 2461 object *tmp;
2461 object *exit_owner; 2462 object *exit_owner;
2462 player *pp; 2463 player *pp;
2463 mapstruct *exitmap; 2464 maptile *exitmap;
2464 2465
2465 if (exit->stats.exp != 1) 2466 if (exit->stats.exp != 1)
2466 return 1; /*This is not a 2 way, so it is legal */ 2467 return 1; /*This is not a 2 way, so it is legal */
2467 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race) 2468 if (!has_been_loaded (EXIT_PATH (exit)) && exit->race)
2468 return 0; /* This is a reset town portal */ 2469 return 0; /* This is a reset town portal */
3714 * when an original map is loaded) and performs special actions for 3715 * when an original map is loaded) and performs special actions for
3715 * certain objects (most initialization of chests and creation of 3716 * certain objects (most initialization of chests and creation of
3716 * treasures and stuff). Calls auto_apply if appropriate. 3717 * treasures and stuff). Calls auto_apply if appropriate.
3717 */ 3718 */
3718void 3719void
3719fix_auto_apply (mapstruct *m) 3720fix_auto_apply (maptile *m)
3720{ 3721{
3721 object *tmp, *above = NULL; 3722 object *tmp, *above = NULL;
3722 int x, y; 3723 int x, y;
3723 3724
3724 if (m == NULL) 3725 if (m == NULL)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines