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.16 by root, Mon Jan 8 19:25:52 2007 UTC

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

Diff Legend

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