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

Comparing deliantra/server/server/init.C (file contents):
Revision 1.53 by root, Mon Jun 4 12:19:09 2007 UTC vs.
Revision 1.54 by root, Mon Jun 4 13:04:00 2007 UTC

1253 /* set creature race to race value */ 1253 /* set creature race to race value */
1254 if ((mon = archetype::find (cp)) == NULL) 1254 if ((mon = archetype::find (cp)) == NULL)
1255 LOG (llevError, "Creature %s in race file lacks archetype\n", cp); 1255 LOG (llevError, "Creature %s in race file lacks archetype\n", cp);
1256 else 1256 else
1257 { 1257 {
1258 if (set_race && (!mon->clone.race || strcmp (mon->clone.race, race))) 1258 if (set_race && (!mon->race || strcmp (mon->race, race)))
1259 { 1259 {
1260 if (mon->clone.race) 1260 if (mon->race)
1261 LOG (llevDebug, "Resetting race to %s from %s for archetype %s\n", race, &mon->clone.race, &mon->archname); 1261 LOG (llevDebug, "Resetting race to %s from %s for archetype %s\n", race, &mon->race, &mon->archname);
1262 1262
1263 mon->clone.race = race; 1263 mon->race = race;
1264 } 1264 }
1265 1265
1266 /* if the arch is a monster, add it to the race list */ 1266 /* if the arch is a monster, add it to the race list */
1267 if (set_list && QUERY_FLAG (&mon->clone, FLAG_MONSTER)) 1267 if (set_list && QUERY_FLAG (mon, FLAG_MONSTER))
1268 add_to_racelist (race, &mon->clone); 1268 add_to_racelist (race, mon);
1269 } 1269 }
1270 } 1270 }
1271 } 1271 }
1272 1272
1273 fclose (file); 1273 fclose (file);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines