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.52 by root, Thu Feb 1 19:15:38 2007 UTC vs.
Revision 1.55 by root, Thu Feb 8 03:09:31 2007 UTC

… …
29#include <global.h> 29#include <global.h>
30#include <loader.h> 30#include <loader.h>
31#include <sproto.h> 31#include <sproto.h>
32 32
33///////////////////////////////////////////////////////////////////////////// 33/////////////////////////////////////////////////////////////////////////////
34
35loader_base::~loader_base ()
36{
37}
34 38
35// the base class warns about and skips everything 39// the base class warns about and skips everything
36archetype * 40archetype *
37loader_base::get_arch (const char *name) 41loader_base::get_arch (const char *name)
38{ 42{
… …
866 case KW_path_denied: thawer.get (op->path_denied); break; 870 case KW_path_denied: thawer.get (op->path_denied); break;
867 case KW_invisible: thawer.get (op->invisible); break; 871 case KW_invisible: thawer.get (op->invisible); break;
868 case KW_magic: thawer.get (op->magic); break; 872 case KW_magic: thawer.get (op->magic); break;
869 case KW_state: thawer.get (op->state); break; 873 case KW_state: thawer.get (op->state); break;
870 case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; 874 case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break;
871 case KW_material: thawer.get (op->material); break; 875 case KW_material: thawer.get (op->materials); break; //TODO: nuke
872 case KW_materialname: thawer.get (op->materialname); break; 876 case KW_materialname: thawer.get (op->materialname); break;
873 877
874 /* These are the new values */ 878 /* These are the new values */
875 case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; 879 case KW_move_block: set_move (op->move_block, thawer.get_str ()); break;
876 case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; 880 case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break;
… …
1138 add_button_link (op, op->map, thawer.get_sint32 ()); 1142 add_button_link (op, op->map, thawer.get_sint32 ());
1139 break; 1143 break;
1140 1144
1141 case KW_randomitems: 1145 case KW_randomitems:
1142 op->randomitems = find_treasurelist (thawer.get_str ()); 1146 op->randomitems = find_treasurelist (thawer.get_str ());
1147 //if (!op->randomitems)
1148 // LOG (llevError, "%s uses unknown randomitems '%s'.\n", op->debug_desc (), thawer.get_str ());
1143 break; 1149 break;
1144 1150
1145 case KW_msg: 1151 case KW_msg:
1146 thawer.get_ml (KW_endmsg, op->msg); 1152 thawer.get_ml (KW_endmsg, op->msg);
1147 //TODO: allow longer messages 1153 //TODO: allow longer messages
… …
1535 f.put (resist_save[i], op->resist[i]); 1541 f.put (resist_save[i], op->resist[i]);
1536 1542
1537 CMP_OUT (path_attuned); 1543 CMP_OUT (path_attuned);
1538 CMP_OUT (path_repelled); 1544 CMP_OUT (path_repelled);
1539 CMP_OUT (path_denied); 1545 CMP_OUT (path_denied);
1540 CMP_OUT (material); 1546 CMP_OUT2 (material, materials);//TODO: nuke
1541 CMP_OUT (materialname); 1547 CMP_OUT (materialname);
1542 CMP_OUT (value); 1548 CMP_OUT (value);
1543 CMP_OUT (carrying); 1549 CMP_OUT (carrying);
1544 CMP_OUT (weight); 1550 CMP_OUT (weight);
1545 CMP_OUT (invisible); 1551 CMP_OUT (invisible);

Diff Legend

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