More fixes to load/save

Author: drcode1

actors.cc

@@ -1436,6 +1436,7 @@ int Monster_actor::is_blocked
 			int new_lift;
 			Chunk_object_list *olist = gwin->get_objects(
 					x/tiles_per_chunk, cy);
+			olist->setup_cache();
 			if (olist->is_blocked(height, lift, x%tiles_per_chunk,
 							rty, new_lift) ||
 			    new_lift != lift)
@@ -1451,6 +1452,7 @@ int Monster_actor::is_blocked
 			int new_lift;
 			Chunk_object_list *olist = gwin->get_objects(
 					cx, y/tiles_per_chunk);
+			olist->setup_cache();
 			if (olist->is_blocked(height, lift, rtx,
 					y%tiles_per_chunk, new_lift) ||
 			    new_lift != lift)

exult.cc

@@ -969,7 +969,7 @@ int Modal_gump
 	gwin->get_win()->put(back, box.x, box.y);
 	delete back;
 	mouse->set_shape(saveshape);
-	mouse->show();
+					// Leave mouse off.
 	gwin->set_painted();
 	gwin->show();
 	return (!escaped);

gamewin.cc

@@ -795,11 +795,13 @@ int Game_window::read
 	)
 	{
 	clear_world();			// Wipe clean.
+	if (!read_gwin())		// Read our data.
+		return (0);
+	main_actor_inside = 0;
+	end_gump_mode();		// Kill gumps, and paint new data.
 	read_npcs();			// Read in NPC's, monsters.
 	if (!usecode->read())		// Usecode.dat (party, global flags).
 		return (0);
-	if (!read_gwin())		// Read our data.
-		return (0);
 	clock.set_palette();		// Set palette for time-of-day.
 	return (1);
 	}

gumps.cc

@@ -297,7 +297,7 @@ int Gump_text::mouse_clicked
 	{
 	if (!on_widget(gwin, mx, my))	// Not in our area?
 		return (0);
-	mx -= textx;			// Get pt. rel. to text area.
+	mx -= textx + parent->get_x();	// Get pt. rel. to text area.
 	if (!focus)			// Gaining focus?
 		{
 		focus = 1;		// We have focus now.
@@ -434,8 +434,10 @@ void Disk_gump_button::activate
 					// Did user restore a game?
 	int restored = fileio->restored_game();
 	delete fileio;
+#if 0
 	if (restored)
 		parent->close(gwin);	// If so, close gump.
+#endif
 	}
 
 /*
@@ -1888,9 +1890,9 @@ void Yesno_gump_object::key_down
 	int chr
 	)
 	{
-	if (chr == 'y' || chr == 'Y')
+	if (chr == 'y' || chr == 'Y' || chr == SDLK_RETURN)
 		set_answer(1);
-	else if (chr == 'n' || chr == 'N')
+	else if (chr == 'n' || chr == 'N' || chr == SDLK_ESCAPE)
 		set_answer(0);
 	}