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

Diff Legend

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