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.126 by root, Thu Jan 1 11:41:17 2009 UTC vs.
Revision 1.137 by root, Thu Nov 5 15:43:21 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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 Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
… …
26#include <sproto.h> 27#include <sproto.h>
27 28
28///////////////////////////////////////////////////////////////////////////// 29/////////////////////////////////////////////////////////////////////////////
29 30
30extern archetype *loading_arch; 31extern archetype *loading_arch;
32
33//+GPL
31 34
32/* This table is only necessary to convert objects that existed before the 35/* This table is only necessary to convert objects that existed before the
33 * spell object conversion to the new object. It was not practical 36 * spell object conversion to the new object. It was not practical
34 * to go through every mapping looking for every potion, rod, wand, etc 37 * to go through every mapping looking for every potion, rod, wand, etc
35 * that had a sp set and update to the new value. So this maps the 38 * that had a sp set and update to the new value. So this maps the
… …
461 } 464 }
462 else 465 else
463 move_type = MOVE_WALK; 466 move_type = MOVE_WALK;
464 } 467 }
465 } 468 }
469
470 // if the object has an animation, try to provide a default face
471 if (has_anim ())
472 {
473 const animation &anim_ob = anim ();
474
475 if (anim_speed)
476 // if this item is time-animated, force the last frame
477 animate_object (this, 0);
478 else if (flag [FLAG_MONSTER])
479 // if it is a monster, set appropriate facing
480 animate_object (this, direction);
481 }
466} 482}
467 483
468static void 484static void
469set_move (MoveType &mt, const char *str) 485set_move (MoveType &mt, const char *str)
470{ 486{
… …
522 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str); 538 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
523 539
524next: ; 540next: ;
525 } 541 }
526} 542}
543
544//-GPL
527 545
528#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () 546#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
529 547
530bool 548bool
531object::parse_kv (object_thawer &f) 549object::parse_kv (object_thawer &f)
… …
927 case KW_anim_speed: f.get (anim_speed); break; 945 case KW_anim_speed: f.get (anim_speed); break;
928 case KW_container: f.get (weight_limit); break; 946 case KW_container: f.get (weight_limit); break;
929 case KW_will_apply: f.get (will_apply); break; 947 case KW_will_apply: f.get (will_apply); break;
930 case KW_attack_movement: f.get (attack_movement); break; 948 case KW_attack_movement: f.get (attack_movement); break;
931 case KW_move_state: f.get (move_status); break; 949 case KW_move_state: f.get (move_status); break;
932 case KW_expmul: f.get (expmul); break; 950 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
933 case KW_glow_radius: f.get (glow_radius); break; 951 case KW_glow_radius: f.get (glow_radius); break;
934 case KW_weapontype: f.get (weapontype); break; 952 case KW_weapontype: f.get (weapontype); break;
935 case KW_casting_time: f.get (casting_time); break; 953 case KW_casting_time: f.get (casting_time); break;
936 954
937 // elevation is deprecated 955 // elevation is deprecated
… …
963 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; 981 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
964 case KW_can_apply: 982 case KW_can_apply:
965 break; 983 break;
966 984
967 case KW_connected: 985 case KW_connected:
968 add_button_link (this, map, f.get_sint32 ()); 986 {
987 shstr connected;
988
989 f.get (connected);
990 add_link (map, connected);
991 }
969 break; 992 break;
970 993
971 case KW_randomitems: 994 case KW_randomitems:
972 if (f.get_str ()) 995 if (f.get_str ())
973 { 996 {
… …
975 loading_arch 998 loading_arch
976 ? treasurelist::get (f.get_str ()) 999 ? treasurelist::get (f.get_str ())
977 : treasurelist::find (f.get_str ()); 1000 : treasurelist::find (f.get_str ());
978 1001
979 if (!randomitems) 1002 if (!randomitems)
1003 {
980 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 1004 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
1005 randomitems = treasurelist::get (shstr_none); // avoid crashes
1006 }
981 } 1007 }
982 else 1008 else
983 randomitems = 0; 1009 randomitems = 0;
984 break; 1010 break;
985 1011
… …
1079{ 1105{
1080 object_thawer f (buf, (AV *)0); 1106 object_thawer f (buf, (AV *)0);
1081 1107
1082 return op->parse_kv (f); 1108 return op->parse_kv (f);
1083} 1109}
1084
1085/* This returns a string of the integer movement type */
1086#if 0
1087// unused function
1088static char *
1089get_string_move_type (MoveType mt)
1090{
1091 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1092 int i, all_count = 0, count;
1093
1094 strcpy (retbuf, "");
1095 strcpy (retbuf_all, " all");
1096
1097 /* Quick check, and probably fairly common */
1098 if (mt == MOVE_ALL)
1099 return retbuf_all + 1;
1100 if (mt == 0)
1101 {
1102 strcpy (retbuf, "0");
1103 return retbuf;
1104 }
1105
1106 /* We basically slide the bits down. Why look at MOVE_ALL?
1107 * because we may want to return a string like 'all -swim',
1108 * and if we just looked at mt, we couldn't get that.
1109 */
1110 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1111 {
1112 if (mt & (1 << count))
1113 {
1114 strcat (retbuf, " ");
1115 strcat (retbuf, move_name[count]);
1116 }
1117 else
1118 {
1119 strcat (retbuf_all, " -");
1120 strcat (retbuf_all, move_name[count]);
1121 all_count++;
1122 }
1123 }
1124 /* Basically, if there is a single negation, return it, eg
1125 * 'all -swim'. But more than that, just return the
1126 * enumerated values. It doesn't make sense to return
1127 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1128 */
1129 if (all_count <= 1)
1130 return retbuf_all + 1;
1131 else
1132 return retbuf + 1;
1133}
1134#endif
1135 1110
1136// compare *op against *tmp and output differences 1111// compare *op against *tmp and output differences
1137static void 1112static void
1138write_diff (object_freezer &f, object *op, object *tmp) 1113write_diff (object_freezer &f, object *op, object *tmp)
1139{ 1114{
… …
1284 1259
1285 /* We don't need to worry about the arch's extra fields - they 1260 /* We don't need to worry about the arch's extra fields - they
1286 * will get taken care of the copy_to method. 1261 * will get taken care of the copy_to method.
1287 */ 1262 */
1288 1263
1264 if (op->uuid)
1289 f.put (KW_uuid, op->uuid.c_str ()); 1265 f.put (KW_uuid, op->uuid.c_str ());
1290 1266
1291#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) 1267#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1292#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) 1268#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1293 1269
1294 if (object *owner = op->owner) 1270 if (object *owner = op->owner)
… …
1310 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1286 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1311 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1287 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1312 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1288 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1313 1289
1314 if (op->animation_id != tmp->animation_id) 1290 if (op->animation_id != tmp->animation_id)
1315 if (op->animation_id) 1291 if (op->has_anim ())
1316 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1292 f.put (KW_animation, op->anim ().name);
1317 else 1293 else
1318 { 1294 {
1319 f.put (KW_animation, (const char *)0); 1295 f.put (KW_animation, (const char *)0);
1320 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? 1296 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1321 } 1297 }
… …
1378 CMP_OUT (last_grace); 1354 CMP_OUT (last_grace);
1379 CMP_OUT (last_eat); 1355 CMP_OUT (last_eat);
1380 CMP_OUT (glow_radius); 1356 CMP_OUT (glow_radius);
1381 1357
1382 if (op->flag [FLAG_IS_LINKED]) 1358 if (op->flag [FLAG_IS_LINKED])
1383 if (int i = get_button_value (op)) 1359 if (auto (ol, op->find_link ()))
1384 f.put (KW_connected, i); 1360 f.put (KW_connected, ol->id);
1385 1361
1386 CMP_OUT (randomitems); 1362 CMP_OUT (randomitems);
1387 CMP_OUT2 (container, weight_limit); 1363 CMP_OUT2 (container, weight_limit);
1388 1364
1389 CMP_OUT (run_away); 1365 CMP_OUT (run_away);
… …
1425 * the only place this is not set is when saving the player. 1401 * the only place this is not set is when saving the player.
1426 */ 1402 */
1427bool 1403bool
1428object::write (object_freezer &f) 1404object::write (object_freezer &f)
1429{ 1405{
1430 archetype *at = arch ? arch : archetype::empty; 1406 if (is_arch ())
1431 1407 {
1408 f.put (KW_object, arch->archname);
1409 write_diff (f, this, archetype::empty);
1410 }
1411 else
1412 {
1432 f.put (KW_arch, at->archname); 1413 f.put (KW_arch, arch->archname);
1433 write_diff (f, this, at); 1414 write_diff (f, this, arch);
1415 }
1434 1416
1435 for (object *tmp = inv; tmp; tmp = tmp->below) 1417 for (object *tmp = inv; tmp; tmp = tmp->below)
1436 tmp->write (f); 1418 tmp->write (f);
1437 1419
1438 f.put (this); 1420 f.put (this);

Diff Legend

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