… | |
… | |
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 | |
… | |
… | |
1302 | |
1306 | |
1303 | /* We don't need to worry about the arch's extra fields - they |
1307 | /* We don't need to worry about the arch's extra fields - they |
1304 | * will get taken care of the copy_to method. |
1308 | * will get taken care of the copy_to method. |
1305 | */ |
1309 | */ |
1306 | |
1310 | |
|
|
1311 | if (op->uuid) |
1307 | f.put (KW_uuid, op->uuid.c_str ()); |
1312 | f.put (KW_uuid, op->uuid.c_str ()); |
1308 | |
1313 | |
1309 | #define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) |
1314 | #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) |
1315 | #define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) |
1311 | |
1316 | |
1312 | if (object *owner = op->owner) |
1317 | if (object *owner = op->owner) |