X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fglobal.cpp;h=624c94f8b136fdd4d33cefec48032ff94fb0bc72;hb=d00cd5f46252ca0fb3df6e8191dc75f8991b2aa2;hp=8dc2f98d76693b99c3470746288355119590e3de;hpb=6a7baa2814a8b4d0b93df776a4c99689bcfb3ffa;p=architektonas

diff --git a/src/global.cpp b/src/global.cpp
index 8dc2f98..624c94f 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -25,9 +25,12 @@ QRectF Global::selection;
 
 int Global::tool = TTNone;
 int Global::toolState = TSNone;
+bool Global::toolSuppressCrosshair = false;
+double Global::parallelDist = 1.0;
+int Global::parallelNum = 1;
+int Global::parallelBU = BUInch;
 
 double Global::gridSpacing;
-int Global::currentLayer = 0;
 Point Global::snapPoint;
 bool Global::snapPointIsValid = false;
 uint32_t Global::objectID = 1;
@@ -38,6 +41,12 @@ Vector Global::screenSize(200.0, 200.0);
 
 float Global::scale = 0.5;
 
+float Global::penWidth = 1.0;
+int Global::penStyle = 1;
+uint32_t Global::penColor = 0x000000;
+bool Global::penStamp = false;
+bool Global::penDropper = false;
+
 Point Global::intersectPoint[16]; // Overkill, yes
 double Global::intersectParam[16]; // Ditto
 int Global::numIntersectPoints = 0;
@@ -45,6 +54,6 @@ int Global::numIntersectParams = 0;
 
 int Global::activeLayer = 0;
 int Global::numLayers = 1;
-std::vector<bool> Global::layerHidden;
-std::vector<bool> Global::layerLocked;
-
+BVector Global::layerHidden;
+BVector Global::layerLocked;
+SVector Global::layerName;