comparison rogue3/state.c @ 111:7f8f43943b1f

Fix some terribly depressing corruption during restore. In rogue5/state.c, rs_read_daemons() zeroes out the argument and delay if the daemon slot is empty. Unfortunately that code ended up on the wrong side of the brace that closes the for loop, so instead of running after each daemon, it got run once after the loop exited, when the index was of course out of bounds. This tended to manifest, when compiled with -O2, by overwriting hw and setting it to NULL. When inventory() next ran, hw would be passed to wgetch(), which returns ERR when it gets a NULL argument. This made md_readchar() think something was wrong and autosave the game. Upon investigation, rogue3 was found to commit the same mistake. rogue4 and srogue don't zero the data. arogue5 already does it properly. Someday I am going to run all this through Valgrind. Someday when I am a kinder person who will not be driven to invoke hordes of trolls and centaurs upon the original authors.
author John "Elwin" Edwards
date Wed, 08 Jan 2014 16:44:16 -0500
parents 09db0cf536af
children e52a8a7ad4c5
comparison
equal deleted inserted replaced
110:5f51f7d9805f 111:7f8f43943b1f
679 case 9: dlist[i].d_func = sight; 679 case 9: dlist[i].d_func = sight;
680 break; 680 break;
681 default:dlist[i].d_func = NULL; 681 default:dlist[i].d_func = NULL;
682 break; 682 break;
683 } 683 }
684 } 684 if (dlist[i].d_func == NULL)
685 685 {
686 if (dlist[i].d_func == NULL) 686 dlist[i].d_type = 0;
687 { 687 dlist[i].d_arg = 0;
688 dlist[i].d_type = 0; 688 dlist[i].d_time = 0;
689 dlist[i].d_arg = 0; 689 }
690 dlist[i].d_time = 0; 690 }
691 }
692 } 691 }
693 692
694 void 693 void
695 rs_write_room(FILE *savef, struct room *r) 694 rs_write_room(FILE *savef, struct room *r)
696 { 695 {