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.15 by root, Mon Jan 8 18:18:35 2007 UTC vs.
Revision 1.20 by root, Thu Feb 15 21:07:48 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 if (ob->map) PL_OUT2 (map, ob->map->path); 94 PL_OUT2 (map, maplevel);
91
92 PL_OUT (savebed_map); 95 PL_OUT (savebed_map);
93 PL_OUT (bed_x); 96 PL_OUT (bed_x);
94 PL_OUT (bed_y); 97 PL_OUT (bed_y);
95 PL_OUT (weapon_sp); 98 PL_OUT (weapon_sp);
96 PL_OUT2 (Str, orig_stats.Str); 99 PL_OUT2 (Str, orig_stats.Str);
… …
141} 144}
142 145
143player * 146player *
144player::load_pl (object_thawer &thawer) 147player::load_pl (object_thawer &thawer)
145{ 148{
149 int maxerrs = 10;
150
146 player *pl = new player; 151 player *pl = new player;
147 152
148 pl->savebed_map = first_map_path; 153 pl->savebed_map = first_map_path;
154
155 /* this loads the standard objects values. */
156 pl->set_object (object::create ());
149 157
150 /* Loop through the file, loading the rest of the values */ 158 /* Loop through the file, loading the rest of the values */
151 for (;;) 159 for (;;)
152 { 160 {
153 keyword kw = thawer.get_kv (); 161 keyword kw = thawer.get_kv ();
154 162
155 switch (kw) 163 switch (kw)
156 { 164 {
157 case KW_EOF: 165 case KW_EOF:
158 LOG (llevError, "%s: unexpected EOF while reading player header\n", thawer.name); 166 LOG (llevError, "%s: unexpected EOF while reading player header\n", thawer.name);
159 delete pl; 167 goto failure;
168
169 default:
170 LOG (llevError, "%s: skipping unknown key in player header: %s\n", thawer.name, keyword_str [kw]);
171 if (!--maxerrs) goto failure;
160 return 0; 172 break;
161 173
162 case KW_ERROR: 174 case KW_ERROR:
163 LOG (llevError, "%s: error while reading player header, skipping (%s,%s)\n", thawer.name, thawer.last_keyword, thawer.last_value); 175 LOG (llevError, "%s: parse error while reading player header, skipping (%s,%s).\n", thawer.name, thawer.kw_str, thawer.value);
176 if (!--maxerrs) goto failure;
164 break; 177 break;
165 178
166 case KW_endplst: 179 case KW_endplst:
167 goto done; 180 goto done;
168 181
… …
220 { 233 {
221 int count = thawer.get_sint32 (); 234 int count = thawer.get_sint32 ();
222 235
223 for (int i = 1; i <= count; i++) 236 for (int i = 1; i <= count; i++)
224 { 237 {
225 char line[128]; 238 char line [32];
226 239
227 fgets (line, 128, thawer); pl->levhp [i] = atoi (line); 240 fgets (line, 32, thawer); pl->levhp [i] = atoi (line);
228 fgets (line, 128, thawer); pl->levsp [i] = atoi (line); 241 fgets (line, 32, thawer); pl->levsp [i] = atoi (line);
229 fgets (line, 128, thawer); pl->levgrace[i] = atoi (line); 242 fgets (line, 32, thawer); pl->levgrace[i] = atoi (line);
230 } 243 }
231 } 244 }
232 break; 245 break;
233
234 default:
235 LOG (llevError, "%s: skipping unknown key in player header: %s\n", thawer.name, keyword_str [kw]);
236 break;
237 } 246 }
238 } 247 }
239 248
240done: 249done:
241 /* this loads the standard objects values. */
242 pl->set_object (object::create ());
243
244 if (!load_object (thawer, pl->ob, 0)) 250 if (!load_object (thawer, pl->ob, 0))
245 { 251 {
246 pl->ob->destroy (); 252 pl->ob->destroy ();
247 delete pl; 253 pl->destroy ();
248 return 0; 254 return 0;
249 } 255 }
250 256
251 INVOKE_PLAYER (LOAD, pl); 257 INVOKE_PLAYER (LOAD, pl);
252 258
253 return pl; 259 return pl;
260
261failure:
262 LOG (llevError, "%s: too many or too grave errors, aborting player load.\n", thawer.name);
263
264 pl->ob->destroy ();
265 pl->destroy ();
266
267 return 0;
254} 268}
255 269
256player * 270player *
257player::load_pl (const char *path) 271player::load_pl (const char *path)
258{ 272{

Diff Legend

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