ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/login.C
(Generate patch)

Comparing deliantra/server/server/login.C (file contents):
Revision 1.5 by root, Mon Aug 28 14:05:24 2006 UTC vs.
Revision 1.11 by root, Sun Sep 3 22:45:57 2006 UTC

1/* 1/*
2 * static char *rcsid_login_c = 2 * static char *rcsid_login_c =
3 * "$Id: login.C,v 1.5 2006/08/28 14:05:24 root Exp $"; 3 * "$Id: login.C,v 1.11 2006/09/03 22:45:57 root Exp $";
4 */ 4 */
5 5
6/* 6/*
7 CrossFire, A Multiplayer game for X-windows 7 CrossFire, A Multiplayer game for X-windows
8 8
… …
59/* If we are not exiting the game (ie, this is sort of a backup save), then 59/* If we are not exiting the game (ie, this is sort of a backup save), then
60 * don't change the location back to the village. Note that there are other 60 * don't change the location back to the village. Note that there are other
61 * options to have backup saves be done at the starting village 61 * options to have backup saves be done at the starting village
62 */ 62 */
63 if (!flag) { 63 if (!flag) {
64 strcpy(pl->maplevel, first_map_path); 64 strcpy(pl->maplevel, first_map_path);
65 if(pl->ob->map!=NULL) 65 if(pl->ob->map!=NULL)
66 pl->ob->map = NULL; 66 pl->ob->map = NULL;
67 pl->ob->x = -1; 67 pl->ob->x = -1;
68 pl->ob->y = -1; 68 pl->ob->y = -1;
69 } 69 }
70 if(!save_player(pl->ob,flag)) { 70 if(!save_player(pl->ob,flag)) {
71 LOG(llevError, "(failed) "); 71 LOG(llevError, "(failed) ");
72 new_draw_info(NDI_UNIQUE, 0,pl->ob,"Emergency save failed, checking score..."); 72 new_draw_info(NDI_UNIQUE, 0,pl->ob,"Emergency save failed, checking score...");
73 } 73 }
… …
93void delete_character(const char *name, int newchar) { 93void delete_character(const char *name, int newchar) {
94 char buf[MAX_BUF]; 94 char buf[MAX_BUF];
95 95
96 sprintf(buf,"%s/%s/%s.pl",settings.localdir,settings.playerdir,name); 96 sprintf(buf,"%s/%s/%s.pl",settings.localdir,settings.playerdir,name);
97 if(unlink(buf)== -1) 97 if(unlink(buf)== -1)
98 LOG(llevDebug, "Cannot delete character file %s: %s\n", buf, strerror_local(errno)); 98 LOG(llevDebug, "Cannot delete character file %s: %s\n", buf, strerror(errno));
99 if (newchar) { 99 if (newchar) {
100 sprintf(buf,"%s/%s/%s",settings.localdir,settings.playerdir,name); 100 sprintf(buf,"%s/%s/%s",settings.localdir,settings.playerdir,name);
101 /* this effectively does an rm -rf on the directory */ 101 /* this effectively does an rm -rf on the directory */
102 remove_directory(buf); 102 remove_directory(buf);
103 } 103 }
104} 104}
105 105
106/* This verify that a character of name exits, and that it matches 106/* This verify that a character of name exits, and that it matches
107 * password. It return 0 if there is match, 1 if no such player, 107 * password. It return 0 if there is match, 1 if no such player,
… …
113 char buf[MAX_BUF]; 113 char buf[MAX_BUF];
114 int comp; 114 int comp;
115 FILE *fp; 115 FILE *fp;
116 116
117 if (strpbrk(name, "/.\\") != NULL) { 117 if (strpbrk(name, "/.\\") != NULL) {
118 LOG(llevError, "Username contains illegal characters: %s\n", name); 118 LOG(llevError, "Username contains illegal characters: %s\n", name);
119 return 1; 119 return 1;
120 } 120 }
121 121
122 snprintf(buf, sizeof(buf), "%s/%s/%s/%s.pl", settings.localdir, settings.playerdir, name, name); 122 snprintf(buf, sizeof(buf), "%s/%s/%s/%s.pl", settings.localdir, settings.playerdir, name, name);
123 if (strlen(buf) >= sizeof(buf)-1) { 123 if (strlen(buf) >= sizeof(buf)-1) {
124 LOG(llevError, "Username too long: %s\n", name); 124 LOG(llevError, "Username too long: %s\n", name);
125 return 1; 125 return 1;
126 } 126 }
127 127
128 if ((fp=open_and_uncompress(buf,0,&comp))==NULL) return 1; 128 if ((fp=open_and_uncompress(buf,0,&comp))==NULL) return 1;
129 129
130 /* Read in the file until we find the password line. Our logic could 130 /* Read in the file until we find the password line. Our logic could
131 * be a bit better on cleaning up the password from the file, but since 131 * be a bit better on cleaning up the password from the file, but since
132 * it is written by the program, I think it is fair to assume that the 132 * it is written by the program, I think it is fair to assume that the
133 * syntax should be pretty standard. 133 * syntax should be pretty standard.
134 */ 134 */
135 while (fgets(buf, MAX_BUF-1, fp) != NULL) { 135 while (fgets(buf, MAX_BUF-1, fp) != NULL) {
136 if (!strncmp(buf,"password ",9)) { 136 if (!strncmp(buf,"password ",9)) {
137 buf[strlen(buf)-1]=0; /* remove newline */ 137 buf[strlen(buf)-1]=0; /* remove newline */
138 if (check_password(password, buf+9)) { 138 if (check_password(password, buf+9)) {
139 close_and_delete(fp, comp); 139 close_and_delete(fp, comp);
140 return 0; 140 return 0;
141 } 141 }
142 else { 142 else {
143 close_and_delete(fp, comp); 143 close_and_delete(fp, comp);
144 return 2; 144 return 2;
145 } 145 }
146 } 146 }
147 } 147 }
148 LOG(llevDebug,"Could not find a password line in player %s\n", name); 148 LOG(llevDebug,"Could not find a password line in player %s\n", name);
149 close_and_delete(fp, comp); 149 close_and_delete(fp, comp);
150 return 1; 150 return 1;
151} 151}
… …
162 162
163int check_name(player *me,const char *name) { 163int check_name(player *me,const char *name) {
164 player *pl; 164 player *pl;
165 165
166 for(pl=first_player;pl!=NULL;pl=pl->next) 166 for(pl=first_player;pl!=NULL;pl=pl->next)
167 if(pl!=me&&pl->ob->name!=NULL&&!strcmp(pl->ob->name,name)) { 167 if(pl!=me&&pl->ob->name!=NULL&&!strcmp(pl->ob->name,name)) {
168 new_draw_info(NDI_UNIQUE, 0,me->ob,"That name is already in use."); 168 new_draw_info(NDI_UNIQUE, 0,me->ob,"That name is already in use.");
169 return 0; 169 return 0;
170 } 170 }
171 171
172 if (*name=='\0') { 172 if (*name=='\0') {
173 new_draw_info(NDI_UNIQUE, 0,me->ob,"Null names are not allowed."); 173 new_draw_info(NDI_UNIQUE, 0,me->ob,"Null names are not allowed.");
174 return 0; 174 return 0;
175 } 175 }
176 176
177 if(!playername_ok(name)) { 177 if(!playername_ok(name)) {
178 new_draw_info(NDI_UNIQUE, 0,me->ob,"That name contains illegal characters."); 178 new_draw_info(NDI_UNIQUE, 0,me->ob,"That name contains illegal characters.");
179 return 0; 179 return 0;
180 } 180 }
181 if (strlen(name) >= MAX_NAME) { 181 if (strlen(name) >= MAX_NAME) {
182 new_draw_info(NDI_UNIQUE, 0,me->ob,"That name is too long."); 182 new_draw_info(NDI_UNIQUE, 0,me->ob,"That name is too long.");
183 return 0; 183 return 0;
184 } 184 }
185 185
186 return 1; 186 return 1;
187} 187}
188 188
… …
195 return 0; 195 return 0;
196 } else { 196 } else {
197 stat(savedir, buf); 197 stat(savedir, buf);
198 if (!S_ISDIR(buf->st_mode)) 198 if (!S_ISDIR(buf->st_mode))
199 if (mkdir(savedir, SAVE_DIR_MODE)) 199 if (mkdir(savedir, SAVE_DIR_MODE))
200 { 200 {
201 LOG(llevError, "Unable to create player savedir %s: %s\n", savedir, strerror_local(errno)); 201 LOG(llevError, "Unable to create player savedir %s: %s\n", savedir, strerror(errno));
202 return 0; 202 return 0;
203 } 203 }
204 free(buf); 204 free(buf);
205 } 205 }
206 return 1; 206 return 1;
207} 207}
208 208
209void destroy_object (object *op) 209void destroy_object (object *op)
210{ 210{
211 object *tmp; 211 object *tmp;
212 while ((tmp = op->inv)) 212 while ((tmp = op->inv))
213 destroy_object (tmp); 213 destroy_object (tmp);
214 214
215 if (!QUERY_FLAG(op, FLAG_REMOVED)) 215 if (!QUERY_FLAG(op, FLAG_REMOVED))
216 remove_ob(op); 216 remove_ob(op);
217 free_object(op); 217 free_object(op);
218} 218}
219 219
220/* 220/*
221 * If flag is set, it's only backup, ie dont remove objects from inventory 221 * If flag is set, it's only backup, ie dont remove objects from inventory
… …
223 * will be saved at the emergency save location. 223 * will be saved at the emergency save location.
224 * Returns non zero if successful. 224 * Returns non zero if successful.
225 */ 225 */
226 226
227int save_player(object *op, int flag) { 227int save_player(object *op, int flag) {
228 char filename[MAX_BUF];
229 object *tmp, *container=NULL; 228 object *tmp, *container=NULL;
230 player *pl = op->contr; 229 player *pl = op->contr;
231 int i,wiz=QUERY_FLAG(op,FLAG_WIZ); 230 int i,wiz=QUERY_FLAG(op,FLAG_WIZ);
232 long checksum; 231 long checksum;
233#ifdef BACKUP_SAVE_AT_HOME 232#ifdef BACKUP_SAVE_AT_HOME
… …
251 250
252 /* Prevent accidental saves if connection is reset after player has 251 /* Prevent accidental saves if connection is reset after player has
253 * mostly exited. 252 * mostly exited.
254 */ 253 */
255 if (pl->state != ST_PLAYING && pl->state != ST_GET_PARTY_PASSWORD) 254 if (pl->state != ST_PLAYING && pl->state != ST_GET_PARTY_PASSWORD)
256 return 0; 255 return 0;
257 256
258 INVOKE_PLAYER (SAVE, op->contr, ARG_STRING (filename)); 257 INVOKE_PLAYER (SAVE, op->contr);
259 258
260 if (flag == 0) 259 if (flag == 0)
261 terminate_all_pets(op); 260 terminate_all_pets(op);
262 261
263 sprintf(filename,"%s/%s/%s/%s.pl",settings.localdir,settings.playerdir,op->name,op->name);
264 make_path_to_file(filename);
265
266 object_freezer fp (filename); 262 object_freezer freezer;
267 263
268 if (!fp) 264 /* Eneq(@csd.uu.se): If we have an open container hide it. */
265 if (op->container)
269 { 266 {
270 new_draw_info(NDI_UNIQUE, 0,op, "Can't open file for save.");
271 return 0;
272 }
273
274/* Eneq(@csd.uu.se): If we have an open container hide it. */
275 if (op->container)
276 {
277 container = op->container; 267 container = op->container;
278 op->container = NULL; 268 op->container = NULL;
279 } 269 }
280 270
281 fprintf(fp,"password %s\n",pl->password); 271 fprintf(freezer,"password %s\n",pl->password);
282 272
283 if (settings.set_title == TRUE) 273 if (settings.set_title == TRUE)
284 if(pl->own_title[0]!='\0') 274 if(pl->own_title[0]!='\0')
285 fprintf(fp,"title %s\n",pl->own_title); 275 fprintf(freezer,"title %s\n",pl->own_title);
286 276
287 fprintf(fp,"explore %d\n",pl->explore); 277 fprintf(freezer,"explore %d\n",pl->explore);
288 fprintf(fp,"gen_hp %d\n",pl->gen_hp); 278 fprintf(freezer,"gen_hp %d\n",pl->gen_hp);
289 fprintf(fp,"gen_sp %d\n",pl->gen_sp); 279 fprintf(freezer,"gen_sp %d\n",pl->gen_sp);
290 fprintf(fp,"gen_grace %d\n",pl->gen_grace); 280 fprintf(freezer,"gen_grace %d\n",pl->gen_grace);
291 fprintf(fp,"listening %d\n",pl->listening); 281 fprintf(freezer,"listening %d\n",pl->listening);
292 fprintf(fp,"shoottype %d\n",pl->shoottype); 282 fprintf(freezer,"shoottype %d\n",pl->shoottype);
293 fprintf(fp,"bowtype %d\n",pl->bowtype); 283 fprintf(freezer,"bowtype %d\n",pl->bowtype);
294 fprintf(fp,"petmode %d\n",pl->petmode); 284 fprintf(freezer,"petmode %d\n",pl->petmode);
295 fprintf(fp,"peaceful %d\n",pl->peaceful); 285 fprintf(freezer,"peaceful %d\n",pl->peaceful);
296 fprintf(fp,"no_shout %d\n",pl->no_shout); 286 fprintf(freezer,"no_shout %d\n",pl->no_shout);
297 fprintf(fp,"digestion %d\n",pl->digestion); 287 fprintf(freezer,"digestion %d\n",pl->digestion);
298 fprintf(fp,"pickup %d\n", pl->mode); 288 fprintf(freezer,"pickup %d\n", pl->mode);
299 fprintf(fp,"outputs_sync %d\n", pl->outputs_sync); 289 fprintf(freezer,"outputs_sync %d\n", pl->outputs_sync);
300 fprintf(fp,"outputs_count %d\n", pl->outputs_count); 290 fprintf(freezer,"outputs_count %d\n", pl->outputs_count);
301 /* Match the enumerations but in string form */ 291 /* Match the enumerations but in string form */
302 fprintf(fp,"usekeys %s\n", pl->usekeys==key_inventory?"key_inventory": 292 fprintf(freezer,"usekeys %s\n", pl->usekeys==key_inventory?"key_inventory":
303 (pl->usekeys==keyrings?"keyrings":"containers")); 293 (pl->usekeys==keyrings?"keyrings":"containers"));
304 /* Match the enumerations but in string form */ 294 /* Match the enumerations but in string form */
305 fprintf(fp,"unapply %s\n", pl->unapply==unapply_nochoice?"unapply_nochoice": 295 fprintf(freezer,"unapply %s\n", pl->unapply==unapply_nochoice?"unapply_nochoice":
306 (pl->unapply==unapply_never?"unapply_never":"unapply_always")); 296 (pl->unapply==unapply_never?"unapply_never":"unapply_always"));
307 297
308#ifdef BACKUP_SAVE_AT_HOME 298#ifdef BACKUP_SAVE_AT_HOME
309 if (op->map!=NULL && flag==0) 299 if (op->map!=NULL && flag==0)
310#else 300#else
311 if (op->map!=NULL) 301 if (op->map!=NULL)
312#endif 302#endif
313 fprintf(fp,"map %s\n",op->map->path); 303 fprintf(freezer,"map %s\n",op->map->path);
314 else 304 else
315 fprintf(fp,"map %s\n",settings.emergency_mapname); 305 fprintf(freezer,"map %s\n",settings.emergency_mapname);
316 306
317 fprintf(fp,"savebed_map %s\n", pl->savebed_map); 307 fprintf(freezer,"savebed_map %s\n", pl->savebed_map);
318 fprintf(fp,"bed_x %d\nbed_y %d\n", pl->bed_x, pl->bed_y); 308 fprintf(freezer,"bed_x %d\nbed_y %d\n", pl->bed_x, pl->bed_y);
319 fprintf(fp,"weapon_sp %f\n",pl->weapon_sp); 309 fprintf(freezer,"weapon_sp %f\n",pl->weapon_sp);
320 fprintf(fp,"Str %d\n",pl->orig_stats.Str); 310 fprintf(freezer,"Str %d\n",pl->orig_stats.Str);
321 fprintf(fp,"Dex %d\n",pl->orig_stats.Dex); 311 fprintf(freezer,"Dex %d\n",pl->orig_stats.Dex);
322 fprintf(fp,"Con %d\n",pl->orig_stats.Con); 312 fprintf(freezer,"Con %d\n",pl->orig_stats.Con);
323 fprintf(fp,"Int %d\n",pl->orig_stats.Int); 313 fprintf(freezer,"Int %d\n",pl->orig_stats.Int);
324 fprintf(fp,"Pow %d\n",pl->orig_stats.Pow); 314 fprintf(freezer,"Pow %d\n",pl->orig_stats.Pow);
325 fprintf(fp,"Wis %d\n",pl->orig_stats.Wis); 315 fprintf(freezer,"Wis %d\n",pl->orig_stats.Wis);
326 fprintf(fp,"Cha %d\n",pl->orig_stats.Cha); 316 fprintf(freezer,"Cha %d\n",pl->orig_stats.Cha);
327 317
328 fprintf(fp,"lev_array %d\n",op->level>10?10:op->level); 318 fprintf(freezer,"lev_array %d\n",op->level>10?10:op->level);
329 for(i=1;i<=pl->last_level&&i<=10;i++) { 319 for(i=1;i<=pl->last_level&&i<=10;i++) {
330 fprintf(fp,"%d\n",pl->levhp[i]); 320 fprintf(freezer,"%d\n",pl->levhp[i]);
331 fprintf(fp,"%d\n",pl->levsp[i]); 321 fprintf(freezer,"%d\n",pl->levsp[i]);
332 fprintf(fp,"%d\n",pl->levgrace[i]); 322 fprintf(freezer,"%d\n",pl->levgrace[i]);
333 } 323 }
334 324
335 fp.put (op->contr); 325 freezer.put (op->contr);
336 326
337 fprintf(fp,"endplst\n"); 327 fprintf(freezer,"endplst\n");
338 328
339 SET_FLAG(op, FLAG_NO_FIX_PLAYER); 329 SET_FLAG(op, FLAG_NO_FIX_PLAYER);
340 CLEAR_FLAG(op, FLAG_WIZ); 330 CLEAR_FLAG(op, FLAG_WIZ);
341#ifdef BACKUP_SAVE_AT_HOME 331#ifdef BACKUP_SAVE_AT_HOME
342 if (flag) { 332 if (flag) {
… …
346 op->y = -1; 336 op->y = -1;
347 } 337 }
348 /* Save objects, but not unpaid objects. Don't remove objects from 338 /* Save objects, but not unpaid objects. Don't remove objects from
349 * inventory. 339 * inventory.
350 */ 340 */
351 save_object(fp, op, 2); 341 save_object(freezer, op, 2);
352 if (flag) { 342 if (flag) {
353 op->x = backup_x; 343 op->x = backup_x;
354 op->y = backup_y; 344 op->y = backup_y;
355 } 345 }
356#else 346#else
357 save_object(fp, op, 3); /* don't check and don't remove */ 347 save_object(freezer, op, 3); /* don't check and don't remove */
358#endif 348#endif
349
350 char filename[MAX_BUF];
351 sprintf(filename,"%s/%s/%s/%s.pl",settings.localdir,settings.playerdir,&op->name,&op->name);
352 make_path_to_file(filename);
353 freezer.save (filename);
359 354
360 CLEAR_FLAG(op, FLAG_NO_FIX_PLAYER); 355 CLEAR_FLAG(op, FLAG_NO_FIX_PLAYER);
361 356
362 if(!flag) 357 if(!flag)
363 while ((tmp = op->inv)) 358 while ((tmp = op->inv))
364 destroy_object (tmp); 359 destroy_object (tmp);
365 360
366 /* Eneq(@csd.uu.se): Reveal the container if we have one. */ 361 /* Eneq(@csd.uu.se): Reveal the container if we have one. */
367 if (flag&&container!=NULL) 362 if (flag && container!=NULL)
368 op->container = container; 363 op->container = container;
369 364
370 if (wiz) SET_FLAG(op,FLAG_WIZ); 365 if (wiz) SET_FLAG (op, FLAG_WIZ);
371 366
372 if(!flag) 367 if(!flag)
373 esrv_send_inventory(op, op); 368 esrv_send_inventory(op, op);
374 369
375 return 1; 370 return 1;
376} 371}
377 372
378void check_login(object *op) { 373void check_login(object *op) {
379 FILE *fp;
380 char filename[MAX_BUF]; 374 char filename[MAX_BUF];
381 char buf[MAX_BUF],bufall[MAX_BUF]; 375 char buf[MAX_BUF],bufall[MAX_BUF];
382 int i,value,comp; 376 int i,value,comp;
383 long checksum = 0; 377 long checksum = 0;
384 player *pl = op->contr; 378 player *pl = op->contr;
385 int correct = 0; 379 int correct = 0;
386 time_t elapsed_save_time=0;
387 struct stat statbuf;
388 380
389 strcpy (pl->maplevel,first_map_path); 381 strcpy (pl->maplevel,first_map_path);
390
391 sprintf(filename,"%s/%s/%s/%s.pl",settings.localdir,settings.playerdir,op->name,op->name); 382 sprintf(filename,"%s/%s/%s/%s.pl",settings.localdir,settings.playerdir,&op->name,&op->name);
392 383
384 object_thawer thawer (filename);
393 /* If no file, must be a new player, so lets get confirmation of 385 /* If no file, must be a new player, so lets get confirmation of
394 * the password. Return control to the higher level dispatch, 386 * the password. Return control to the higher level dispatch,
395 * since the rest of this just deals with loading of the file. 387 * since the rest of this just deals with loading of the file.
396 */ 388 */
397 if ((fp=open_and_uncompress(filename,1,&comp)) == NULL) { 389 if (!thawer) {
398 confirm_password(op); 390 confirm_password(op);
399 return; 391 return;
400 } 392 }
401 if (fstat(fileno(fp), &statbuf)) {
402 LOG(llevError,"Unable to stat %s?\n", filename);
403 elapsed_save_time=0;
404 } else {
405 elapsed_save_time = time(NULL) - statbuf.st_mtime;
406 if (elapsed_save_time<0) {
407 LOG(llevError,"Player file %s was saved in the future? (%d time)\n", filename, elapsed_save_time);
408 elapsed_save_time=0;
409 }
410 }
411 393
412 object_thawer thawer (fp, filename);
413
414 if(fgets(bufall,MAX_BUF,fp) != NULL) { 394 if(fgets(bufall,MAX_BUF,thawer) != NULL) {
415 if(!strncmp(bufall,"checksum ",9)) { 395 if(!strncmp(bufall,"checksum ",9)) {
416 checksum = strtol(bufall+9,(char **) NULL, 16); 396 checksum = strtol(bufall+9,(char **) NULL, 16);
417 (void) fgets(bufall,MAX_BUF,fp); 397 (void) fgets(bufall,MAX_BUF,thawer);
418 } 398 }
419 if(sscanf(bufall,"password %s\n",buf)) { 399 if(sscanf(bufall,"password %s\n",buf)) {
420 /* New password scheme: */ 400 /* New password scheme: */
421 correct=check_password(pl->write_buf+1,buf); 401 correct=check_password(pl->write_buf+1,buf);
422 } 402 }
423 /* Old password mode removed - I have no idea what it 403 /* Old password mode removed - I have no idea what it
424 * was, and the current password mechanism has been used 404 * was, and the current password mechanism has been used
425 * for at least several years. 405 * for at least several years.
426 */ 406 */
427 } 407 }
428 if (!correct) { 408 if (!correct) {
429 new_draw_info(NDI_UNIQUE, 0,op," "); 409 new_draw_info(NDI_UNIQUE, 0,op," ");
430 new_draw_info(NDI_UNIQUE, 0,op,"Wrong Password!"); 410 new_draw_info(NDI_UNIQUE, 0,op,"Wrong Password!");
431 new_draw_info(NDI_UNIQUE, 0,op," "); 411 new_draw_info(NDI_UNIQUE, 0,op," ");
432 FREE_AND_COPY(op->name, "noname"); 412 op->name =
433 FREE_AND_COPY(op->name_pl, "noname"); 413 op->name_pl = "noname";
434 op->contr->socket.password_fails++; 414 op->contr->socket.password_fails++;
435 if (op->contr->socket.password_fails >= MAX_PASSWORD_FAILURES) { 415 if (op->contr->socket.password_fails >= MAX_PASSWORD_FAILURES) {
436 new_draw_info(NDI_UNIQUE, 0,op, 416 new_draw_info(NDI_UNIQUE, 0,op,
437 "You gave an incorrect password too many times, you will now be dropped from the server."); 417 "You gave an incorrect password too many times, you will now be dropped from the server.");
438 LOG(llevInfo, "A player connecting from %s has been dropped for password failure\n", 418 LOG(llevInfo, "A player connecting from %s has been dropped for password failure\n",
439 op->contr->socket.host); 419 op->contr->socket.host);
440 op->contr->socket.status = Ns_Dead; /* the socket loop should handle the rest for us */ 420 op->contr->socket.status = Ns_Dead; /* the socket loop should handle the rest for us */
441 } 421 }
442 else get_name(op); 422 else get_name(op);
443 return; /* Once again, rest of code just loads the char */ 423 return; /* Once again, rest of code just loads the char */
444 } 424 }
445 425
446#ifdef SAVE_INTERVAL 426#ifdef SAVE_INTERVAL
447 pl->last_save_time=time(NULL); 427 pl->last_save_time=time(NULL);
448#endif /* SAVE_INTERVAL */ 428#endif /* SAVE_INTERVAL */
449 pl->party = NULL; 429 pl->party = NULL;
450 if (settings.search_items == TRUE) 430 if (settings.search_items == TRUE)
451 pl->search_str[0]='\0'; 431 pl->search_str[0]='\0';
452 pl->name_changed=1; 432 pl->name_changed=1;
453 pl->orig_stats.Str=0; 433 pl->orig_stats.Str=0;
454 pl->orig_stats.Dex=0; 434 pl->orig_stats.Dex=0;
455 pl->orig_stats.Con=0; 435 pl->orig_stats.Con=0;
456 pl->orig_stats.Int=0; 436 pl->orig_stats.Int=0;
… …
460 strcpy(pl->savebed_map, first_map_path); 440 strcpy(pl->savebed_map, first_map_path);
461 pl->bed_x=0, pl->bed_y=0; 441 pl->bed_x=0, pl->bed_y=0;
462 pl->spellparam[0] = '\0'; 442 pl->spellparam[0] = '\0';
463 443
464 /* Loop through the file, loading the rest of the values */ 444 /* Loop through the file, loading the rest of the values */
465 while (fgets(bufall,MAX_BUF,fp)!=NULL) { 445 while (fgets(bufall,MAX_BUF,thawer)!=NULL) {
466 sscanf(bufall,"%s %d\n",buf,&value); 446 sscanf(bufall,"%s %d\n",buf,&value);
467 if (!strcmp(buf,"endplst")) 447 if (!strcmp(buf,"endplst"))
468 break; 448 break;
469 else if (!strcmp(buf,"oid")) 449 else if (!strcmp(buf,"oid"))
470 thawer.get (pl, value); 450 thawer.get (pl, value);
471 else if (!strcmp(buf,"title") && settings.set_title == TRUE) 451 else if (!strcmp(buf,"title") && settings.set_title == TRUE)
472 sscanf(bufall,"title %[^\n]",pl->own_title); 452 sscanf(bufall,"title %[^\n]",pl->own_title);
473 else if (!strcmp(buf,"explore")) 453 else if (!strcmp(buf,"explore"))
474 pl->explore = value; 454 pl->explore = value;
475 else if (!strcmp(buf,"gen_hp")) 455 else if (!strcmp(buf,"gen_hp"))
476 pl->gen_hp=value; 456 pl->gen_hp=value;
477 else if (!strcmp(buf,"shoottype")) 457 else if (!strcmp(buf,"shoottype"))
478 pl->shoottype=(rangetype)value; 458 pl->shoottype=(rangetype)value;
479 else if (!strcmp(buf,"bowtype")) 459 else if (!strcmp(buf,"bowtype"))
480 pl->bowtype=(bowtype_t)value; 460 pl->bowtype=(bowtype_t)value;
481 else if (!strcmp(buf,"petmode")) 461 else if (!strcmp(buf,"petmode"))
482 pl->petmode=(petmode_t)value; 462 pl->petmode=(petmode_t)value;
483 else if (!strcmp(buf,"gen_sp")) 463 else if (!strcmp(buf,"gen_sp"))
484 pl->gen_sp=value; 464 pl->gen_sp=value;
485 else if (!strcmp(buf,"gen_grace")) 465 else if (!strcmp(buf,"gen_grace"))
486 pl->gen_grace=value; 466 pl->gen_grace=value;
487 else if (!strcmp(buf,"listening")) 467 else if (!strcmp(buf,"listening"))
488 pl->listening=value; 468 pl->listening=value;
489 else if (!strcmp(buf,"peaceful")) 469 else if (!strcmp(buf,"peaceful"))
490 pl->peaceful=value; 470 pl->peaceful=value;
491 else if (!strcmp(buf,"no_shout")) 471 else if (!strcmp(buf,"no_shout"))
492 pl->no_shout=value; 472 pl->no_shout=value;
493 else if (!strcmp(buf,"digestion")) 473 else if (!strcmp(buf,"digestion"))
494 pl->digestion=value; 474 pl->digestion=value;
495 else if (!strcmp(buf,"pickup")) 475 else if (!strcmp(buf,"pickup"))
496 pl->mode=value; 476 pl->mode=value;
497 else if (!strcmp(buf,"outputs_sync")) 477 else if (!strcmp(buf,"outputs_sync"))
498 pl->outputs_sync = value; 478 pl->outputs_sync = value;
499 else if (!strcmp(buf,"outputs_count")) 479 else if (!strcmp(buf,"outputs_count"))
500 pl->outputs_count = value; 480 pl->outputs_count = value;
501 else if (!strcmp(buf,"map")) 481 else if (!strcmp(buf,"map"))
502 sscanf(bufall,"map %s", pl->maplevel); 482 sscanf(bufall,"map %s", pl->maplevel);
503 else if (!strcmp(buf,"savebed_map")) 483 else if (!strcmp(buf,"savebed_map"))
504 sscanf(bufall,"savebed_map %s", pl->savebed_map); 484 sscanf(bufall,"savebed_map %s", pl->savebed_map);
505 else if (!strcmp(buf,"bed_x")) 485 else if (!strcmp(buf,"bed_x"))
506 pl->bed_x=value; 486 pl->bed_x=value;
507 else if (!strcmp(buf,"bed_y")) 487 else if (!strcmp(buf,"bed_y"))
508 pl->bed_y=value; 488 pl->bed_y=value;
509 else if (!strcmp(buf,"weapon_sp")) 489 else if (!strcmp(buf,"weapon_sp"))
510 sscanf(buf,"weapon_sp %f",&pl->weapon_sp); 490 sscanf(buf,"weapon_sp %f",&pl->weapon_sp);
511 else if (!strcmp(buf,"Str")) 491 else if (!strcmp(buf,"Str"))
512 pl->orig_stats.Str=value; 492 pl->orig_stats.Str=value;
513 else if (!strcmp(buf,"Dex")) 493 else if (!strcmp(buf,"Dex"))
514 pl->orig_stats.Dex=value; 494 pl->orig_stats.Dex=value;
515 else if (!strcmp(buf,"Con")) 495 else if (!strcmp(buf,"Con"))
516 pl->orig_stats.Con=value; 496 pl->orig_stats.Con=value;
517 else if (!strcmp(buf,"Int")) 497 else if (!strcmp(buf,"Int"))
518 pl->orig_stats.Int=value; 498 pl->orig_stats.Int=value;
519 else if (!strcmp(buf,"Pow")) 499 else if (!strcmp(buf,"Pow"))
520 pl->orig_stats.Pow=value; 500 pl->orig_stats.Pow=value;
521 else if (!strcmp(buf,"Wis")) 501 else if (!strcmp(buf,"Wis"))
522 pl->orig_stats.Wis=value; 502 pl->orig_stats.Wis=value;
523 else if (!strcmp(buf,"Cha")) 503 else if (!strcmp(buf,"Cha"))
524 pl->orig_stats.Cha=value; 504 pl->orig_stats.Cha=value;
525 else if (!strcmp(buf,"usekeys")) { 505 else if (!strcmp(buf,"usekeys")) {
526 if (!strcmp(bufall+8,"key_inventory\n")) 506 if (!strcmp(bufall+8,"key_inventory\n"))
527 pl->usekeys=key_inventory; 507 pl->usekeys=key_inventory;
528 else if (!strcmp(bufall+8,"keyrings\n")) 508 else if (!strcmp(bufall+8,"keyrings\n"))
529 pl->usekeys=keyrings; 509 pl->usekeys=keyrings;
530 else if (!strcmp(bufall+8,"containers\n")) 510 else if (!strcmp(bufall+8,"containers\n"))
531 pl->usekeys=containers; 511 pl->usekeys=containers;
532 else LOG(llevDebug,"load_player: got unknown usekeys type: %s\n", bufall+8); 512 else LOG(llevDebug,"load_player: got unknown usekeys type: %s\n", bufall+8);
533 } 513 }
534 else if (!strcmp(buf,"unapply")) { 514 else if (!strcmp(buf,"unapply")) {
535 if (!strcmp(bufall+8,"unapply_nochoice\n")) 515 if (!strcmp(bufall+8,"unapply_nochoice\n"))
536 pl->unapply=unapply_nochoice; 516 pl->unapply=unapply_nochoice;
537 else if (!strcmp(bufall+8,"unapply_never\n")) 517 else if (!strcmp(bufall+8,"unapply_never\n"))
538 pl->unapply=unapply_never; 518 pl->unapply=unapply_never;
539 else if (!strcmp(bufall+8,"unapply_always\n")) 519 else if (!strcmp(bufall+8,"unapply_always\n"))
540 pl->unapply=unapply_always; 520 pl->unapply=unapply_always;
541 else LOG(llevDebug,"load_player: got unknown unapply type: %s\n", bufall+8); 521 else LOG(llevDebug,"load_player: got unknown unapply type: %s\n", bufall+8);
542 } 522 }
543 else if (!strcmp(buf,"lev_array")){ 523 else if (!strcmp(buf,"lev_array")){
544 for(i=1;i<=value;i++) { 524 for(i=1;i<=value;i++)
545 int j; 525 {
546 fscanf(fp,"%d\n",&j); 526 char line[128];
547 pl->levhp[i]=j; 527 fgets (line, 128, thawer); pl->levhp[i] = atoi (line);
548 fscanf(fp,"%d\n",&j); 528 fgets (line, 128, thawer); pl->levsp[i] = atoi (line);
549 pl->levsp[i]=j; 529 fgets (line, 128, thawer); pl->levgrace[i] = atoi (line);
550 fscanf(fp,"%d\n",&j); 530 }
551 pl->levgrace[i]=j;
552 }
553 /* spell_array code removed - don't know when that was last used. 531 /* spell_array code removed - don't know when that was last used.
554 * Even the load code below will someday be replaced by spells being 532 * Even the load code below will someday be replaced by spells being
555 * objects. 533 * objects.
556 */ 534 */
557 } else if (!strcmp(buf,"known_spell")) { 535 } else if (!strcmp(buf,"known_spell")) {
558#if 0 536#if 0
559 /* Logic is left here in case someone wants to try 537 /* Logic is left here in case someone wants to try
560 * and write code to update to spell objects. 538 * and write code to update to spell objects.
561 */ 539 */
562 char *cp=strchr(bufall,'\n'); 540 char *cp=strchr(bufall,'\n');
563 *cp='\0'; 541 *cp='\0';
564 cp=strchr(bufall,' '); 542 cp=strchr(bufall,' ');
565 cp++; 543 cp++;
566 for(i=0;i<NROFREALSPELLS;i++) 544 for(i=0;i<NROFREALSPELLS;i++)
567 if(!strcmp(spells[i].name,cp)) { 545 if(!strcmp(spells[i].name,cp)) {
568 pl->known_spells[pl->nrofknownspells++]=i; 546 pl->known_spells[pl->nrofknownspells++]=i;
569 break; 547 break;
570 } 548 }
571 if(i==NROFREALSPELLS) 549 if(i==NROFREALSPELLS)
572 LOG(llevDebug, "Error: unknown spell (%s)\n",cp); 550 LOG(llevDebug, "Error: unknown spell (%s)\n",cp);
573#endif 551#endif
574 } 552 }
575 } /* End of loop loading the character file */ 553 } /* End of loop loading the character file */
576 leave_map(op); 554 leave_map(op);
577 op->speed=0; 555 op->speed=0;
578 update_ob_speed(op); 556 update_ob_speed(op);
579 reset_object(op); 557 reset_object(op);
580 op->contr = pl; 558 op->contr = pl;
581 pl->ob = op; 559 pl->ob = op;
582 560
583 /* this loads the standard objects values. */ 561 /* this loads the standard objects values. */
584 load_object(thawer, op, LO_NEWFILE,0); 562 load_object (thawer, op, 0);
585 close_and_delete(fp, comp);
586 563
587 CLEAR_FLAG(op, FLAG_NO_FIX_PLAYER); 564 CLEAR_FLAG(op, FLAG_NO_FIX_PLAYER);
588 565
589 strncpy(pl->title, op->arch->clone.name, sizeof(pl->title)-1); 566 strncpy(pl->title, op->arch->clone.name, sizeof(pl->title)-1);
590 pl->title[sizeof(pl->title)-1] = '\0'; 567 pl->title[sizeof(pl->title)-1] = '\0';
… …
595 * First, we check for partial path, then check to see if the full 572 * First, we check for partial path, then check to see if the full
596 * path (for unique player maps) 573 * path (for unique player maps)
597 */ 574 */
598 if (check_path(pl->maplevel,1)==-1) { 575 if (check_path(pl->maplevel,1)==-1) {
599 if (check_path(pl->maplevel,0)==-1) { 576 if (check_path(pl->maplevel,0)==-1) {
600 strcpy(pl->maplevel, pl->savebed_map); 577 strcpy(pl->maplevel, pl->savebed_map);
601 op->x = pl->bed_x, op->y = pl->bed_y; 578 op->x = pl->bed_x, op->y = pl->bed_y;
602 } 579 }
603 }
604
605 /* If player saved beyond some time ago, and the feature is
606 * enabled, put the player back on his savebed map.
607 */
608 if ((settings.reset_loc_time >0) && (elapsed_save_time > settings.reset_loc_time)) {
609 strcpy(pl->maplevel, pl->savebed_map);
610 op->x = pl->bed_x, op->y = pl->bed_y;
611 } 580 }
612 581
613 /* make sure he's a player--needed because of class change. */ 582 /* make sure he's a player--needed because of class change. */
614 op->type = PLAYER; 583 op->type = PLAYER;
615 584
… …
636 605
637 /* if it's a dragon player, set the correct title here */ 606 /* if it's a dragon player, set the correct title here */
638 if (is_dragon_pl(op) && op->inv != NULL) { 607 if (is_dragon_pl(op) && op->inv != NULL) {
639 object *tmp, *abil=NULL, *skin=NULL; 608 object *tmp, *abil=NULL, *skin=NULL;
640 for (tmp=op->inv; tmp!=NULL; tmp=tmp->below) { 609 for (tmp=op->inv; tmp!=NULL; tmp=tmp->below) {
641 if (tmp->type == FORCE) { 610 if (tmp->type == FORCE) {
642 if (strcmp(tmp->arch->name, "dragon_ability_force")==0) 611 if (strcmp(tmp->arch->name, "dragon_ability_force")==0)
643 abil = tmp; 612 abil = tmp;
644 else if (strcmp(tmp->arch->name, "dragon_skin_force")==0) 613 else if (strcmp(tmp->arch->name, "dragon_skin_force")==0)
645 skin = tmp; 614 skin = tmp;
646 } 615 }
647 } 616 }
648 set_dragon_name(op, abil, skin); 617 set_dragon_name(op, abil, skin);
649 } 618 }
650 619
651 new_draw_info(NDI_UNIQUE, 0,op,"Welcome Back!"); 620 new_draw_info(NDI_UNIQUE, 0,op,"Welcome Back!");
652 new_draw_info_format(NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, 621 new_draw_info_format(NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL,
653 "%s has entered the game.",pl->ob->name); 622 "%s has entered the game.", &pl->ob->name);
654 623
655 INVOKE_PLAYER (LOAD, pl, ARG_STRING (filename)); 624 INVOKE_PLAYER (LOAD, pl, ARG_STRING (filename));
656 INVOKE_PLAYER (LOGIN, pl); 625 INVOKE_PLAYER (LOGIN, pl);
657 626
658 op->contr->socket.update_look=1; 627 op->contr->socket.update_look=1;
… …
661 * logic for that to take place. If player is permanently 630 * logic for that to take place. If player is permanently
662 * dead, and not using permadeath mode, the kill_player will 631 * dead, and not using permadeath mode, the kill_player will
663 * set the play_again flag, so return. 632 * set the play_again flag, so return.
664 */ 633 */
665 if (op->stats.hp<0) { 634 if (op->stats.hp<0) {
666 new_draw_info(NDI_UNIQUE, 0,op,"Your character was dead last your played."); 635 new_draw_info(NDI_UNIQUE, 0,op,"Your character was dead last your played.");
667 kill_player(op); 636 kill_player(op);
668 if (pl->state != ST_PLAYING) return; 637 if (pl->state != ST_PLAYING) return;
669 } 638 }
670 LOG(llevInfo,"LOGIN: Player named %s from ip %s\n", op->name, 639 LOG(llevInfo,"LOGIN: Player named %s from ip %s\n", &op->name, op->contr->socket.host);
671 op->contr->socket.host);
672 640
673 /* Do this after checking for death - no reason sucking up bandwidth if 641 /* Do this after checking for death - no reason sucking up bandwidth if
674 * the data isn't needed. 642 * the data isn't needed.
675 */ 643 */
676 esrv_new_player(op->contr,op->weight+op->carrying); 644 esrv_new_player(op->contr,op->weight+op->carrying);

Diff Legend

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