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.97 by root, Wed Aug 1 19:15:49 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.
… …
638 637
639 case KW_face: 638 case KW_face:
640 face = face_find (f.get_str ()); 639 face = face_find (f.get_str ());
641 break; 640 break;
642 641
642 case KW_sound:
643 sound = sound_find (f.get_str ());
644 break;
645
646 case KW_sound_destroy:
647 sound_destroy = sound_find (f.get_str ());
648 break;
649
643 case KW_x: f.get (x); break; 650 case KW_x: f.get (x); break;
644 case KW_y: f.get (y); break; 651 case KW_y: f.get (y); break;
645 652
646 case KW_Str: // uppercase alias 653 case KW_Str: // uppercase alias
647 case KW_str: f.get (stats.Str); break; 654 case KW_str: f.get (stats.Str); break;
… …
959 randomitems = 0; 966 randomitems = 0;
960 break; 967 break;
961 968
962 case KW_msg: 969 case KW_msg:
963 f.get_ml (KW_endmsg, msg); 970 f.get_ml (KW_endmsg, msg);
964 //TODO: allow longer messages
965 if (strlen (msg) >= HUGE_BUF)
966 {
967 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
968 msg = "ERROR, please report: string too long, winged.\n";
969 }
970 break; 971 break;
971 972
972 case KW_lore: 973 case KW_lore:
973 f.get_ml (KW_endlore, lore); 974 f.get_ml (KW_endlore, lore);
974 //TODO: allow longer messages
975 /* Just print a warning so we can be reasonably safe
976 * about not overflowing the buffer.
977 */
978 if (strlen (lore) > (HUGE_BUF / 2))
979 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
980 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
981 break; 975 break;
982 976
983 case KW_editable: 977 case KW_editable:
984 case KW_editor_folder: 978 case KW_editor_folder:
985 break; 979 break;
… …
1280 CMP_OUT (name_pl); 1274 CMP_OUT (name_pl);
1281 CMP_OUT (custom_name); 1275 CMP_OUT (custom_name);
1282 CMP_OUT (title); 1276 CMP_OUT (title);
1283 CMP_OUT (race); 1277 CMP_OUT (race);
1284 CMP_OUT (slaying); 1278 CMP_OUT (slaying);
1279 CMP_OUT (other_arch);
1285 1280
1286 if (op->msg != tmp->msg) 1281 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1287 f.put (KW_msg, KW_endmsg, op->msg);
1288 if (op->lore != tmp->lore)
1289 f.put (KW_lore, KW_endlore, op->lore); 1282 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1290 if (op->other_arch != tmp->other_arch)
1291 f.put (KW_other_arch, op->other_arch ? &op->other_arch->archname : 0);
1292 1283
1293 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); 1284 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1285 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1286 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1294 1287
1295 if (op->animation_id != tmp->animation_id) 1288 if (op->animation_id != tmp->animation_id)
1296 if (op->animation_id) 1289 if (op->animation_id)
1297 { 1290 {
1298 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1291 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1299 1292
1300 if (!QUERY_FLAG (op, FLAG_ANIMATE)) 1293 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1301 f.put (KW_is_animated, (sint32) 0); 1294 f.put (KW_is_animated, (sint32)0);
1302 } 1295 }
1303 else 1296 else
1304 f.put (KW_animation, (const char *) 0); 1297 f.put (KW_animation, (const char *)0);
1305 1298
1306 CMP_OUT2 (str, stats.Str); 1299 CMP_OUT2 (str, stats.Str);
1307 CMP_OUT2 (dex, stats.Dex); 1300 CMP_OUT2 (dex, stats.Dex);
1308 CMP_OUT2 (con, stats.Con); 1301 CMP_OUT2 (con, stats.Con);
1309 CMP_OUT2 (wis, stats.Wis); 1302 CMP_OUT2 (wis, stats.Wis);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines