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.14 by root, Sun Jan 7 02:39:13 2007 UTC vs.
Revision 1.21 by root, Fri Feb 16 19:43:41 2007 UTC

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

Diff Legend

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