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.20 by root, Thu Feb 15 21:07:48 2007 UTC vs.
Revision 1.26 by root, Tue May 1 05:48:20 2007 UTC

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

Diff Legend

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