Mercurial > ldforge / changeset

--- a/src/config.h	Wed May 08 15:19:06 2013 +0300
+++ b/src/config.h	Wed May 08 15:30:19 2013 +0300
@@ -27,7 +27,7 @@
 #include <qkeysequence.h>
 
 #define MAX_INI_LINE 512
-#define NUM_CONFIG (g_pConfigPointers.size ())
+#define NUM_CONFIG (g_configPointers.size ())
 
 #define cfg(T, NAME, DEFAULT) \
 	T##config NAME (DEFAULT, #NAME, #T, #DEFAULT)
@@ -119,7 +119,7 @@
 		name = _name; \
 		typestring = _typestring; \
 		defaultstring = _defaultstring; \
-		g_pConfigPointers.push_back (this); \
+		g_configPointers.push_back (this); \
 	} \
 	operator T () { \
 		return value; \

--- a/src/extprogs.cpp	Wed May 08 15:19:06 2013 +0300
+++ b/src/extprogs.cpp	Wed May 08 15:30:19 2013 +0300
@@ -245,7 +245,7 @@
 
 // =============================================================================
 // Interface for Ytruder
-MAKE_ACTION (ytruder, "Ytruder", "ytruder", "Extrude selected lines to a given plane", KEY (F4)) {
+void runYtruder () {
 	setlocale (LC_ALL, "C");
 	
 	if (!checkProgPath (prog_ytruder, Ytruder))
@@ -302,7 +302,7 @@
 
 // ========================================================================================================================================
 // Rectifier interface
-MAKE_ACTION (rectifier, "Rectifier", "rectifier", "Optimizes quads into rect primitives.", KEY (F8)) {
+void runRectifier () {
 	setlocale (LC_ALL, "C");
 	
 	if (!checkProgPath (prog_rectifier, Rectifier))
@@ -363,7 +363,7 @@
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =======================================================================================================================================
 // Intersector interface
-MAKE_ACTION (intersector, "Intersector", "intersector", "Perform clipping between two input groups.", KEY (F5)) {
+void runIntersector () {
 	setlocale (LC_ALL, "C");
 	
 	if (!checkProgPath (prog_intersector, Intersector))

--- a/src/extprogs.h	Wed May 08 15:19:06 2013 +0300
+++ b/src/extprogs.h	Wed May 08 15:30:19 2013 +0300
@@ -30,4 +30,8 @@
 	DATHeader
 };
 
+void runYtruder ();
+void runRectifier ();
+void runIntersector ();
+
 #endif // EXTPROGS_H
\ No newline at end of file

--- a/src/gui_editactions.cpp	Wed May 08 15:19:06 2013 +0300
+++ b/src/gui_editactions.cpp	Wed May 08 15:30:19 2013 +0300
@@ -684,4 +684,19 @@
 		History::addEntry (new EditHistory (indices, oldCopies, newCopies));
 		g_win->refresh ();
 	}
+}
+
+// =============================================================================
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// =============================================================================
+MAKE_ACTION (ytruder, "Ytruder", "ytruder", "Extrude selected lines to a given plane", KEY (F4)) {
+	runYtruder ();
+}
+
+MAKE_ACTION (rectifier, "Rectifier", "rectifier", "Optimizes quads into rect primitives.", KEY (F8)) {
+	runRectifier ();
+}
+
+MAKE_ACTION (intersector, "Intersector", "intersector", "Perform clipping between two input groups.", KEY (F5)) {
+	runIntersector ();
 }
\ No newline at end of file