fixed nudge-selection and build-monitoring-defaults

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@66 8a3a26a2-13c4-0310-b231-cf6edde360e5

diff --git a/CHANGES b/CHANGES
index c5a3f883702c7c51f1035767e4de404c3c8b4f8a..0ae8162c1ccf4c54c632ffbb3f7fb753ab0066d6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,8 @@ SPoG
 - Changed 'inconsistent vertex count' assert to be non-fatal.
 - Changed 'failed to remove accelerator' assert to be non-fatal.
 - Fixed crash due to broken module dependencies.
 - Changed 'inconsistent vertex count' assert to be non-fatal.
 - Changed 'failed to remove accelerator' assert to be non-fatal.
 - Fixed crash due to broken module dependencies.

+- Fixed default settings for Build Monitoring.
+- Fixed nudge-selection when using the drag tool mode.

 
 30/04/2006
 SPoG
 
 30/04/2006
 SPoG

diff --git a/radiant/selection.cpp b/radiant/selection.cpp
index 75dbbaeefd69098be90f24ffddb4bb263e35f12e..effdfd3cf296d3e675c32b31995df3391ad7bbc0 100644 (file)
--- a/radiant/selection.cpp
+++ b/radiant/selection.cpp
@@ -3285,7 +3285,7 @@ public:
   /// \todo Support view-dependent nudge.
   void NudgeManipulator(const Vector3& nudge, const Vector3& view)
   {
   /// \todo Support view-dependent nudge.
   void NudgeManipulator(const Vector3& nudge, const Vector3& view)
   {

-    if(ManipulatorMode() == eTranslate)
+    if(ManipulatorMode() == eTranslate || ManipulatorMode() == eDrag)

     {
       translateSelected(nudge);
     }
     {
       translateSelected(nudge);
     }

diff --git a/radiant/watchbsp.cpp b/radiant/watchbsp.cpp
index ee8912e0b16b81d33745a7aa9d7c2983624f17ad..e2cc86c37d176e4cf70b81007230a29031ee652d 100644 (file)
--- a/radiant/watchbsp.cpp
+++ b/radiant/watchbsp.cpp
@@ -211,7 +211,7 @@ void BuildMonitor_Construct()
 {
   g_pWatchBSP = new CWatchBSP();
 
 {
   g_pWatchBSP = new CWatchBSP();
 

-  g_WatchBSP_Enabled = !string_empty(g_pGameDescription->getKeyValue("no_bsp_monitor"));
+  g_WatchBSP_Enabled = !string_equal(g_pGameDescription->getKeyValue("no_bsp_monitor"), "1");

 
   GlobalPreferenceSystem().registerPreference("WatchBSP", BoolImportStringCaller(g_WatchBSP_Enabled), BoolExportStringCaller(g_WatchBSP_Enabled));
   GlobalPreferenceSystem().registerPreference("RunQuake2Run", BoolImportStringCaller(g_WatchBSP_RunQuake), BoolExportStringCaller(g_WatchBSP_RunQuake));
 
   GlobalPreferenceSystem().registerPreference("WatchBSP", BoolImportStringCaller(g_WatchBSP_Enabled), BoolExportStringCaller(g_WatchBSP_Enabled));
   GlobalPreferenceSystem().registerPreference("RunQuake2Run", BoolImportStringCaller(g_WatchBSP_RunQuake), BoolExportStringCaller(g_WatchBSP_RunQuake));