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.84 by root, Tue May 22 10:49:58 2007 UTC vs.
Revision 1.99 by root, Sat Aug 25 22:19:26 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) 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, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License 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 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <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.
26 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 26 variable. */
… …
325 * also have to catch is if this object is not using the normal name for 324 * also have to catch is if this object is not using the normal name for
326 * the object. In that case, we also want to use the loaded name. 325 * the object. In that case, we also want to use the loaded name.
327 * Otherwise, what happens is that the the plural name will lose 326 * Otherwise, what happens is that the the plural name will lose
328 * information (appear as just 'hearts' and not 'goblins heart') 327 * information (appear as just 'hearts' and not 'goblins heart')
329 */ 328 */
330 if (arch && name != arch->clone.name && name_pl == arch->clone.name_pl) 329 if (arch && name != arch->object::name && name_pl == arch->object::name_pl)
331 name_pl = 0; 330 name_pl = 0;
332 331
333 if (!name_pl) 332 if (!name_pl)
334 name_pl = name; 333 name_pl = name;
335 334
… …
410 { 409 {
411 object *tmp = get_archetype_by_object_name (slaying); 410 object *tmp = get_archetype_by_object_name (slaying);
412 insert_ob_in_ob (tmp, this); 411 insert_ob_in_ob (tmp, this);
413 randomitems = NULL; /* So another spell isn't created for this object */ 412 randomitems = NULL; /* So another spell isn't created for this object */
414 /* without this, value is all screwed up */ 413 /* without this, value is all screwed up */
415 value = arch->clone.value * inv->value; 414 value = arch->value * inv->value;
416 } 415 }
417 416
418 if (QUERY_FLAG (this, FLAG_MONSTER)) 417 if (QUERY_FLAG (this, FLAG_MONSTER))
419 { 418 {
420 if (stats.hp > stats.maxhp) 419 if (stats.hp > stats.maxhp)
… …
517 516
518next: ; 517next: ;
519 } 518 }
520} 519}
521 520
522#define GET_FLAG(op,flag) \ 521#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
523 if (f.get_sint32 ()) \
524 SET_FLAG (op, flag); \
525 else \
526 CLEAR_FLAG (op, flag) \
527 522
528bool 523bool
529object::parse_kv (object_thawer &f) 524object::parse_kv (object_thawer &f)
530{ 525{
531 object *op_inv = inv; 526 object *op_inv = inv;
… …
606 601
607 if (!other_arch) 602 if (!other_arch)
608 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 ());
609 break; 604 break;
610 605
606 case KW_owner:
607 if (const char *s = f.get_str ())
608 {
609 unsigned int version;
610 unsigned long long seq;
611 char name[256];
612
613 if (3 == sscanf (s, "<%d.%llx>/%256s", &version, &seq, name) && version == 1)
614 {
615 UUID uuid = seq;
616 player *pl = player::find (name);
617
618 if (pl && pl->ob->uuid == uuid)
619 owner = pl->ob;
620 }
621 }
622 break;
623
611 case KW_animation: 624 case KW_animation:
612 { 625 {
613 CLEAR_FLAG (this, FLAG_ANIMATE); 626 CLEAR_FLAG (this, FLAG_ANIMATE);
614 animation_id = 0; 627 animation_id = 0;
615 628
… …
640 f.get (move_slow_penalty); 653 f.get (move_slow_penalty);
641 break; 654 break;
642 655
643 case KW_face: 656 case KW_face:
644 face = face_find (f.get_str ()); 657 face = face_find (f.get_str ());
658 break;
659
660 case KW_sound:
661 sound = sound_find (f.get_str ());
662 if (!sound)
663 f.parse_warn ("sound not found");
664 break;
665
666 case KW_sound_destroy:
667 sound_destroy = sound_find (f.get_str ());
668 if (!sound_destroy)
669 f.parse_warn ("sound not found");
645 break; 670 break;
646 671
647 case KW_x: f.get (x); break; 672 case KW_x: f.get (x); break;
648 case KW_y: f.get (y); break; 673 case KW_y: f.get (y); break;
649 674
… …
777 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 802 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
778 803
779 break; 804 break;
780 805
781 case KW_friendly: 806 case KW_friendly:
782 if (f.get_sint32 ()) 807 if (f.get_bool ())
783 if (type != PLAYER) 808 if (type != PLAYER)
784 add_friendly_object (this); 809 add_friendly_object (this);
785 810
786 break; 811 break;
787 812
… …
963 randomitems = 0; 988 randomitems = 0;
964 break; 989 break;
965 990
966 case KW_msg: 991 case KW_msg:
967 f.get_ml (KW_endmsg, msg); 992 f.get_ml (KW_endmsg, msg);
968 //TODO: allow longer messages
969 if (strlen (msg) >= HUGE_BUF)
970 {
971 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
972 msg = "ERROR, please report: string too long, winged.\n";
973 }
974 break; 993 break;
975 994
976 case KW_lore: 995 case KW_lore:
977 f.get_ml (KW_endlore, lore); 996 f.get_ml (KW_endlore, lore);
978 //TODO: allow longer messages
979 /* Just print a warning so we can be reasonably safe
980 * about not overflowing the buffer.
981 */
982 if (strlen (lore) > (HUGE_BUF / 2))
983 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
984 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
985 break; 997 break;
986 998
987 case KW_editable: 999 case KW_editable:
988 case KW_editor_folder: 1000 case KW_editor_folder:
989 break; 1001 break;
… …
1028 f.next (); 1040 f.next ();
1029 1041
1030 object *op = object::create (); 1042 object *op = object::create ();
1031 1043
1032 op->map = map; 1044 op->map = map;
1033 arch->clone.copy_to (op); 1045 arch->copy_to (op);
1034 // copy_to activates, this should be fixed properly 1046 // copy_to activates, this should be fixed properly
1035 op->deactivate (); 1047 op->deactivate ();
1036 1048
1037 if (!op->parse_kv (f)) 1049 if (!op->parse_kv (f))
1038 { 1050 {
… …
1275 char uids[64]; 1287 char uids[64];
1276 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); 1288 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1277 f.put (KW_uuid, (const char *)uids); 1289 f.put (KW_uuid, (const char *)uids);
1278 } 1290 }
1279 1291
1280#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1292#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1281#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) 1293#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1294
1295 if (object *pl = op->owner)
1296 if (pl->contr)
1297 {
1298 char owner[256];
1299 snprintf (owner, sizeof (owner), "<1.%llx>/%s", (unsigned long long)pl->uuid.seq, &pl->name);
1300 f.put (KW_owner, (const char *)owner);
1301 }
1282 1302
1283 CMP_OUT (name); 1303 CMP_OUT (name);
1284 CMP_OUT (name_pl); 1304 CMP_OUT (name_pl);
1285 CMP_OUT (custom_name); 1305 CMP_OUT (custom_name);
1286 CMP_OUT (title); 1306 CMP_OUT (title);
1287 CMP_OUT (race); 1307 CMP_OUT (race);
1288 CMP_OUT (slaying); 1308 CMP_OUT (slaying);
1289
1290 if (op->msg != tmp->msg)
1291 f.put (KW_msg, KW_endmsg, op->msg);
1292 if (op->lore != tmp->lore)
1293 f.put (KW_lore, KW_endlore, op->lore);
1294
1295 CMP_OUT (other_arch); 1309 CMP_OUT (other_arch);
1296 1310
1311 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1312 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1313
1297 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); 1314 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1315 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1316 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1298 1317
1299 if (op->animation_id != tmp->animation_id) 1318 if (op->animation_id != tmp->animation_id)
1300 if (op->animation_id) 1319 if (op->animation_id)
1301 { 1320 {
1302 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1321 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1303 1322
1304 if (!QUERY_FLAG (op, FLAG_ANIMATE)) 1323 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1305 f.put (KW_is_animated, (sint32) 0); 1324 f.put (KW_is_animated, (sint32)0);
1306 } 1325 }
1307 else 1326 else
1308 f.put (KW_animation, (const char *) 0); 1327 f.put (KW_animation, (const char *)0);
1309 1328
1310 CMP_OUT2 (str, stats.Str); 1329 CMP_OUT2 (str, stats.Str);
1311 CMP_OUT2 (dex, stats.Dex); 1330 CMP_OUT2 (dex, stats.Dex);
1312 CMP_OUT2 (con, stats.Con); 1331 CMP_OUT2 (con, stats.Con);
1313 CMP_OUT2 (wis, stats.Wis); 1332 CMP_OUT2 (wis, stats.Wis);
… …
1344 CMP_OUT (type); 1363 CMP_OUT (type);
1345 CMP_OUT (subtype); 1364 CMP_OUT (subtype);
1346 CMP_OUT (attacktype); 1365 CMP_OUT (attacktype);
1347 1366
1348 for (i = 0; i < NROFATTACKS; i++) 1367 for (i = 0; i < NROFATTACKS; i++)
1349 if (op->resist[i] != tmp->resist[i]) 1368 if (expect_false (op->resist[i] != tmp->resist[i]))
1350 f.put (resist_save[i], op->resist[i]); 1369 f.put (resist_save[i], op->resist[i]);
1351 1370
1352 CMP_OUT (path_attuned); 1371 CMP_OUT (path_attuned);
1353 CMP_OUT (path_repelled); 1372 CMP_OUT (path_repelled);
1354 CMP_OUT (path_denied); 1373 CMP_OUT (path_denied);
… …
1396 CMP_OUT (move_slow); 1415 CMP_OUT (move_slow);
1397 CMP_OUT (move_slow_penalty); 1416 CMP_OUT (move_slow_penalty);
1398 1417
1399 if (op->flag != tmp->flag) 1418 if (op->flag != tmp->flag)
1400 for (i = 0; i <= NUM_FLAGS; i++) 1419 for (i = 0; i <= NUM_FLAGS; i++)
1401 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1420 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1402 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1421 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1403 1422
1404 // save body locations 1423 // save body locations
1405 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1424 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1406 if (op->slot[i].info != tmp->slot[i].info) 1425 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1407 f.put (body_locations[i].save_name, op->slot[i].info); 1426 f.put (body_locations[i].save_name, op->slot[i].info);
1408} 1427}
1409 1428
1410/* 1429/*
1411 * Dumps all variables in an object to a file. 1430 * Dumps all variables in an object to a file.
… …
1413 * the only place this is not set is when saving the player. 1432 * the only place this is not set is when saving the player.
1414 */ 1433 */
1415bool 1434bool
1416object::write (object_freezer &f) 1435object::write (object_freezer &f)
1417{ 1436{
1418 /* Even if the object does have an owner, it would seem that we should
1419 * still save it.
1420 */
1421 if (owner)
1422 return true;
1423
1424 archetype *at = arch ? (archetype *)arch : empty_archetype; 1437 archetype *at = arch ? (archetype *)arch : empty_archetype;
1425 1438
1426 f.put (KW_arch, at->name); 1439 f.put (KW_arch, at->archname);
1427 write_diff (f, this, &at->clone); 1440 write_diff (f, this, at);
1428 1441
1429 for (object *tmp = inv; tmp; tmp = tmp->below) 1442 for (object *tmp = inv; tmp; tmp = tmp->below)
1430 tmp->write (f); 1443 tmp->write (f);
1431 1444
1432 f.put (this); 1445 f.put (this);

Diff Legend

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