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.100 by root, Tue Sep 4 05:43:20 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.
… …
602 601
603 if (!other_arch) 602 if (!other_arch)
604 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); 603 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ());
605 break; 604 break;
606 605
606 case KW_owner:
607 f.delayed_deref (this, owner, f.get_str ());
608 break;
609
607 case KW_animation: 610 case KW_animation:
608 { 611 {
609 CLEAR_FLAG (this, FLAG_ANIMATE); 612 CLEAR_FLAG (this, FLAG_ANIMATE);
610 animation_id = 0; 613 animation_id = 0;
611 614
… …
636 f.get (move_slow_penalty); 639 f.get (move_slow_penalty);
637 break; 640 break;
638 641
639 case KW_face: 642 case KW_face:
640 face = face_find (f.get_str ()); 643 face = face_find (f.get_str ());
644 break;
645
646 case KW_sound:
647 sound = sound_find (f.get_str ());
648 if (!sound)
649 f.parse_warn ("sound not found");
650 break;
651
652 case KW_sound_destroy:
653 sound_destroy = sound_find (f.get_str ());
654 if (!sound_destroy)
655 f.parse_warn ("sound not found");
641 break; 656 break;
642 657
643 case KW_x: f.get (x); break; 658 case KW_x: f.get (x); break;
644 case KW_y: f.get (y); break; 659 case KW_y: f.get (y); break;
645 660
… …
959 randomitems = 0; 974 randomitems = 0;
960 break; 975 break;
961 976
962 case KW_msg: 977 case KW_msg:
963 f.get_ml (KW_endmsg, msg); 978 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; 979 break;
971 980
972 case KW_lore: 981 case KW_lore:
973 f.get_ml (KW_endlore, lore); 982 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; 983 break;
982 984
983 case KW_editable: 985 case KW_editable:
984 case KW_editor_folder: 986 case KW_editor_folder:
985 break; 987 break;
… …
1049int 1051int
1050set_variable (object *op, char *buf) 1052set_variable (object *op, char *buf)
1051{ 1053{
1052 object_thawer f (buf, (AV *)0); 1054 object_thawer f (buf, (AV *)0);
1053 1055
1054 f.next ();
1055 return op->parse_kv (f); 1056 return op->parse_kv (f);
1056} 1057}
1057 1058
1058/* This returns a string of the integer movement type */ 1059/* This returns a string of the integer movement type */
1059#if 0 1060#if 0
… …
1271 char uids[64]; 1272 char uids[64];
1272 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); 1273 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1273 f.put (KW_uuid, (const char *)uids); 1274 f.put (KW_uuid, (const char *)uids);
1274 } 1275 }
1275 1276
1276#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1277#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1277#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) 1278#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1279
1280 if (object *owner = op->owner)
1281 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1278 1282
1279 CMP_OUT (name); 1283 CMP_OUT (name);
1280 CMP_OUT (name_pl); 1284 CMP_OUT (name_pl);
1281 CMP_OUT (custom_name); 1285 CMP_OUT (custom_name);
1282 CMP_OUT (title); 1286 CMP_OUT (title);
1283 CMP_OUT (race); 1287 CMP_OUT (race);
1284 CMP_OUT (slaying); 1288 CMP_OUT (slaying);
1289 CMP_OUT (other_arch);
1285 1290
1286 if (op->msg != tmp->msg) 1291 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); 1292 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 1293
1293 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); 1294 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1295 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1296 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1294 1297
1295 if (op->animation_id != tmp->animation_id) 1298 if (op->animation_id != tmp->animation_id)
1296 if (op->animation_id) 1299 if (op->animation_id)
1297 { 1300 {
1298 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1301 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1299 1302
1300 if (!QUERY_FLAG (op, FLAG_ANIMATE)) 1303 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1301 f.put (KW_is_animated, (sint32) 0); 1304 f.put (KW_is_animated, (sint32)0);
1302 } 1305 }
1303 else 1306 else
1304 f.put (KW_animation, (const char *) 0); 1307 f.put (KW_animation, (const char *)0);
1305 1308
1306 CMP_OUT2 (str, stats.Str); 1309 CMP_OUT2 (str, stats.Str);
1307 CMP_OUT2 (dex, stats.Dex); 1310 CMP_OUT2 (dex, stats.Dex);
1308 CMP_OUT2 (con, stats.Con); 1311 CMP_OUT2 (con, stats.Con);
1309 CMP_OUT2 (wis, stats.Wis); 1312 CMP_OUT2 (wis, stats.Wis);
… …
1340 CMP_OUT (type); 1343 CMP_OUT (type);
1341 CMP_OUT (subtype); 1344 CMP_OUT (subtype);
1342 CMP_OUT (attacktype); 1345 CMP_OUT (attacktype);
1343 1346
1344 for (i = 0; i < NROFATTACKS; i++) 1347 for (i = 0; i < NROFATTACKS; i++)
1345 if (op->resist[i] != tmp->resist[i]) 1348 if (expect_false (op->resist[i] != tmp->resist[i]))
1346 f.put (resist_save[i], op->resist[i]); 1349 f.put (resist_save[i], op->resist[i]);
1347 1350
1348 CMP_OUT (path_attuned); 1351 CMP_OUT (path_attuned);
1349 CMP_OUT (path_repelled); 1352 CMP_OUT (path_repelled);
1350 CMP_OUT (path_denied); 1353 CMP_OUT (path_denied);
… …
1392 CMP_OUT (move_slow); 1395 CMP_OUT (move_slow);
1393 CMP_OUT (move_slow_penalty); 1396 CMP_OUT (move_slow_penalty);
1394 1397
1395 if (op->flag != tmp->flag) 1398 if (op->flag != tmp->flag)
1396 for (i = 0; i <= NUM_FLAGS; i++) 1399 for (i = 0; i <= NUM_FLAGS; i++)
1397 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1400 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1398 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1401 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1399 1402
1400 // save body locations 1403 // save body locations
1401 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1404 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1402 if (op->slot[i].info != tmp->slot[i].info) 1405 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1403 f.put (body_locations[i].save_name, op->slot[i].info); 1406 f.put (body_locations[i].save_name, op->slot[i].info);
1404} 1407}
1405 1408
1406/* 1409/*
1407 * Dumps all variables in an object to a file. 1410 * Dumps all variables in an object to a file.
… …
1409 * the only place this is not set is when saving the player. 1412 * the only place this is not set is when saving the player.
1410 */ 1413 */
1411bool 1414bool
1412object::write (object_freezer &f) 1415object::write (object_freezer &f)
1413{ 1416{
1414 /* Even if the object does have an owner, it would seem that we should
1415 * still save it.
1416 */
1417 if (owner)
1418 return true;
1419
1420 archetype *at = arch ? (archetype *)arch : empty_archetype; 1417 archetype *at = arch ? (archetype *)arch : empty_archetype;
1421 1418
1422 f.put (KW_arch, at->archname); 1419 f.put (KW_arch, at->archname);
1423 write_diff (f, this, at); 1420 write_diff (f, this, at);
1424 1421
… …
1440 object_thawer f (filename); 1437 object_thawer f (filename);
1441 1438
1442 bool success = false; 1439 bool success = false;
1443 bool seen_arch = false; 1440 bool seen_arch = false;
1444 1441
1445 f.next ();
1446
1447 for (;;) 1442 for (;;)
1448 { 1443 {
1449 switch (f.kw) 1444 switch (f.kw)
1450 { 1445 {
1451 case KW_region: 1446 case KW_region:

Diff Legend

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