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

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.88 by root, Mon Jun 4 13:04:00 2007 UTC vs.
Revision 1.91 by root, Wed Jul 4 06:38:35 2007 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
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/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
1285 1284
1286 if (op->msg != tmp->msg) 1285 if (op->msg != tmp->msg)
1287 f.put (KW_msg, KW_endmsg, op->msg); 1286 f.put (KW_msg, KW_endmsg, op->msg);
1288 if (op->lore != tmp->lore) 1287 if (op->lore != tmp->lore)
1289 f.put (KW_lore, KW_endlore, op->lore); 1288 f.put (KW_lore, KW_endlore, op->lore);
1290 if (op->other_arch != tmp->other_arch) 1289
1291 f.put (KW_other_arch, op->other_arch ? &op->other_arch->archname : 0); 1290 CMP_OUT (other_arch);
1292 1291
1293 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); 1292 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0);
1294 1293
1295 if (op->animation_id != tmp->animation_id) 1294 if (op->animation_id != tmp->animation_id)
1296 if (op->animation_id) 1295 if (op->animation_id)
1297 { 1296 {
1298 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1297 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1299 1298
1300 if (!QUERY_FLAG (op, FLAG_ANIMATE)) 1299 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1301 f.put (KW_is_animated, (sint32) 0); 1300 f.put (KW_is_animated, (sint32)0);
1302 } 1301 }
1303 else 1302 else
1304 f.put (KW_animation, (const char *) 0); 1303 f.put (KW_animation, (const char *)0);
1305 1304
1306 CMP_OUT2 (str, stats.Str); 1305 CMP_OUT2 (str, stats.Str);
1307 CMP_OUT2 (dex, stats.Dex); 1306 CMP_OUT2 (dex, stats.Dex);
1308 CMP_OUT2 (con, stats.Con); 1307 CMP_OUT2 (con, stats.Con);
1309 CMP_OUT2 (wis, stats.Wis); 1308 CMP_OUT2 (wis, stats.Wis);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines