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.130 by root, Wed Sep 16 23:22:50 2009 UTC vs.
Revision 1.140 by root, Sun Nov 8 22:30:48 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)
… …
980 loading_arch 998 loading_arch
981 ? treasurelist::get (f.get_str ()) 999 ? treasurelist::get (f.get_str ())
982 : treasurelist::find (f.get_str ()); 1000 : treasurelist::find (f.get_str ());
983 1001
984 if (!randomitems) 1002 if (!randomitems)
1003 {
985 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 }
986 } 1007 }
987 else 1008 else
988 randomitems = 0; 1009 randomitems = 0;
989 break; 1010 break;
990 1011
… …
1049 archetype *arch = archetype::find (f.get_str ()); 1070 archetype *arch = archetype::find (f.get_str ());
1050 1071
1051 if (!arch) 1072 if (!arch)
1052 { 1073 {
1053 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); 1074 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
1054 arch = archetype::find ("earthwall"); 1075 arch = archetype::find (shstr_earthwall);
1055 } 1076 }
1056 1077
1057 assert (arch); //D maybe use exception handling of sorts? 1078 assert (arch); //D maybe use exception handling of sorts?
1058 1079
1059 f.next (); 1080 f.next ();
… …
1085 object_thawer f (buf, (AV *)0); 1106 object_thawer f (buf, (AV *)0);
1086 1107
1087 return op->parse_kv (f); 1108 return op->parse_kv (f);
1088} 1109}
1089 1110
1090/* This returns a string of the integer movement type */
1091#if 0
1092// unused function
1093static char *
1094get_string_move_type (MoveType mt)
1095{
1096 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1097 int i, all_count = 0, count;
1098
1099 strcpy (retbuf, "");
1100 strcpy (retbuf_all, " all");
1101
1102 /* Quick check, and probably fairly common */
1103 if (mt == MOVE_ALL)
1104 return retbuf_all + 1;
1105 if (mt == 0)
1106 {
1107 strcpy (retbuf, "0");
1108 return retbuf;
1109 }
1110
1111 /* We basically slide the bits down. Why look at MOVE_ALL?
1112 * because we may want to return a string like 'all -swim',
1113 * and if we just looked at mt, we couldn't get that.
1114 */
1115 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1116 {
1117 if (mt & (1 << count))
1118 {
1119 strcat (retbuf, " ");
1120 strcat (retbuf, move_name[count]);
1121 }
1122 else
1123 {
1124 strcat (retbuf_all, " -");
1125 strcat (retbuf_all, move_name[count]);
1126 all_count++;
1127 }
1128 }
1129 /* Basically, if there is a single negation, return it, eg
1130 * 'all -swim'. But more than that, just return the
1131 * enumerated values. It doesn't make sense to return
1132 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1133 */
1134 if (all_count <= 1)
1135 return retbuf_all + 1;
1136 else
1137 return retbuf + 1;
1138}
1139#endif
1140
1141// compare *op against *tmp and output differences 1111// compare *op against *arch and output differences
1142static void 1112static void
1143write_diff (object_freezer &f, object *op, object *tmp) 1113write_diff (object_freezer &f, object *op, object *arch)
1144{ 1114{
1145 static const keyword resist_save[NROFATTACKS] = { 1115 static const keyword resist_save[NROFATTACKS] = {
1146# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1116# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1147# include "attackinc.h" 1117# include "attackinc.h"
1148# undef def 1118# undef def
… …
1282 1252
1283 /* This saves the key/value lists. We do it first so that any 1253 /* This saves the key/value lists. We do it first so that any
1284 * keys that match field names will be overwritten by the loader. 1254 * keys that match field names will be overwritten by the loader.
1285 */ 1255 */
1286 for (key_value *kv = op->key_values; kv; kv = kv->next) 1256 for (key_value *kv = op->key_values; kv; kv = kv->next)
1287 if (!tmp->key_values || tmp->kv (kv->key) != kv->value) 1257 if (!arch->key_values || arch->kv (kv->key) != kv->value)
1288 f.put (kv->key, kv->value); 1258 f.put (kv->key, kv->value);
1289 1259
1290 /* We don't need to worry about the arch's extra fields - they 1260 if (op->uuid)
1291 * will get taken care of the copy_to method.
1292 */
1293
1294 f.put (KW_uuid, op->uuid.c_str ()); 1261 f.put (KW_uuid, op->uuid.c_str ());
1295 1262
1296#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) 1263#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW_ ## v, op->v)
1297#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) 1264#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW_ ## k, op->v)
1265
1266 CMP_OUT (x);
1267 CMP_OUT (y);
1268
1269 CMP_OUT (type);
1270 CMP_OUT (subtype);
1271 CMP_OUT (direction);
1272
1273 CMP_OUT (name);
1274 CMP_OUT (name_pl);
1275
1276 CMP_OUT (speed);
1277 CMP_OUT (speed_left);
1278
1279 CMP_OUT (title);
1280 CMP_OUT (race);
1281 CMP_OUT (slaying);
1282 CMP_OUT (skill);
1283
1284 CMP_OUT (tag);
1285 CMP_OUT (custom_name);
1298 1286
1299 if (object *owner = op->owner) 1287 if (object *owner = op->owner)
1300 f.put (KW_owner, static_cast<const char *>(owner->ref ())); 1288 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1301 1289
1302 CMP_OUT (name); 1290 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1303 CMP_OUT (name_pl); 1291
1304 CMP_OUT (custom_name);
1305 CMP_OUT (title);
1306 CMP_OUT (race);
1307 CMP_OUT (skill);
1308 CMP_OUT (slaying);
1309 CMP_OUT (tag);
1310 CMP_OUT (other_arch); 1292 CMP_OUT (other_arch);
1311 1293
1312 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1294 if (op->msg != arch->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1313 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); 1295 if (op->lore != arch->lore) f.put (KW_lore, KW_endlore, op->lore);
1314 1296
1315 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1297 if (op->face != arch->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1316 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1298 if (op->sound != arch->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1317 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1299 if (op->sound_destroy != arch->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1318 1300
1319 if (op->animation_id != tmp->animation_id) 1301 if (op->animation_id != arch->animation_id)
1320 if (op->has_anim ()) 1302 if (op->has_anim ())
1321 f.put (KW_animation, op->anim ().name); 1303 f.put (KW_animation, op->anim ().name);
1322 else 1304 else
1323 { 1305 {
1324 f.put (KW_animation, (const char *)0); 1306 f.put (KW_animation, (const char *)0);
… …
1340 CMP_OUT2 (grace, stats.grace); 1322 CMP_OUT2 (grace, stats.grace);
1341 CMP_OUT2 (maxgrace, stats.maxgrace); 1323 CMP_OUT2 (maxgrace, stats.maxgrace);
1342 CMP_OUT2 (exp, stats.exp); 1324 CMP_OUT2 (exp, stats.exp);
1343 1325
1344 CMP_OUT (perm_exp); 1326 CMP_OUT (perm_exp);
1345 CMP_OUT (expmul); 1327 //CMP_OUT (expmul);
1346 1328
1347 CMP_OUT2 (food, stats.food); 1329 CMP_OUT2 (food, stats.food);
1348 CMP_OUT2 (dam, stats.dam); 1330 CMP_OUT2 (dam, stats.dam);
1349 CMP_OUT2 (luck, stats.luck); 1331 CMP_OUT2 (luck, stats.luck);
1350 CMP_OUT2 (wc, stats.wc); 1332 CMP_OUT2 (wc, stats.wc);
1351 CMP_OUT2 (ac, stats.ac); 1333 CMP_OUT2 (ac, stats.ac);
1352 1334
1353 CMP_OUT (x);
1354 CMP_OUT (y);
1355 CMP_OUT (speed);
1356 CMP_OUT (speed_left);
1357 CMP_OUT2 (move_state, move_status); 1335 CMP_OUT2 (move_state, move_status);
1358 CMP_OUT (attack_movement); 1336 CMP_OUT (attack_movement);
1359 CMP_OUT (nrof); 1337 CMP_OUT (nrof);
1360 CMP_OUT (level); 1338 CMP_OUT (level);
1361 CMP_OUT (direction);
1362 CMP_OUT (type);
1363 CMP_OUT (subtype);
1364 CMP_OUT (attacktype); 1339 CMP_OUT (attacktype);
1365 1340
1341 // using memcmp here seems to be a loss - us gcc vectorising?
1366 for (int i = 0; i < NROFATTACKS; i++) 1342 for (int i = 0; i < NROFATTACKS; i++)
1367 if (expect_false (op->resist[i] != tmp->resist[i])) 1343 if (expect_false (op->resist[i] != arch->resist[i]))
1368 f.put (resist_save[i], op->resist[i]); 1344 f.put (resist_save[i], op->resist[i]);
1369 1345
1370 CMP_OUT (path_attuned); 1346 CMP_OUT (path_attuned);
1371 CMP_OUT (path_repelled); 1347 CMP_OUT (path_repelled);
1372 CMP_OUT (path_denied); 1348 CMP_OUT (path_denied);
… …
1411 CMP_OUT (move_on); 1387 CMP_OUT (move_on);
1412 CMP_OUT (move_off); 1388 CMP_OUT (move_off);
1413 CMP_OUT (move_slow); 1389 CMP_OUT (move_slow);
1414 CMP_OUT (move_slow_penalty); 1390 CMP_OUT (move_slow_penalty);
1415 1391
1416 if (op->flag != tmp->flag) 1392 // obj_original is the only commonly differing flag between archetype
1393 // and object, so special-case it here to be able to skip the loop
1394 object::flags_t diff = op->flags ^ arch->flags;
1395
1396 if (expect_true (diff.any ()))
1397 {
1398 if (expect_false (diff.reset (FLAG_OBJ_ORIGINAL).any ()))
1399 {
1400 // some other flags differ, too
1417 for (int i = 0; i <= NUM_FLAGS; i++) 1401 for (int i = 0; i < NUM_FLAGS; i++)
1418 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1402 if (expect_false (flag_names [i] && op->flag [i] != arch->flag [i]))
1419 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1403 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1404 }
1405 else
1406 {
1407 // only obj_original differs
1408 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? "1" : "0");
1409 }
1410 }
1420 1411
1421 // save body locations 1412 // save body locations. gcc's memcmp does an abysmal job when used
1422 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1413 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1423 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1414 if (expect_false (op->slot[i].info != arch->slot[i].info))
1424 f.put (body_locations[i].save_name, op->slot[i].info); 1415 f.put (body_locations[i].save_name, op->slot[i].info);
1425} 1416}
1426 1417
1427/* 1418/*
1428 * Dumps all variables in an object to a file. 1419 * Dumps all variables in an object to a file.

Diff Legend

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