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

Diff Legend

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