X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fglobal.cpp;h=9ec2a7bba529187dd2040f1a6de2102a8a78a1dd;hb=742d2aa9bb46bce4f690474fa22f5980e175e55e;hp=013f795eff2c32027457b9ab00fe7ef98318a7d8;hpb=ea7712f342020baf61cf33ba98b12140da6aecf7;p=architektonas

diff --git a/src/global.cpp b/src/global.cpp
index 013f795..9ec2a7b 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -27,7 +27,6 @@ int Global::tool = TTNone;
 int Global::toolState = TSNone;
 
 double Global::gridSpacing;
-int Global::currentLayer = 0;
 Point Global::snapPoint;
 bool Global::snapPointIsValid = false;
 uint32_t Global::objectID = 1;
@@ -38,6 +37,19 @@ Vector Global::screenSize(200.0, 200.0);
 
 float Global::scale = 0.5;
 
-int Global::activeLayer = 0;
-bool Global::layerIsLocked = false;
+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;
+int Global::numIntersectParams = 0;
 
+int Global::activeLayer = 0;
+int Global::numLayers = 1;
+BVector Global::layerHidden;
+BVector Global::layerLocked;
+SVector Global::layerName;