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.17 by root, Tue Jan 9 01:28:32 2007 UTC vs.
Revision 1.22 by root, Thu Mar 1 20:25:06 2007 UTC

… …
47int 47int
48is_dragon_pl (const object *op) 48is_dragon_pl (const object *op)
49{ 49{
50 if (op != NULL && op->type == PLAYER && op->arch != NULL && op->arch->clone.race != NULL && strcmp (op->arch->clone.race, "dragon") == 0) 50 if (op != NULL && op->type == PLAYER && op->arch != NULL && op->arch->clone.race != NULL && strcmp (op->arch->clone.race, "dragon") == 0)
51 return 1; 51 return 1;
52
52 return 0; 53 return 0;
53} 54}
54 55
55/* 56/*
56 * If final is set, it a clean/final save, not a backup, ie dont remove objects from inventory 57 * If final is set, it a clean/final save, not a backup, ie dont remove objects from inventory
… …
63 int wiz = ob->flag [FLAG_WIZ]; 64 int wiz = ob->flag [FLAG_WIZ];
64 65
65 /* Eneq(@csd.uu.se): If we have an open container hide it. */ 66 /* Eneq(@csd.uu.se): If we have an open container hide it. */
66 object *container = ob->container; 67 object *container = ob->container;
67 ob->container = 0; 68 ob->container = 0;
69
70 if (ob->map)
71 maplevel = ob->map->path;
68 72
69#define PL_OUT(k) freezer.put (KW_ ## k, k) 73#define PL_OUT(k) freezer.put (KW_ ## k, k)
70#define PL_OUT2(k,v) freezer.put (KW_ ## k, v) 74#define PL_OUT2(k,v) freezer.put (KW_ ## k, v)
71 75
72 PL_OUT (password); 76 PL_OUT (password);
… …
82 PL_OUT (digestion); 86 PL_OUT (digestion);
83 PL_OUT2 (pickup, mode); 87 PL_OUT2 (pickup, mode);
84 PL_OUT (outputs_sync); 88 PL_OUT (outputs_sync);
85 PL_OUT (outputs_count); 89 PL_OUT (outputs_count);
86 90
87 freezer.put (KW_usekeys, usekeys == key_inventory ? "key_inventory" : (usekeys == keyrings ? "keyrings" : "containers")); 91 freezer.put (KW_usekeys, usekeys == key_inventory ? "key_inventory" : (usekeys == keyrings ? "keyrings" : "containers"));
88 freezer.put (KW_unapply, unapply == unapply_nochoice ? "unapply_nochoice" : (unapply == unapply_never ? "unapply_never" : "unapply_always")); 92 freezer.put (KW_unapply, unapply == unapply_nochoice ? "unapply_nochoice" : (unapply == unapply_never ? "unapply_never" : "unapply_always"));
89 93
90 PL_OUT2 (map, maplevel); 94 PL_OUT2 (map, maplevel);
91 PL_OUT (savebed_map); 95 PL_OUT (savebed_map);
92 PL_OUT (bed_x); 96 PL_OUT (bed_x);
… …
112 freezer.put (ob->contr); 116 freezer.put (ob->contr);
113 freezer.put (KW_endplst); 117 freezer.put (KW_endplst);
114 118
115 SET_FLAG (ob, FLAG_NO_FIX_PLAYER); 119 SET_FLAG (ob, FLAG_NO_FIX_PLAYER);
116 CLEAR_FLAG (ob, FLAG_WIZ); 120 CLEAR_FLAG (ob, FLAG_WIZ);
117 save_object (freezer, ob, 1); /* don't check and don't remove */ 121 ob->write (freezer);
118 122
119 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 123 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
120 124
121 /* Eneq(@csd.uu.se): Reveal the container if we have one. */ 125 /* Eneq(@csd.uu.se): Reveal the container if we have one. */
122 ob->container = container; 126 ob->container = container;
… …
138 142
139 return freezer.save (path); 143 return freezer.save (path);
140} 144}
141 145
142player * 146player *
143player::load_pl (object_thawer &thawer) 147player::load_pl (object_thawer &f)
144{ 148{
149 int maxerrs = 20;
150
145 player *pl = new player; 151 player *pl = new player;
146 152
147 pl->savebed_map = first_map_path; 153 pl->savebed_map = first_map_path;
148
149 /* this loads the standard objects values. */
150 pl->set_object (object::create ());
151 154
152 /* Loop through the file, loading the rest of the values */ 155 /* Loop through the file, loading the rest of the values */
153 for (;;) 156 for (;;)
154 { 157 {
155 keyword kw = thawer.get_kv ();
156
157 switch (kw) 158 switch (f.kw)
158 { 159 {
159 case KW_EOF: 160 case KW_EOF:
160 LOG (llevError, "%s: unexpected EOF while reading player header\n", thawer.name); 161 LOG (llevError, "%s: unexpected EOF while reading player header\n", f.name);
161 pl->ob->destroy (); 162 goto failure;
162 pl->destroy (); 163
164 default:
165 LOG (llevError, "%s: skipping unknown key in player header: %s\n", f.name, f.kw_str);
166 if (!--maxerrs) goto failure;
163 return 0; 167 break;
164 168
165 case KW_ERROR: 169 case KW_ERROR:
166 LOG (llevError, "%s: error while reading player header, skipping (%s,%s)\n", thawer.name, thawer.last_keyword, thawer.last_value); 170 LOG (llevError, "%s: parse error while reading player header, skipping (%s,%s).\n", f.name, f.kw_str, f.value);
171 if (!--maxerrs) goto failure;
167 break; 172 break;
168 173
169 case KW_endplst: 174 case KW_endplst:
175 f.next ();
176
177 if (object *op = pl->ob->read (f))
178 pl->set_object (op);
179 else
170 goto done; 180 goto failure;
171 181
182 INVOKE_PLAYER (LOAD, pl);
183
184 return pl;
185
172 case KW_oid: thawer.get (pl, thawer.get_sint32 ()); break; 186 case KW_oid: f.get (pl, f.get_sint32 ()); break;
173 case KW_password: assign (pl->password , thawer.get_str ()); break; 187 case KW_password: assign (pl->password , f.get_str ()); break;
174 case KW_title: assign (pl->own_title, thawer.get_str ()); break; 188 case KW_title: assign (pl->own_title, f.get_str ()); break;
175 case KW_shoottype: pl->shoottype = (rangetype) thawer.get_sint32 (); break; 189 case KW_shoottype: pl->shoottype = (rangetype) f.get_sint32 (); break;
176 case KW_bowtype: pl->bowtype = (bowtype_t) thawer.get_sint32 (); break; 190 case KW_bowtype: pl->bowtype = (bowtype_t) f.get_sint32 (); break;
177 case KW_petmode: pl->petmode = (petmode_t) thawer.get_sint32 (); break; 191 case KW_petmode: pl->petmode = (petmode_t) f.get_sint32 (); break;
178 case KW_listening: thawer.get (pl->listening); break; 192 case KW_listening: f.get (pl->listening); break;
179 case KW_peaceful: thawer.get (pl->peaceful); break; 193 case KW_peaceful: f.get (pl->peaceful); break;
180 case KW_digestion: thawer.get (pl->digestion); break; 194 case KW_digestion: f.get (pl->digestion); break;
181 case KW_pickup: thawer.get (pl->mode); break; 195 case KW_pickup: f.get (pl->mode); break;
182 case KW_outputs_sync: thawer.get (pl->outputs_sync); break; 196 case KW_outputs_sync: f.get (pl->outputs_sync); break;
183 case KW_outputs_count: thawer.get (pl->outputs_count); break; 197 case KW_outputs_count: f.get (pl->outputs_count); break;
184 case KW_map: thawer.get (pl->maplevel); break; 198 case KW_map: f.get (pl->maplevel); break;
185 case KW_savebed_map: thawer.get (pl->savebed_map); break; 199 case KW_savebed_map: f.get (pl->savebed_map); break;
186 case KW_bed_x: thawer.get (pl->bed_x); break; 200 case KW_bed_x: f.get (pl->bed_x); break;
187 case KW_bed_y: thawer.get (pl->bed_y); break; 201 case KW_bed_y: f.get (pl->bed_y); break;
188 case KW_weapon_sp: thawer.get (pl->weapon_sp); break; 202 case KW_weapon_sp: f.get (pl->weapon_sp); break;
189 case KW_Str: thawer.get (pl->orig_stats.Str); break; 203 case KW_Str: f.get (pl->orig_stats.Str); break;
190 case KW_Dex: thawer.get (pl->orig_stats.Dex); break; 204 case KW_Dex: f.get (pl->orig_stats.Dex); break;
191 case KW_Con: thawer.get (pl->orig_stats.Con); break; 205 case KW_Con: f.get (pl->orig_stats.Con); break;
192 case KW_Int: thawer.get (pl->orig_stats.Int); break; 206 case KW_Int: f.get (pl->orig_stats.Int); break;
193 case KW_Pow: thawer.get (pl->orig_stats.Pow); break; 207 case KW_Pow: f.get (pl->orig_stats.Pow); break;
194 case KW_Wis: thawer.get (pl->orig_stats.Wis); break; 208 case KW_Wis: f.get (pl->orig_stats.Wis); break;
195 case KW_Cha: thawer.get (pl->orig_stats.Cha); break; 209 case KW_Cha: f.get (pl->orig_stats.Cha); break;
196 case KW_gen_hp: thawer.get (pl->gen_hp); break; 210 case KW_gen_hp: f.get (pl->gen_hp); break;
197 case KW_gen_sp: thawer.get (pl->gen_sp); break; 211 case KW_gen_sp: f.get (pl->gen_sp); break;
198 case KW_gen_grace: thawer.get (pl->gen_grace); break; 212 case KW_gen_grace: f.get (pl->gen_grace); break;
199 213
200 case KW_usekeys: 214 case KW_usekeys:
201 if (!strcmp (thawer.get_str (), "key_inventory")) 215 if (!strcmp (f.get_str (), "key_inventory"))
202 pl->usekeys = key_inventory; 216 pl->usekeys = key_inventory;
203 else if (!strcmp (thawer.get_str (), "keyrings")) 217 else if (!strcmp (f.get_str (), "keyrings"))
204 pl->usekeys = keyrings; 218 pl->usekeys = keyrings;
205 else if (!strcmp (thawer.get_str (), "containers")) 219 else if (!strcmp (f.get_str (), "containers"))
206 pl->usekeys = containers; 220 pl->usekeys = containers;
207 else 221 else
208 LOG (llevDebug, "load_player: got unknown usekeys type: %s\n", thawer.get_str ()); 222 LOG (llevDebug, "load_player: got unknown usekeys type: %s\n", f.get_str ());
209 break; 223 break;
210 224
211 case KW_unapply: 225 case KW_unapply:
212 if (!strcmp (thawer.get_str (), "unapply_nochoice")) 226 if (!strcmp (f.get_str (), "unapply_nochoice"))
213 pl->unapply = unapply_nochoice; 227 pl->unapply = unapply_nochoice;
214 else if (!strcmp (thawer.get_str (), "unapply_never")) 228 else if (!strcmp (f.get_str (), "unapply_never"))
215 pl->unapply = unapply_never; 229 pl->unapply = unapply_never;
216 else if (!strcmp (thawer.get_str (), "unapply_always")) 230 else if (!strcmp (f.get_str (), "unapply_always"))
217 pl->unapply = unapply_always; 231 pl->unapply = unapply_always;
218 else 232 else
219 LOG (llevDebug, "load_player: got unknown unapply type: %s\n", thawer.get_str ()); 233 LOG (llevDebug, "load_player: got unknown unapply type: %s\n", f.get_str ());
220 break; 234 break;
221 235
222 case KW_lev_array: 236 case KW_lev_array:
223 { 237 {
224 int count = thawer.get_sint32 (); 238 int count = f.get_sint32 ();
225 239
226 for (int i = 1; i <= count; i++) 240 for (int i = 1; i <= count; i++)
227 { 241 {
228 char line [32]; 242 char line [32];
229 243
230 fgets (line, 32, thawer); pl->levhp [i] = atoi (line); 244 fgets (line, 32, f); pl->levhp [i] = atoi (line);
231 fgets (line, 32, thawer); pl->levsp [i] = atoi (line); 245 fgets (line, 32, f); pl->levsp [i] = atoi (line);
232 fgets (line, 32, thawer); pl->levgrace[i] = atoi (line); 246 fgets (line, 32, f); pl->levgrace[i] = atoi (line);
233 } 247 }
234 } 248 }
235 break; 249 break;
236
237 default:
238 LOG (llevError, "%s: skipping unknown key in player header: %s\n", thawer.name, keyword_str [kw]);
239 break;
240 } 250 }
251
252 f.next ();
241 } 253 }
242 254
243done: 255failure:
244 if (!load_object (thawer, pl->ob, 0)) 256 LOG (llevError, "%s: too many or too grave errors, aborting player load.\n", f.name);
245 { 257
258 if (pl->ob)
246 pl->ob->destroy (); 259 pl->ob->destroy ();
260
247 pl->destroy (); 261 pl->destroy ();
248 return 0;
249 }
250 262
251 INVOKE_PLAYER (LOAD, pl);
252
253 return pl; 263 return 0;
254} 264}
255 265
256player * 266player *
257player::load_pl (const char *path) 267player::load_pl (const char *path)
258{ 268{
259 object_thawer thawer (path); 269 object_thawer f (path);
260 270
261 if (!thawer) 271 if (!f)
262 return 0; 272 return 0;
263 273
274 f.next ();
275
264 return load_pl (thawer); 276 return load_pl (f);
265} 277}
266 278

Diff Legend

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