From ce82caa0a4207a2d9e25f79d0698689849517529 Mon Sep 17 00:00:00 2001 From: leo Date: Thu, 23 Feb 2006 18:22:27 +0000 Subject: Fixed the swapped values in the snap menu, changed default Z snap back to 1 flat and fixed the snap value after loading old project files. git-svn-id: http://svn.leocad.org/trunk@490 c7d43263-9d01-0410-8a33-9dba5d9f93d6 --- common/project.cpp | 6 ++++-- win/LeoCAD.rc | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/common/project.cpp b/common/project.cpp index 2426cd5..fe347ca 100644 --- a/common/project.cpp +++ b/common/project.cpp @@ -318,7 +318,7 @@ void Project::LoadDefaults(bool cameras) m_nAngleSnap = (unsigned short)Sys_ProfileLoadInt ("Default", "Angle", 30); m_nSnap = Sys_ProfileLoadInt ("Default", "Snap", LC_DRAW_SNAP_A | LC_DRAW_SNAP_X | LC_DRAW_SNAP_Y | LC_DRAW_SNAP_Z | LC_DRAW_MOVE | LC_DRAW_PREVIEW); SystemUpdateSnap(m_nSnap); - m_nMoveSnap = 0x0604; + m_nMoveSnap = 0x0304; SystemUpdateSnap(m_nMoveSnap, m_nAngleSnap); m_fLineWidth = (float)Sys_ProfileLoadInt ("Default", "Line", 100)/100; m_fFogDensity = (float)Sys_ProfileLoadInt ("Default", "Density", 10)/100; @@ -797,6 +797,8 @@ bool Project::FileLoad(File* file, bool bUndo, bool bMerge) file->ReadShort (&m_nTotalFrames, 1); file->ReadShort (&m_nGridSize, 1); file->ReadShort (&m_nMoveSnap, 1); + if (fv < 1.4f) + m_nMoveSnap = 0x0304; } } @@ -853,7 +855,7 @@ bool Project::FileLoad(File* file, bool bUndo, bool bMerge) void Project::FileSave(File* file, bool bUndo) { - float ver_flt = 1.3f; // LeoCAD 0.70 + float ver_flt = 1.4f; // LeoCAD 0.75 - (and this should have been an integer). unsigned long rgb; unsigned char ch; unsigned short sh; diff --git a/win/LeoCAD.rc b/win/LeoCAD.rc index 89f65c8..4ce66da 100644 --- a/win/LeoCAD.rc +++ b/win/LeoCAD.rc @@ -452,8 +452,8 @@ BEGIN MENUITEM "None", ID_SNAP_0 MENUITEM "1/20 Stud", ID_SNAP_1 MENUITEM "1/4 Stud", ID_SNAP_2 - MENUITEM "1/2 Stud", ID_SNAP_3 - MENUITEM "1 Flat", ID_SNAP_4 + MENUITEM "1 Flat", ID_SNAP_3 + MENUITEM "1/2 Stud", ID_SNAP_4 MENUITEM "1 Stud", ID_SNAP_5 MENUITEM "2 Studs", ID_SNAP_6 MENUITEM "3 Studs", ID_SNAP_7 -- cgit v1.2.3