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.23 by root, Sun Apr 29 21:44:34 2007 UTC

… …
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
53 return 0;
54}
55
56/* Returns TRUE if the range specified (int r) is legal - that is,
57 * the character has an item that is equipped for that range type.
58 * return 0 if there is no item of that range type that is usable.
59 * This function could probably be simplified, eg, everything
60 * should index into the ranges[] array.
61 */
62bool
63player::legal_range (rangetype r) const
64{
65 switch (r)
66 {
67 case range_none: /* "Nothing" is always legal */
68 return 1;
69
70 case range_bow:
71 case range_misc:
72 case range_magic: /* cast spells */
73 case range_golem:
74 return !!ranges [r];
75
76 case range_skill:
77 return !!ob->chosen_skill;
78 }
79
80 /* No match above, must not be valid */
53 return 0; 81 return 0;
54} 82}
55 83
56/* 84/*
57 * If final is set, it a clean/final save, not a backup, ie dont remove objects from inventory 85 * If final is set, it a clean/final save, not a backup, ie dont remove objects from inventory
… …
116 freezer.put (ob->contr); 144 freezer.put (ob->contr);
117 freezer.put (KW_endplst); 145 freezer.put (KW_endplst);
118 146
119 SET_FLAG (ob, FLAG_NO_FIX_PLAYER); 147 SET_FLAG (ob, FLAG_NO_FIX_PLAYER);
120 CLEAR_FLAG (ob, FLAG_WIZ); 148 CLEAR_FLAG (ob, FLAG_WIZ);
121 save_object (freezer, ob, 1); /* don't check and don't remove */ 149 ob->write (freezer);
122 150
123 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 151 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
124 152
125 /* Eneq(@csd.uu.se): Reveal the container if we have one. */ 153 /* Eneq(@csd.uu.se): Reveal the container if we have one. */
126 ob->container = container; 154 ob->container = container;
… …
142 170
143 return freezer.save (path); 171 return freezer.save (path);
144} 172}
145 173
146player * 174player *
147player::load_pl (object_thawer &thawer) 175player::load_pl (object_thawer &f)
148{ 176{
149 int maxerrs = 10; 177 int maxerrs = 20;
150 178
151 player *pl = new player; 179 player *pl = new player;
152 180
153 pl->savebed_map = first_map_path; 181 pl->savebed_map = first_map_path;
154
155 /* this loads the standard objects values. */
156 pl->set_object (object::create ());
157 182
158 /* Loop through the file, loading the rest of the values */ 183 /* Loop through the file, loading the rest of the values */
159 for (;;) 184 for (;;)
160 { 185 {
161 keyword kw = thawer.get_kv ();
162
163 switch (kw) 186 switch (f.kw)
164 { 187 {
165 case KW_EOF: 188 case KW_EOF:
166 LOG (llevError, "%s: unexpected EOF while reading player header\n", thawer.name); 189 LOG (llevError, "%s: unexpected EOF while reading player header\n", f.name);
167 goto failure; 190 goto failure;
168 191
169 default: 192 default:
170 LOG (llevError, "%s: skipping unknown key in player header: %s\n", thawer.name, keyword_str [kw]); 193 LOG (llevError, "%s: skipping unknown key in player header: %s\n", f.name, f.kw_str);
171 if (!--maxerrs) goto failure; 194 if (!--maxerrs) goto failure;
172 break; 195 break;
173 196
174 case KW_ERROR: 197 case KW_ERROR:
175 LOG (llevError, "%s: parse error while reading player header, skipping (%s,%s).\n", thawer.name, thawer.kw_str, thawer.value); 198 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; 199 if (!--maxerrs) goto failure;
177 break; 200 break;
178 201
179 case KW_endplst: 202 case KW_endplst:
203 f.next ();
204
205 if (object *op = pl->ob->read (f))
206 pl->set_object (op);
207 else
180 goto done; 208 goto failure;
181 209
210 INVOKE_PLAYER (LOAD, pl);
211
212 return pl;
213
182 case KW_oid: thawer.get (pl, thawer.get_sint32 ()); break; 214 case KW_oid: f.get (pl, f.get_sint32 ()); break;
183 case KW_password: assign (pl->password , thawer.get_str ()); break; 215 case KW_password: assign (pl->password , f.get_str ()); break;
184 case KW_title: assign (pl->own_title, thawer.get_str ()); break; 216 case KW_title: assign (pl->own_title, f.get_str ()); break;
185 case KW_shoottype: pl->shoottype = (rangetype) thawer.get_sint32 (); break; 217 case KW_shoottype: pl->shoottype = (rangetype) f.get_sint32 (); break;
186 case KW_bowtype: pl->bowtype = (bowtype_t) thawer.get_sint32 (); break; 218 case KW_bowtype: pl->bowtype = (bowtype_t) f.get_sint32 (); break;
187 case KW_petmode: pl->petmode = (petmode_t) thawer.get_sint32 (); break; 219 case KW_petmode: pl->petmode = (petmode_t) f.get_sint32 (); break;
188 case KW_listening: thawer.get (pl->listening); break; 220 case KW_listening: f.get (pl->listening); break;
189 case KW_peaceful: thawer.get (pl->peaceful); break; 221 case KW_peaceful: f.get (pl->peaceful); break;
190 case KW_digestion: thawer.get (pl->digestion); break; 222 case KW_digestion: f.get (pl->digestion); break;
191 case KW_pickup: thawer.get (pl->mode); break; 223 case KW_pickup: f.get (pl->mode); break;
192 case KW_outputs_sync: thawer.get (pl->outputs_sync); break; 224 case KW_outputs_sync: f.get (pl->outputs_sync); break;
193 case KW_outputs_count: thawer.get (pl->outputs_count); break; 225 case KW_outputs_count: f.get (pl->outputs_count); break;
194 case KW_map: thawer.get (pl->maplevel); break; 226 case KW_map: f.get (pl->maplevel); break;
195 case KW_savebed_map: thawer.get (pl->savebed_map); break; 227 case KW_savebed_map: f.get (pl->savebed_map); break;
196 case KW_bed_x: thawer.get (pl->bed_x); break; 228 case KW_bed_x: f.get (pl->bed_x); break;
197 case KW_bed_y: thawer.get (pl->bed_y); break; 229 case KW_bed_y: f.get (pl->bed_y); break;
198 case KW_weapon_sp: thawer.get (pl->weapon_sp); break; 230 case KW_weapon_sp: f.get (pl->weapon_sp); break;
199 case KW_Str: thawer.get (pl->orig_stats.Str); break; 231 case KW_Str: f.get (pl->orig_stats.Str); break;
200 case KW_Dex: thawer.get (pl->orig_stats.Dex); break; 232 case KW_Dex: f.get (pl->orig_stats.Dex); break;
201 case KW_Con: thawer.get (pl->orig_stats.Con); break; 233 case KW_Con: f.get (pl->orig_stats.Con); break;
202 case KW_Int: thawer.get (pl->orig_stats.Int); break; 234 case KW_Int: f.get (pl->orig_stats.Int); break;
203 case KW_Pow: thawer.get (pl->orig_stats.Pow); break; 235 case KW_Pow: f.get (pl->orig_stats.Pow); break;
204 case KW_Wis: thawer.get (pl->orig_stats.Wis); break; 236 case KW_Wis: f.get (pl->orig_stats.Wis); break;
205 case KW_Cha: thawer.get (pl->orig_stats.Cha); break; 237 case KW_Cha: f.get (pl->orig_stats.Cha); break;
206 case KW_gen_hp: thawer.get (pl->gen_hp); break; 238 case KW_gen_hp: f.get (pl->gen_hp); break;
207 case KW_gen_sp: thawer.get (pl->gen_sp); break; 239 case KW_gen_sp: f.get (pl->gen_sp); break;
208 case KW_gen_grace: thawer.get (pl->gen_grace); break; 240 case KW_gen_grace: f.get (pl->gen_grace); break;
209 241
210 case KW_usekeys: 242 case KW_usekeys:
211 if (!strcmp (thawer.get_str (), "key_inventory")) 243 if (!strcmp (f.get_str (), "key_inventory"))
212 pl->usekeys = key_inventory; 244 pl->usekeys = key_inventory;
213 else if (!strcmp (thawer.get_str (), "keyrings")) 245 else if (!strcmp (f.get_str (), "keyrings"))
214 pl->usekeys = keyrings; 246 pl->usekeys = keyrings;
215 else if (!strcmp (thawer.get_str (), "containers")) 247 else if (!strcmp (f.get_str (), "containers"))
216 pl->usekeys = containers; 248 pl->usekeys = containers;
217 else 249 else
218 LOG (llevDebug, "load_player: got unknown usekeys type: %s\n", thawer.get_str ()); 250 LOG (llevDebug, "load_player: got unknown usekeys type: %s\n", f.get_str ());
219 break; 251 break;
220 252
221 case KW_unapply: 253 case KW_unapply:
222 if (!strcmp (thawer.get_str (), "unapply_nochoice")) 254 if (!strcmp (f.get_str (), "unapply_nochoice"))
223 pl->unapply = unapply_nochoice; 255 pl->unapply = unapply_nochoice;
224 else if (!strcmp (thawer.get_str (), "unapply_never")) 256 else if (!strcmp (f.get_str (), "unapply_never"))
225 pl->unapply = unapply_never; 257 pl->unapply = unapply_never;
226 else if (!strcmp (thawer.get_str (), "unapply_always")) 258 else if (!strcmp (f.get_str (), "unapply_always"))
227 pl->unapply = unapply_always; 259 pl->unapply = unapply_always;
228 else 260 else
229 LOG (llevDebug, "load_player: got unknown unapply type: %s\n", thawer.get_str ()); 261 LOG (llevDebug, "load_player: got unknown unapply type: %s\n", f.get_str ());
230 break; 262 break;
231 263
232 case KW_lev_array: 264 case KW_lev_array:
233 { 265 {
234 int count = thawer.get_sint32 (); 266 int count = f.get_sint32 ();
235 267
236 for (int i = 1; i <= count; i++) 268 for (int i = 1; i <= count; i++)
237 { 269 {
238 char line [32]; 270 char line [32];
239 271
240 fgets (line, 32, thawer); pl->levhp [i] = atoi (line); 272 fgets (line, 32, f); pl->levhp [i] = atoi (line);
241 fgets (line, 32, thawer); pl->levsp [i] = atoi (line); 273 fgets (line, 32, f); pl->levsp [i] = atoi (line);
242 fgets (line, 32, thawer); pl->levgrace[i] = atoi (line); 274 fgets (line, 32, f); pl->levgrace[i] = atoi (line);
243 } 275 }
244 } 276 }
245 break; 277 break;
246 } 278 }
279
280 f.next ();
247 } 281 }
248 282
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: 283failure:
262 LOG (llevError, "%s: too many or too grave errors, aborting player load.\n", thawer.name); 284 LOG (llevError, "%s: too many or too grave errors, aborting player load.\n", f.name);
263 285
286 if (pl->ob)
264 pl->ob->destroy (); 287 pl->ob->destroy ();
288
265 pl->destroy (); 289 pl->destroy ();
266 290
267 return 0; 291 return 0;
268} 292}
269 293
270player * 294player *
271player::load_pl (const char *path) 295player::load_pl (const char *path)
272{ 296{
273 object_thawer thawer (path); 297 object_thawer f (path);
274 298
275 if (!thawer) 299 if (!f)
276 return 0; 300 return 0;
277 301
302 f.next ();
303
278 return load_pl (thawer); 304 return load_pl (f);
279} 305}
280 306

Diff Legend

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