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.132 by root, Thu Sep 17 01:57:31 2009 UTC vs.
Revision 1.136 by root, Wed Nov 4 00:02:48 2009 UTC

… …
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 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>
… …
993 loading_arch 994 loading_arch
994 ? treasurelist::get (f.get_str ()) 995 ? treasurelist::get (f.get_str ())
995 : treasurelist::find (f.get_str ()); 996 : treasurelist::find (f.get_str ());
996 997
997 if (!randomitems) 998 if (!randomitems)
999 {
998 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 1000 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
1001 randomitems = treasurelist::get (shstr_none); // avoid crashes
1002 }
999 } 1003 }
1000 else 1004 else
1001 randomitems = 0; 1005 randomitems = 0;
1002 break; 1006 break;
1003 1007
… …
1097{ 1101{
1098 object_thawer f (buf, (AV *)0); 1102 object_thawer f (buf, (AV *)0);
1099 1103
1100 return op->parse_kv (f); 1104 return op->parse_kv (f);
1101} 1105}
1102
1103/* This returns a string of the integer movement type */
1104#if 0
1105// unused function
1106static char *
1107get_string_move_type (MoveType mt)
1108{
1109 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1110 int i, all_count = 0, count;
1111
1112 strcpy (retbuf, "");
1113 strcpy (retbuf_all, " all");
1114
1115 /* Quick check, and probably fairly common */
1116 if (mt == MOVE_ALL)
1117 return retbuf_all + 1;
1118 if (mt == 0)
1119 {
1120 strcpy (retbuf, "0");
1121 return retbuf;
1122 }
1123
1124 /* We basically slide the bits down. Why look at MOVE_ALL?
1125 * because we may want to return a string like 'all -swim',
1126 * and if we just looked at mt, we couldn't get that.
1127 */
1128 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1129 {
1130 if (mt & (1 << count))
1131 {
1132 strcat (retbuf, " ");
1133 strcat (retbuf, move_name[count]);
1134 }
1135 else
1136 {
1137 strcat (retbuf_all, " -");
1138 strcat (retbuf_all, move_name[count]);
1139 all_count++;
1140 }
1141 }
1142 /* Basically, if there is a single negation, return it, eg
1143 * 'all -swim'. But more than that, just return the
1144 * enumerated values. It doesn't make sense to return
1145 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1146 */
1147 if (all_count <= 1)
1148 return retbuf_all + 1;
1149 else
1150 return retbuf + 1;
1151}
1152#endif
1153 1106
1154// compare *op against *tmp and output differences 1107// compare *op against *tmp and output differences
1155static void 1108static void
1156write_diff (object_freezer &f, object *op, object *tmp) 1109write_diff (object_freezer &f, object *op, object *tmp)
1157{ 1110{
… …
1302 1255
1303 /* We don't need to worry about the arch's extra fields - they 1256 /* We don't need to worry about the arch's extra fields - they
1304 * will get taken care of the copy_to method. 1257 * will get taken care of the copy_to method.
1305 */ 1258 */
1306 1259
1260 if (op->uuid)
1307 f.put (KW_uuid, op->uuid.c_str ()); 1261 f.put (KW_uuid, op->uuid.c_str ());
1308 1262
1309#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 != tmp->v)) f.put (KW_ ## v, op->v)
1310#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 != tmp->v)) f.put (KW_ ## k, op->v)
1311 1265
1312 if (object *owner = op->owner) 1266 if (object *owner = op->owner)

Diff Legend

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