Skip to content

Fix FRED resetting the grid position after saving a mission #7552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Goober5000 wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −0
Open

Fix FRED resetting the grid position after saving a mission #7552

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions fred2/freddoc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
#include "localization/fhash.h"
#include "localization/localize.h"
#include "mission/missiongoals.h"
#include "mission/missiongrid.h"
#include "mission/missionparse.h"
#include "object/object.h"
#include "render/3d.h"
Expand Down Expand Up @@ -233,6 +234,14 @@ bool CFREDDoc::load_mission(const char *pathname, int flags) {
Parse_viewer_pos = view_pos;
Parse_viewer_orient = view_orient;

// preserve the editor grid across the reload; it's display state, not part of the mission,
// but clear_mission() recreates it via fred_render_init(). (See the view_pos/view_orient handling above and below.)
matrix grid_orient = The_grid->gmatrix;
vec3d grid_center = The_grid->center;
int grid_nrows = The_grid->nrows;
int grid_ncols = The_grid->ncols;
float grid_square_size = The_grid->square_size;

// activate the localizer hash table
fhash_flush();

Expand Down Expand Up @@ -392,6 +401,10 @@ bool CFREDDoc::load_mission(const char *pathname, int flags) {

view_pos = Parse_viewer_pos;
view_orient = Parse_viewer_orient;

// restore the editor grid that was preserved above
create_grid(The_grid, &grid_orient.vec.fvec, &grid_orient.vec.rvec, &grid_center, grid_nrows, grid_ncols, grid_square_size);

set_modified(0);
stars_post_level_init();

Expand Down
Loading