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.14 by root, Sun Jan 7 02:39:13 2007 UTC vs.
Revision 1.18 by root, Tue Jan 9 21:32:41 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
… …
82 PL_OUT (digestion); 83 PL_OUT (digestion);
83 PL_OUT2 (pickup, mode); 84 PL_OUT2 (pickup, mode);
84 PL_OUT (outputs_sync); 85 PL_OUT (outputs_sync);
85 PL_OUT (outputs_count); 86 PL_OUT (outputs_count);
86 87
87 freezer.put (KW_usekeys, usekeys == key_inventory ? "key_inventory" : (usekeys == keyrings ? "keyrings" : "containers")); 88 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")); 89 freezer.put (KW_unapply, unapply == unapply_nochoice ? "unapply_nochoice" : (unapply == unapply_never ? "unapply_never" : "unapply_always"));
89 90
90 if (ob->map) PL_OUT2 (map, ob->map->path); 91 PL_OUT2 (map, maplevel);
91
92 PL_OUT (savebed_map); 92 PL_OUT (savebed_map);
93 PL_OUT (bed_x); 93 PL_OUT (bed_x);
94 PL_OUT (bed_y); 94 PL_OUT (bed_y);
95 PL_OUT (weapon_sp); 95 PL_OUT (weapon_sp);
96 PL_OUT2 (Str, orig_stats.Str); 96 PL_OUT2 (Str, orig_stats.Str);
… …
99 PL_OUT2 (Int, orig_stats.Int); 99 PL_OUT2 (Int, orig_stats.Int);
100 PL_OUT2 (Pow, orig_stats.Pow); 100 PL_OUT2 (Pow, orig_stats.Pow);
101 PL_OUT2 (Wis, orig_stats.Wis); 101 PL_OUT2 (Wis, orig_stats.Wis);
102 PL_OUT2 (Cha, orig_stats.Cha); 102 PL_OUT2 (Cha, orig_stats.Cha);
103 103
104 PL_OUT2 (lev_array, min (ob->level, 10)); 104 PL_OUT2 (lev_array, 10);
105 105
106 for (int i = 1; i <= last_level && i <= 10; i++) 106 for (int i = 1; i <= 10; i++)
107 { 107 {
108 fprintf (freezer, "%d\n", levhp[i]); 108 fprintf (freezer, "%d\n", levhp [i]);
109 fprintf (freezer, "%d\n", levsp[i]); 109 fprintf (freezer, "%d\n", levsp [i]);
110 fprintf (freezer, "%d\n", levgrace[i]); 110 fprintf (freezer, "%d\n", levgrace[i]);
111 } 111 }
112 112
113 freezer.put (ob->contr); 113 freezer.put (ob->contr);
114 freezer.put (KW_endplst); 114 freezer.put (KW_endplst);
… …
141} 141}
142 142
143player * 143player *
144player::load_pl (object_thawer &thawer) 144player::load_pl (object_thawer &thawer)
145{ 145{
146 int maxerrs = 10;
147
146 player *pl = new player; 148 player *pl = new player;
147 149
148 pl->last_save_time = time (0);
149 pl->savebed_map = first_map_path; 150 pl->savebed_map = first_map_path;
151
152 /* this loads the standard objects values. */
153 pl->set_object (object::create ());
150 154
151 /* Loop through the file, loading the rest of the values */ 155 /* Loop through the file, loading the rest of the values */
152 for (;;) 156 for (;;)
153 { 157 {
154 keyword kw = thawer.get_kv (); 158 keyword kw = thawer.get_kv ();
155 159
156 switch (kw) 160 switch (kw)
157 { 161 {
158 case KW_EOF: 162 case KW_EOF:
159 LOG (llevError, "%s: unexpected EOF while reading player header\n", thawer.name); 163 LOG (llevError, "%s: unexpected EOF while reading player header\n", thawer.name);
160 delete pl; 164 goto failure;
165
166 default:
167 LOG (llevError, "%s: skipping unknown key in player header: %s\n", thawer.name, keyword_str [kw]);
168 if (!--maxerrs) goto failure;
161 return 0; 169 break;
162 170
163 case KW_ERROR: 171 case KW_ERROR:
164 LOG (llevError, "%s: error while reading player header, skipping (%s,%s)\n", thawer.name, thawer.last_keyword, thawer.last_value); 172 LOG (llevError, "%s: parse error while reading player header, skipping (%s,%s).\n", thawer.name, thawer.last_keyword, thawer.last_value);
173 if (!--maxerrs) goto failure;
165 break; 174 break;
166 175
167 case KW_endplst: 176 case KW_endplst:
168 goto done; 177 goto done;
169 178
… …
221 { 230 {
222 int count = thawer.get_sint32 (); 231 int count = thawer.get_sint32 ();
223 232
224 for (int i = 1; i <= count; i++) 233 for (int i = 1; i <= count; i++)
225 { 234 {
226 char line[128]; 235 char line [32];
227 236
228 fgets (line, 128, thawer); pl->levhp [i] = atoi (line); 237 fgets (line, 32, thawer); pl->levhp [i] = atoi (line);
229 fgets (line, 128, thawer); pl->levsp [i] = atoi (line); 238 fgets (line, 32, thawer); pl->levsp [i] = atoi (line);
230 fgets (line, 128, thawer); pl->levgrace[i] = atoi (line); 239 fgets (line, 32, thawer); pl->levgrace[i] = atoi (line);
231 } 240 }
232 } 241 }
233 break; 242 break;
234
235 default:
236 LOG (llevError, "%s: skipping unknown key in player header: %s\n", thawer.name, keyword_str [kw]);
237 break;
238 } 243 }
239 } 244 }
240 245
241done: 246done:
242 /* this loads the standard objects values. */
243 pl->set_object (object::create ());
244
245 if (!load_object (thawer, pl->ob, 0)) 247 if (!load_object (thawer, pl->ob, 0))
246 { 248 {
247 pl->ob->destroy (); 249 pl->ob->destroy ();
248 delete pl; 250 pl->destroy ();
249 return 0; 251 return 0;
250 } 252 }
251 253
252 INVOKE_PLAYER (LOAD, pl); 254 INVOKE_PLAYER (LOAD, pl);
253 255
254 return pl; 256 return pl;
257
258failure:
259 LOG (llevError, "%s: too many or too grave errors, aborting player load.\n", thawer.name);
260
261 pl->ob->destroy ();
262 pl->destroy ();
263
264 return 0;
255} 265}
256 266
257player * 267player *
258player::load_pl (const char *path) 268player::load_pl (const char *path)
259{ 269{

Diff Legend

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