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.59 by pippijn, Sat Jan 6 14:42:30 2007 UTC vs.
Revision 1.60 by root, Mon Jan 15 15:41:09 2007 UTC

2227 if (meal->type != FLESH || !is_dragon_pl (op)) 2227 if (meal->type != FLESH || !is_dragon_pl (op))
2228 return 0; 2228 return 0;
2229 2229
2230 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces 2230 /* now grab the 'dragon_skin'- and 'dragon_ability'-forces
2231 from the player's inventory */ 2231 from the player's inventory */
2232 shstr_cmp dragon_ability_force ("dragon_ability_force");
2233 shstr_cmp dragon_skin_force ("dragon_skin_force");
2234
2232 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2235 for (tmp = op->inv; tmp; tmp = tmp->below)
2233 {
2234 if (tmp->type == FORCE) 2236 if (tmp->type == FORCE)
2235 {
2236 if (strcmp (tmp->arch->name, "dragon_skin_force") == 0) 2237 if (tmp->arch->name == dragon_skin_force)
2237 skin = tmp; 2238 skin = tmp;
2238 else if (strcmp (tmp->arch->name, "dragon_ability_force") == 0) 2239 else if (tmp->arch->name == dragon_ability_force)
2239 abil = tmp; 2240 abil = tmp;
2240 }
2241 }
2242 2241
2243 /* if either skin or ability are missing, this is an old player 2242 /* if either skin or ability are missing, this is an old player
2244 which is not to be considered a dragon -> bail out */ 2243 which is not to be considered a dragon -> bail out */
2245 if (skin == NULL || abil == NULL) 2244 if (skin == NULL || abil == NULL)
2246 return 0; 2245 return 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines