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.56 by root, Sun Jul 1 05:00:20 2007 UTC

3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
949 init_skills (); 948 init_skills ();
950 949
951 parse_args (argc, argv, 3); 950 parse_args (argc, argv, 3);
952 951
953 init_beforeplay (); 952 init_beforeplay ();
954 init_ericserver ();
955 init_done = 1; 953 init_done = 1;
956} 954}
957 955
958void 956void
959usage (void) 957usage (void)
1253 /* set creature race to race value */ 1251 /* set creature race to race value */
1254 if ((mon = archetype::find (cp)) == NULL) 1252 if ((mon = archetype::find (cp)) == NULL)
1255 LOG (llevError, "Creature %s in race file lacks archetype\n", cp); 1253 LOG (llevError, "Creature %s in race file lacks archetype\n", cp);
1256 else 1254 else
1257 { 1255 {
1258 if (set_race && (!mon->clone.race || strcmp (mon->clone.race, race))) 1256 if (set_race && (!mon->race || strcmp (mon->race, race)))
1259 { 1257 {
1260 if (mon->clone.race) 1258 if (mon->race)
1261 LOG (llevDebug, "Resetting race to %s from %s for archetype %s\n", race, &mon->clone.race, &mon->archname); 1259 LOG (llevDebug, "Resetting race to %s from %s for archetype %s\n", race, &mon->race, &mon->archname);
1262 1260
1263 mon->clone.race = race; 1261 mon->race = race;
1264 } 1262 }
1265 1263
1266 /* if the arch is a monster, add it to the race list */ 1264 /* if the arch is a monster, add it to the race list */
1267 if (set_list && QUERY_FLAG (&mon->clone, FLAG_MONSTER)) 1265 if (set_list && QUERY_FLAG (mon, FLAG_MONSTER))
1268 add_to_racelist (race, &mon->clone); 1266 add_to_racelist (race, mon);
1269 } 1267 }
1270 } 1268 }
1271 } 1269 }
1272 1270
1273 fclose (file); 1271 fclose (file);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines