ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/player.C
(Generate patch)

Comparing deliantra/server/common/player.C (file contents):
Revision 1.59 by root, Wed Nov 11 04:45:22 2009 UTC vs.
Revision 1.60 by root, Wed Nov 11 23:27:56 2009 UTC

72 ob->container = 0; 72 ob->container = 0;
73 73
74 if (ob->map) 74 if (ob->map)
75 maplevel = ob->map->path; 75 maplevel = ob->map->path;
76 76
77#define PL_OUT(k) freezer.put (KW_ ## k, k) 77#define PL_OUT(k) freezer.put (KW(k), k)
78#define PL_OUT2(k,v) freezer.put (KW_ ## k, v) 78#define PL_OUT2(k,v) freezer.put (KW(k), v)
79 79
80 PL_OUT (password); 80 PL_OUT (password);
81 PL_OUT2 (title, own_title); 81 PL_OUT2 (title, own_title);
82 PL_OUT (gender); 82 PL_OUT (gender);
83 PL_OUT (hintmode); 83 PL_OUT (hintmode);
90 PL_OUT (digestion); 90 PL_OUT (digestion);
91 PL_OUT2 (pickup, mode); 91 PL_OUT2 (pickup, mode);
92 PL_OUT (outputs_sync); 92 PL_OUT (outputs_sync);
93 PL_OUT (outputs_count); 93 PL_OUT (outputs_count);
94 94
95 freezer.put (KW_usekeys, usekeys == key_inventory ? "key_inventory" : (usekeys == keyrings ? "keyrings" : "containers")); 95 freezer.put (KW(usekeys), usekeys == key_inventory ? CS(key_inventory) : (usekeys == keyrings ? CS(keyrings) : CS(containers)));
96 freezer.put (KW_unapply, unapply == unapply_nochoice ? "unapply_nochoice" : (unapply == unapply_never ? "unapply_never" : "unapply_always")); 96 freezer.put (KW(unapply), unapply == unapply_nochoice ? CS(unapply_nochoice) : (unapply == unapply_never ? CS(unapply_never) : CS(unapply_always)));
97 97
98 PL_OUT2 (map, maplevel); 98 PL_OUT2 (map, maplevel);
99 PL_OUT (savebed_map); 99 PL_OUT (savebed_map);
100 PL_OUT (bed_x); 100 PL_OUT (bed_x);
101 PL_OUT (bed_y); 101 PL_OUT (bed_y);
117 freezer.add (levsp [i]); freezer.add ('\n'); 117 freezer.add (levsp [i]); freezer.add ('\n');
118 freezer.add (levgrace[i]); freezer.add ('\n'); 118 freezer.add (levgrace[i]); freezer.add ('\n');
119 } 119 }
120 120
121 freezer.put (ob->contr); 121 freezer.put (ob->contr);
122 freezer.put (KW_endplst); 122 freezer.put (KW(endplst));
123 123
124 CLEAR_FLAG (ob, FLAG_WIZ); 124 CLEAR_FLAG (ob, FLAG_WIZ);
125 ob->write (freezer); 125 ob->write (freezer);
126 126
127 /* Eneq(@csd.uu.se): Reveal the container if we have one. */ 127 /* Eneq(@csd.uu.se): Reveal the container if we have one. */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines