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.17 by root, Tue Jan 9 01:28:32 2007 UTC

… …
85 PL_OUT (outputs_count); 85 PL_OUT (outputs_count);
86 86
87 freezer.put (KW_usekeys, usekeys == key_inventory ? "key_inventory" : (usekeys == keyrings ? "keyrings" : "containers")); 87 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")); 88 freezer.put (KW_unapply, unapply == unapply_nochoice ? "unapply_nochoice" : (unapply == unapply_never ? "unapply_never" : "unapply_always"));
89 89
90 if (ob->map) PL_OUT2 (map, ob->map->path); 90 PL_OUT2 (map, maplevel);
91
92 PL_OUT (savebed_map); 91 PL_OUT (savebed_map);
93 PL_OUT (bed_x); 92 PL_OUT (bed_x);
94 PL_OUT (bed_y); 93 PL_OUT (bed_y);
95 PL_OUT (weapon_sp); 94 PL_OUT (weapon_sp);
96 PL_OUT2 (Str, orig_stats.Str); 95 PL_OUT2 (Str, orig_stats.Str);
… …
99 PL_OUT2 (Int, orig_stats.Int); 98 PL_OUT2 (Int, orig_stats.Int);
100 PL_OUT2 (Pow, orig_stats.Pow); 99 PL_OUT2 (Pow, orig_stats.Pow);
101 PL_OUT2 (Wis, orig_stats.Wis); 100 PL_OUT2 (Wis, orig_stats.Wis);
102 PL_OUT2 (Cha, orig_stats.Cha); 101 PL_OUT2 (Cha, orig_stats.Cha);
103 102
104 PL_OUT2 (lev_array, min (ob->level, 10)); 103 PL_OUT2 (lev_array, 10);
105 104
106 for (int i = 1; i <= last_level && i <= 10; i++) 105 for (int i = 1; i <= 10; i++)
107 { 106 {
108 fprintf (freezer, "%d\n", levhp[i]); 107 fprintf (freezer, "%d\n", levhp [i]);
109 fprintf (freezer, "%d\n", levsp[i]); 108 fprintf (freezer, "%d\n", levsp [i]);
110 fprintf (freezer, "%d\n", levgrace[i]); 109 fprintf (freezer, "%d\n", levgrace[i]);
111 } 110 }
112 111
113 freezer.put (ob->contr); 112 freezer.put (ob->contr);
114 freezer.put (KW_endplst); 113 freezer.put (KW_endplst);
… …
143player * 142player *
144player::load_pl (object_thawer &thawer) 143player::load_pl (object_thawer &thawer)
145{ 144{
146 player *pl = new player; 145 player *pl = new player;
147 146
148 pl->last_save_time = time (0);
149 pl->savebed_map = first_map_path; 147 pl->savebed_map = first_map_path;
148
149 /* this loads the standard objects values. */
150 pl->set_object (object::create ());
150 151
151 /* Loop through the file, loading the rest of the values */ 152 /* Loop through the file, loading the rest of the values */
152 for (;;) 153 for (;;)
153 { 154 {
154 keyword kw = thawer.get_kv (); 155 keyword kw = thawer.get_kv ();
155 156
156 switch (kw) 157 switch (kw)
157 { 158 {
158 case KW_EOF: 159 case KW_EOF:
159 LOG (llevError, "%s: unexpected EOF while reading player header\n", thawer.name); 160 LOG (llevError, "%s: unexpected EOF while reading player header\n", thawer.name);
160 delete pl; 161 pl->ob->destroy ();
162 pl->destroy ();
161 return 0; 163 return 0;
162 164
163 case KW_ERROR: 165 case KW_ERROR:
164 LOG (llevError, "%s: error while reading player header, skipping (%s,%s)\n", thawer.name, thawer.last_keyword, thawer.last_value); 166 LOG (llevError, "%s: error while reading player header, skipping (%s,%s)\n", thawer.name, thawer.last_keyword, thawer.last_value);
165 break; 167 break;
… …
221 { 223 {
222 int count = thawer.get_sint32 (); 224 int count = thawer.get_sint32 ();
223 225
224 for (int i = 1; i <= count; i++) 226 for (int i = 1; i <= count; i++)
225 { 227 {
226 char line[128]; 228 char line [32];
227 229
228 fgets (line, 128, thawer); pl->levhp [i] = atoi (line); 230 fgets (line, 32, thawer); pl->levhp [i] = atoi (line);
229 fgets (line, 128, thawer); pl->levsp [i] = atoi (line); 231 fgets (line, 32, thawer); pl->levsp [i] = atoi (line);
230 fgets (line, 128, thawer); pl->levgrace[i] = atoi (line); 232 fgets (line, 32, thawer); pl->levgrace[i] = atoi (line);
231 } 233 }
232 } 234 }
233 break; 235 break;
234 236
235 default: 237 default:
… …
237 break; 239 break;
238 } 240 }
239 } 241 }
240 242
241done: 243done:
242 /* this loads the standard objects values. */
243 pl->set_object (object::create ());
244
245 if (!load_object (thawer, pl->ob, 0)) 244 if (!load_object (thawer, pl->ob, 0))
246 { 245 {
247 pl->ob->destroy (); 246 pl->ob->destroy ();
248 delete pl; 247 pl->destroy ();
249 return 0; 248 return 0;
250 } 249 }
251 250
252 INVOKE_PLAYER (LOAD, pl); 251 INVOKE_PLAYER (LOAD, pl);
253 252

Diff Legend

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