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.16 by root, Mon Jan 8 19:25:52 2007 UTC vs.
Revision 1.27 by root, Wed May 9 11:32:29 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 * 7 *
… …
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;
56
52 return 0; 57 return 0;
53} 58}
54 59
55/* 60/*
56 * If final is set, it a clean/final save, not a backup, ie dont remove objects from inventory 61 * If final is set, it a clean/final save, not a backup, ie dont remove objects from inventory
… …
63 int wiz = ob->flag [FLAG_WIZ]; 68 int wiz = ob->flag [FLAG_WIZ];
64 69
65 /* Eneq(@csd.uu.se): If we have an open container hide it. */ 70 /* Eneq(@csd.uu.se): If we have an open container hide it. */
66 object *container = ob->container; 71 object *container = ob->container;
67 ob->container = 0; 72 ob->container = 0;
73
74 if (ob->map)
75 maplevel = ob->map->path;
68 76
69#define PL_OUT(k) freezer.put (KW_ ## k, k) 77#define PL_OUT(k) freezer.put (KW_ ## k, k)
70#define PL_OUT2(k,v) freezer.put (KW_ ## k, v) 78#define PL_OUT2(k,v) freezer.put (KW_ ## k, v)
71 79
72 PL_OUT (password); 80 PL_OUT (password);
73 PL_OUT2 (title, own_title); 81 PL_OUT2 (title, own_title);
74 PL_OUT (gen_hp); 82 PL_OUT (gen_hp);
75 PL_OUT (gen_sp); 83 PL_OUT (gen_sp);
76 PL_OUT (gen_grace); 84 PL_OUT (gen_grace);
77 PL_OUT (listening); 85 PL_OUT (listening);
78 PL_OUT (shoottype);
79 PL_OUT (bowtype); 86 PL_OUT (bowtype);
80 PL_OUT (petmode); 87 PL_OUT (petmode);
81 PL_OUT (peaceful); 88 PL_OUT (peaceful);
82 PL_OUT (digestion); 89 PL_OUT (digestion);
83 PL_OUT2 (pickup, mode); 90 PL_OUT2 (pickup, mode);
84 PL_OUT (outputs_sync); 91 PL_OUT (outputs_sync);
85 PL_OUT (outputs_count); 92 PL_OUT (outputs_count);
86 93
87 freezer.put (KW_usekeys, usekeys == key_inventory ? "key_inventory" : (usekeys == keyrings ? "keyrings" : "containers")); 94 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")); 95 freezer.put (KW_unapply, unapply == unapply_nochoice ? "unapply_nochoice" : (unapply == unapply_never ? "unapply_never" : "unapply_always"));
89 96
90 if (ob->map) PL_OUT2 (map, ob->map->path); 97 PL_OUT2 (map, maplevel);
91
92 PL_OUT (savebed_map); 98 PL_OUT (savebed_map);
93 PL_OUT (bed_x); 99 PL_OUT (bed_x);
94 PL_OUT (bed_y); 100 PL_OUT (bed_y);
95 PL_OUT (weapon_sp); 101 PL_OUT (weapon_sp);
96 PL_OUT2 (Str, orig_stats.Str); 102 PL_OUT2 (Str, orig_stats.Str);
… …
113 freezer.put (ob->contr); 119 freezer.put (ob->contr);
114 freezer.put (KW_endplst); 120 freezer.put (KW_endplst);
115 121
116 SET_FLAG (ob, FLAG_NO_FIX_PLAYER); 122 SET_FLAG (ob, FLAG_NO_FIX_PLAYER);
117 CLEAR_FLAG (ob, FLAG_WIZ); 123 CLEAR_FLAG (ob, FLAG_WIZ);
118 save_object (freezer, ob, 1); /* don't check and don't remove */ 124 ob->write (freezer);
119 125
120 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 126 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
121 127
122 /* Eneq(@csd.uu.se): Reveal the container if we have one. */ 128 /* Eneq(@csd.uu.se): Reveal the container if we have one. */
123 ob->container = container; 129 ob->container = container;
… …
139 145
140 return freezer.save (path); 146 return freezer.save (path);
141} 147}
142 148
143player * 149player *
144player::load_pl (object_thawer &thawer) 150player::load_pl (object_thawer &f)
145{ 151{
152 int maxerrs = 20;
153
146 player *pl = new player; 154 player *pl = new player;
147 155
148 pl->savebed_map = first_map_path; 156 pl->savebed_map = first_map_path;
149
150 /* this loads the standard objects values. */
151 pl->set_object (object::create ());
152 157
153 /* Loop through the file, loading the rest of the values */ 158 /* Loop through the file, loading the rest of the values */
154 for (;;) 159 for (;;)
155 { 160 {
156 keyword kw = thawer.get_kv ();
157
158 switch (kw) 161 switch (f.kw)
159 { 162 {
160 case KW_EOF: 163 case KW_EOF:
161 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);
162 pl->ob->destroy (); 165 goto failure;
163 pl->destroy (); 166
167 default:
168 LOG (llevError, "%s: skipping unknown key in player header: %s\n", f.name, f.kw_str);
169 if (!--maxerrs) goto failure;
164 return 0; 170 break;
165 171
166 case KW_ERROR: 172 case KW_ERROR:
167 LOG (llevError, "%s: error while reading player header, skipping (%s,%s)\n", thawer.name, thawer.last_keyword, thawer.last_value); 173 LOG (llevError, "%s: parse error while reading player header, skipping (%s,%s).\n", f.name, f.kw_str, f.value);
174 if (!--maxerrs) goto failure;
168 break; 175 break;
169 176
170 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
171 goto done; 183 goto failure;
172 184
185 INVOKE_PLAYER (LOAD, pl);
186
187 return pl;
188
173 case KW_oid: thawer.get (pl, thawer.get_sint32 ()); break; 189 case KW_oid: f.get (pl, f.get_sint32 ()); break;
174 case KW_password: assign (pl->password , thawer.get_str ()); break; 190 case KW_password: assign (pl->password , f.get_str ()); break;
175 case KW_title: assign (pl->own_title, thawer.get_str ()); break; 191 case KW_title: assign (pl->own_title, f.get_str ()); break;
176 case KW_shoottype: pl->shoottype = (rangetype) thawer.get_sint32 (); break;
177 case KW_bowtype: pl->bowtype = (bowtype_t) thawer.get_sint32 (); break; 192 case KW_bowtype: pl->bowtype = (bowtype_t) f.get_sint32 (); break;
178 case KW_petmode: pl->petmode = (petmode_t) thawer.get_sint32 (); break; 193 case KW_petmode: pl->petmode = (petmode_t) f.get_sint32 (); break;
179 case KW_listening: thawer.get (pl->listening); break; 194 case KW_listening: f.get (pl->listening); break;
180 case KW_peaceful: thawer.get (pl->peaceful); break; 195 case KW_peaceful: f.get (pl->peaceful); break;
181 case KW_digestion: thawer.get (pl->digestion); break; 196 case KW_digestion: f.get (pl->digestion); break;
182 case KW_pickup: thawer.get (pl->mode); break; 197 case KW_pickup: f.get (pl->mode); break;
183 case KW_outputs_sync: thawer.get (pl->outputs_sync); break; 198 case KW_outputs_sync: f.get (pl->outputs_sync); break;
184 case KW_outputs_count: thawer.get (pl->outputs_count); break; 199 case KW_outputs_count: f.get (pl->outputs_count); break;
185 case KW_map: thawer.get (pl->maplevel); break; 200 case KW_map: f.get (pl->maplevel); break;
186 case KW_savebed_map: thawer.get (pl->savebed_map); break; 201 case KW_savebed_map: f.get (pl->savebed_map); break;
187 case KW_bed_x: thawer.get (pl->bed_x); break; 202 case KW_bed_x: f.get (pl->bed_x); break;
188 case KW_bed_y: thawer.get (pl->bed_y); break; 203 case KW_bed_y: f.get (pl->bed_y); break;
189 case KW_weapon_sp: thawer.get (pl->weapon_sp); break; 204 case KW_weapon_sp: f.get (pl->weapon_sp); break;
190 case KW_Str: thawer.get (pl->orig_stats.Str); break; 205 case KW_Str: f.get (pl->orig_stats.Str); break;
191 case KW_Dex: thawer.get (pl->orig_stats.Dex); break; 206 case KW_Dex: f.get (pl->orig_stats.Dex); break;
192 case KW_Con: thawer.get (pl->orig_stats.Con); break; 207 case KW_Con: f.get (pl->orig_stats.Con); break;
193 case KW_Int: thawer.get (pl->orig_stats.Int); break; 208 case KW_Int: f.get (pl->orig_stats.Int); break;
194 case KW_Pow: thawer.get (pl->orig_stats.Pow); break; 209 case KW_Pow: f.get (pl->orig_stats.Pow); break;
195 case KW_Wis: thawer.get (pl->orig_stats.Wis); break; 210 case KW_Wis: f.get (pl->orig_stats.Wis); break;
196 case KW_Cha: thawer.get (pl->orig_stats.Cha); break; 211 case KW_Cha: f.get (pl->orig_stats.Cha); break;
197 case KW_gen_hp: thawer.get (pl->gen_hp); break; 212 case KW_gen_hp: f.get (pl->gen_hp); break;
198 case KW_gen_sp: thawer.get (pl->gen_sp); break; 213 case KW_gen_sp: f.get (pl->gen_sp); break;
199 case KW_gen_grace: thawer.get (pl->gen_grace); break; 214 case KW_gen_grace: f.get (pl->gen_grace); break;
200 215
201 case KW_usekeys: 216 case KW_usekeys:
202 if (!strcmp (thawer.get_str (), "key_inventory")) 217 if (!strcmp (f.get_str (), "key_inventory"))
203 pl->usekeys = key_inventory; 218 pl->usekeys = key_inventory;
204 else if (!strcmp (thawer.get_str (), "keyrings")) 219 else if (!strcmp (f.get_str (), "keyrings"))
205 pl->usekeys = keyrings; 220 pl->usekeys = keyrings;
206 else if (!strcmp (thawer.get_str (), "containers")) 221 else if (!strcmp (f.get_str (), "containers"))
207 pl->usekeys = containers; 222 pl->usekeys = containers;
208 else 223 else
209 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 ());
210 break; 225 break;
211 226
212 case KW_unapply: 227 case KW_unapply:
213 if (!strcmp (thawer.get_str (), "unapply_nochoice")) 228 if (!strcmp (f.get_str (), "unapply_nochoice"))
214 pl->unapply = unapply_nochoice; 229 pl->unapply = unapply_nochoice;
215 else if (!strcmp (thawer.get_str (), "unapply_never")) 230 else if (!strcmp (f.get_str (), "unapply_never"))
216 pl->unapply = unapply_never; 231 pl->unapply = unapply_never;
217 else if (!strcmp (thawer.get_str (), "unapply_always")) 232 else if (!strcmp (f.get_str (), "unapply_always"))
218 pl->unapply = unapply_always; 233 pl->unapply = unapply_always;
219 else 234 else
220 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 ());
221 break; 236 break;
222 237
223 case KW_lev_array: 238 case KW_lev_array:
224 { 239 {
225 int count = thawer.get_sint32 (); 240 int count = f.get_sint32 ();
226 241
227 for (int i = 1; i <= count; i++) 242 for (int i = 1; i <= count; i++)
228 { 243 {
229 char line [32]; 244 char line [32];
230 245
231 fgets (line, 32, thawer); pl->levhp [i] = atoi (line); 246 fgets (line, 32, f); pl->levhp [i] = atoi (line);
232 fgets (line, 32, thawer); pl->levsp [i] = atoi (line); 247 fgets (line, 32, f); pl->levsp [i] = atoi (line);
233 fgets (line, 32, thawer); pl->levgrace[i] = atoi (line); 248 fgets (line, 32, f); pl->levgrace[i] = atoi (line);
234 } 249 }
235 } 250 }
236 break; 251 break;
237
238 default:
239 LOG (llevError, "%s: skipping unknown key in player header: %s\n", thawer.name, keyword_str [kw]);
240 break;
241 } 252 }
253
254 f.next ();
242 } 255 }
243 256
244done: 257failure:
245 if (!load_object (thawer, pl->ob, 0)) 258 LOG (llevError, "%s: too many or too grave errors, aborting player load.\n", f.name);
246 { 259
260 if (pl->ob)
247 pl->ob->destroy (); 261 pl->ob->destroy ();
262
248 pl->destroy (); 263 pl->destroy ();
249 return 0;
250 }
251 264
252 INVOKE_PLAYER (LOAD, pl);
253
254 return pl; 265 return 0;
255} 266}
256 267
257player * 268player *
258player::load_pl (const char *path) 269player::load_pl (const char *path)
259{ 270{
260 object_thawer thawer (path); 271 object_thawer f (path);
261 272
262 if (!thawer) 273 if (!f)
263 return 0; 274 return 0;
264 275
276 f.next ();
277
265 return load_pl (thawer); 278 return load_pl (f);
266} 279}
267 280

Diff Legend

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