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.18 by root, Tue Jan 9 21:32:41 2007 UTC vs.
Revision 1.21 by root, Fri Feb 16 19:43:41 2007 UTC

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

Diff Legend

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