Date:	Thursday May 10, 2001 @ 20:46
Author:	cameron

Update of /home/netrek/cvsroot/Vanilla/gum
In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv9078

Modified Files:
	gum.xml main.c 
Log Message:
Quisar's changes to add new .sysdef options, propogated to gum.


****************************************

Index: Vanilla/gum/gum.xml
diff -u Vanilla/gum/gum.xml:1.11 Vanilla/gum/gum.xml:1.12
--- Vanilla/gum/gum.xml:1.11	Tue May  8 06:48:53 2001
+++ Vanilla/gum/gum.xml	Thu May 10 20:45:59 2001
@@ -2797,7 +2797,7 @@
 	<class>GtkTable</class>
 	<name>table4</name>
 	<border_width>6</border_width>
-	<rows>18</rows>
+	<rows>20</rows>
 	<columns>2</columns>
 	<homogeneous>False</homogeneous>
 	<row_spacing>6</row_spacing>
@@ -3127,8 +3127,8 @@
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>2</right_attach>
-	    <top_attach>17</top_attach>
-	    <bottom_attach>18</bottom_attach>
+	    <top_attach>19</top_attach>
+	    <bottom_attach>20</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>True</xexpand>
@@ -3309,8 +3309,8 @@
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>1</right_attach>
-	    <top_attach>9</top_attach>
-	    <bottom_attach>10</bottom_attach>
+	    <top_attach>11</top_attach>
+	    <bottom_attach>12</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>False</xexpand>
@@ -3335,8 +3335,8 @@
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>1</right_attach>
-	    <top_attach>10</top_attach>
-	    <bottom_attach>11</bottom_attach>
+	    <top_attach>12</top_attach>
+	    <bottom_attach>13</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>False</xexpand>
@@ -3361,8 +3361,8 @@
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>1</right_attach>
-	    <top_attach>11</top_attach>
-	    <bottom_attach>12</bottom_attach>
+	    <top_attach>13</top_attach>
+	    <bottom_attach>14</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>False</xexpand>
@@ -3387,8 +3387,8 @@
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>1</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>13</bottom_attach>
+	    <top_attach>14</top_attach>
+	    <bottom_attach>15</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>False</xexpand>
@@ -3413,8 +3413,8 @@
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>1</right_attach>
-	    <top_attach>13</top_attach>
-	    <bottom_attach>14</bottom_attach>
+	    <top_attach>15</top_attach>
+	    <bottom_attach>16</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>False</xexpand>
@@ -3439,8 +3439,8 @@
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>1</right_attach>
-	    <top_attach>14</top_attach>
-	    <bottom_attach>15</bottom_attach>
+	    <top_attach>16</top_attach>
+	    <bottom_attach>17</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>False</xexpand>
@@ -3465,8 +3465,8 @@
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>1</right_attach>
-	    <top_attach>15</top_attach>
-	    <bottom_attach>16</bottom_attach>
+	    <top_attach>17</top_attach>
+	    <bottom_attach>18</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>False</xexpand>
@@ -3491,8 +3491,8 @@
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>1</right_attach>
-	    <top_attach>16</top_attach>
-	    <bottom_attach>17</bottom_attach>
+	    <top_attach>18</top_attach>
+	    <bottom_attach>19</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>False</xexpand>
@@ -3512,8 +3512,8 @@
 	  <child>
 	    <left_attach>1</left_attach>
 	    <right_attach>2</right_attach>
-	    <top_attach>10</top_attach>
-	    <bottom_attach>11</bottom_attach>
+	    <top_attach>12</top_attach>
+	    <bottom_attach>13</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>False</xexpand>
@@ -3563,8 +3563,8 @@
 	  <child>
 	    <left_attach>1</left_attach>
 	    <right_attach>2</right_attach>
-	    <top_attach>9</top_attach>
-	    <bottom_attach>10</bottom_attach>
+	    <top_attach>11</top_attach>
+	    <bottom_attach>12</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>False</xexpand>
@@ -3716,8 +3716,8 @@
 	  <child>
 	    <left_attach>1</left_attach>
 	    <right_attach>2</right_attach>
-	    <top_attach>11</top_attach>
-	    <bottom_attach>12</bottom_attach>
+	    <top_attach>13</top_attach>
+	    <bottom_attach>14</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>False</xexpand>
@@ -3767,8 +3767,8 @@
 	  <child>
 	    <left_attach>1</left_attach>
 	    <right_attach>2</right_attach>
-	    <top_attach>14</top_attach>
-	    <bottom_attach>15</bottom_attach>
+	    <top_attach>16</top_attach>
+	    <bottom_attach>17</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>False</xexpand>
@@ -3818,8 +3818,8 @@
 	  <child>
 	    <left_attach>1</left_attach>
 	    <right_attach>2</right_attach>
-	    <top_attach>16</top_attach>
-	    <bottom_attach>17</bottom_attach>
+	    <top_attach>18</top_attach>
+	    <bottom_attach>19</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>False</xexpand>
@@ -3871,8 +3871,8 @@
 	  <child>
 	    <left_attach>1</left_attach>
 	    <right_attach>2</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>13</bottom_attach>
+	    <top_attach>14</top_attach>
+	    <bottom_attach>15</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>False</xexpand>
@@ -3931,8 +3931,8 @@
 	  <child>
 	    <left_attach>1</left_attach>
 	    <right_attach>2</right_attach>
-	    <top_attach>13</top_attach>
-	    <bottom_attach>14</bottom_attach>
+	    <top_attach>15</top_attach>
+	    <bottom_attach>16</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>True</xexpand>
@@ -3963,8 +3963,8 @@
 	  <child>
 	    <left_attach>1</left_attach>
 	    <right_attach>2</right_attach>
-	    <top_attach>15</top_attach>
-	    <bottom_attach>16</bottom_attach>
+	    <top_attach>17</top_attach>
+	    <bottom_attach>18</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>True</xexpand>
@@ -4080,6 +4080,160 @@
 	    <xfill>True</xfill>
 	    <yfill>True</yfill>
 	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkLabel</class>
+	  <name>RESTRICT_BOMB_LABEL</name>
+	  <label>Disallow bombing out of T-Mode:</label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>1</xalign>
+	  <yalign>0.5</yalign>
+	  <xpad>10</xpad>
+	  <ypad>0</ypad>
+	  <child>
+	    <left_attach>0</left_attach>
+	    <right_attach>1</right_attach>
+	    <top_attach>9</top_attach>
+	    <bottom_attach>10</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkLabel</class>
+	  <name>NO_UNWARRING_BOMBING_LABEL</name>
+	  <label>Disallow 3rd space bombing:</label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>1</xalign>
+	  <yalign>0.5</yalign>
+	  <xpad>10</xpad>
+	  <ypad>0</ypad>
+	  <child>
+	    <left_attach>0</left_attach>
+	    <right_attach>1</right_attach>
+	    <top_attach>10</top_attach>
+	    <bottom_attach>11</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkHBox</class>
+	  <name>hbox57</name>
+	  <homogeneous>False</homogeneous>
+	  <spacing>0</spacing>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>9</top_attach>
+	    <bottom_attach>10</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>True</yfill>
+	  </child>
+
+	  <widget>
+	    <class>GtkRadioButton</class>
+	    <name>RESTRICT_BOMB_0</name>
+	    <can_focus>True</can_focus>
+	    <label>No</label>
+	    <active>False</active>
+	    <draw_indicator>True</draw_indicator>
+	    <group>RESTRICT_BOMB</group>
+	    <child>
+	      <padding>0</padding>
+	      <expand>False</expand>
+	      <fill>False</fill>
+	    </child>
+	  </widget>
+
+	  <widget>
+	    <class>GtkRadioButton</class>
+	    <name>RESTRICT_BOMB_1</name>
+	    <can_focus>True</can_focus>
+	    <label>Yes</label>
+	    <active>False</active>
+	    <draw_indicator>True</draw_indicator>
+	    <group>RESTRICT_BOMB</group>
+	    <child>
+	      <padding>0</padding>
+	      <expand>False</expand>
+	      <fill>False</fill>
+	    </child>
+	  </widget>
+	</widget>
+
+	<widget>
+	  <class>GtkHBox</class>
+	  <name>hbox58</name>
+	  <homogeneous>False</homogeneous>
+	  <spacing>0</spacing>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>10</top_attach>
+	    <bottom_attach>11</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>True</yfill>
+	  </child>
+
+	  <widget>
+	    <class>GtkRadioButton</class>
+	    <name>NO_UNWARRING_BOMBING_0</name>
+	    <can_focus>True</can_focus>
+	    <label>No</label>
+	    <active>False</active>
+	    <draw_indicator>True</draw_indicator>
+	    <group>NO_UNWARRING_BOMBING</group>
+	    <child>
+	      <padding>0</padding>
+	      <expand>False</expand>
+	      <fill>False</fill>
+	    </child>
+	  </widget>
+
+	  <widget>
+	    <class>GtkRadioButton</class>
+	    <name>NO_UNWARRING_BOMBING_1</name>
+	    <can_focus>True</can_focus>
+	    <label>Yes</label>
+	    <active>False</active>
+	    <draw_indicator>True</draw_indicator>
+	    <group>NO_UNWARRING_BOMBING</group>
+	    <child>
+	      <padding>0</padding>
+	      <expand>False</expand>
+	      <fill>False</fill>
+	    </child>
+	  </widget>
 	</widget>
       </widget>
 
Index: Vanilla/gum/main.c
diff -u Vanilla/gum/main.c:1.10 Vanilla/gum/main.c:1.11
--- Vanilla/gum/main.c:1.10	Tue May  8 06:48:53 2001
+++ Vanilla/gum/main.c	Thu May 10 20:45:59 2001
@@ -246,6 +246,16 @@
   GtkWidget *SBRANK_LABEL;
   GtkWidget *SBPLANETS_LABEL;
   GtkWidget *SBPLANETS;
+  GtkWidget *RESTRICT_BOMB_LABEL;
+  GtkWidget *NO_UNWARRING_BOMBING_LABEL;
+  GtkWidget *hbox57;
+  GSList *RESTRICT_BOMB_group = NULL;
+  GtkWidget *RESTRICT_BOMB_0;
+  GtkWidget *RESTRICT_BOMB_1;
+  GtkWidget *hbox58;
+  GSList *NO_UNWARRING_BOMBING_group = NULL;
+  GtkWidget *NO_UNWARRING_BOMBING_0;
+  GtkWidget *NO_UNWARRING_BOMBING_1;
   GtkWidget *label6;
   GtkWidget *table2;
   GtkWidget *label70;
@@ -1731,7 +1741,7 @@
   gtk_widget_show (label133);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 2), label133);
 
-  table4 = gtk_table_new (18, 2, FALSE);
+  table4 = gtk_table_new (20, 2, FALSE);
   gtk_widget_ref (table4);
   gtk_object_set_data_full (GTK_OBJECT (gum), "table4", table4,
                             (GtkDestroyNotify) gtk_widget_unref);
@@ -1903,7 +1913,7 @@
   gtk_object_set_data_full (GTK_OBJECT (gum), "label91", label91,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (label91);
-  gtk_table_attach (GTK_TABLE (table4), label91, 0, 2, 17, 18,
+  gtk_table_attach (GTK_TABLE (table4), label91, 0, 2, 19, 20,
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
 
@@ -1978,7 +1988,7 @@
   gtk_object_set_data_full (GTK_OBJECT (gum), "NODIAG_LABEL", NODIAG_LABEL,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (NODIAG_LABEL);
-  gtk_table_attach (GTK_TABLE (table4), NODIAG_LABEL, 0, 1, 9, 10,
+  gtk_table_attach (GTK_TABLE (table4), NODIAG_LABEL, 0, 1, 11, 12,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (GTK_FILL), 0, 0);
   gtk_misc_set_alignment (GTK_MISC (NODIAG_LABEL), 1, 0.5);
@@ -1989,7 +1999,7 @@
   gtk_object_set_data_full (GTK_OBJECT (gum), "TOPGUN_LABEL", TOPGUN_LABEL,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (TOPGUN_LABEL);
-  gtk_table_attach (GTK_TABLE (table4), TOPGUN_LABEL, 0, 1, 10, 11,
+  gtk_table_attach (GTK_TABLE (table4), TOPGUN_LABEL, 0, 1, 12, 13,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (GTK_FILL), 0, 0);
   gtk_misc_set_alignment (GTK_MISC (TOPGUN_LABEL), 1, 0.5);
@@ -2000,7 +2010,7 @@
   gtk_object_set_data_full (GTK_OBJECT (gum), "NEWTURN_LABEL", NEWTURN_LABEL,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (NEWTURN_LABEL);
-  gtk_table_attach (GTK_TABLE (table4), NEWTURN_LABEL, 0, 1, 11, 12,
+  gtk_table_attach (GTK_TABLE (table4), NEWTURN_LABEL, 0, 1, 13, 14,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (GTK_FILL), 0, 0);
   gtk_misc_set_alignment (GTK_MISC (NEWTURN_LABEL), 1, 0.5);
@@ -2011,7 +2021,7 @@
   gtk_object_set_data_full (GTK_OBJECT (gum), "HIDDEN_LABEL", HIDDEN_LABEL,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (HIDDEN_LABEL);
-  gtk_table_attach (GTK_TABLE (table4), HIDDEN_LABEL, 0, 1, 12, 13,
+  gtk_table_attach (GTK_TABLE (table4), HIDDEN_LABEL, 0, 1, 14, 15,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (GTK_FILL), 0, 0);
   gtk_misc_set_alignment (GTK_MISC (HIDDEN_LABEL), 1, 0.5);
@@ -2022,7 +2032,7 @@
   gtk_object_set_data_full (GTK_OBJECT (gum), "SURRSTART_LABEL", SURRSTART_LABEL,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (SURRSTART_LABEL);
-  gtk_table_attach (GTK_TABLE (table4), SURRSTART_LABEL, 0, 1, 13, 14,
+  gtk_table_attach (GTK_TABLE (table4), SURRSTART_LABEL, 0, 1, 15, 16,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (GTK_FILL), 0, 0);
   gtk_misc_set_alignment (GTK_MISC (SURRSTART_LABEL), 1, 0.5);
@@ -2033,7 +2043,7 @@
   gtk_object_set_data_full (GTK_OBJECT (gum), "TRANSWARP_LABEL", TRANSWARP_LABEL,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (TRANSWARP_LABEL);
-  gtk_table_attach (GTK_TABLE (table4), TRANSWARP_LABEL, 0, 1, 14, 15,
+  gtk_table_attach (GTK_TABLE (table4), TRANSWARP_LABEL, 0, 1, 16, 17,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (GTK_FILL), 0, 0);
   gtk_misc_set_alignment (GTK_MISC (TRANSWARP_LABEL), 1, 0.5);
@@ -2044,7 +2054,7 @@
   gtk_object_set_data_full (GTK_OBJECT (gum), "WARPSPEED_LABEL", WARPSPEED_LABEL,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (WARPSPEED_LABEL);
-  gtk_table_attach (GTK_TABLE (table4), WARPSPEED_LABEL, 0, 1, 15, 16,
+  gtk_table_attach (GTK_TABLE (table4), WARPSPEED_LABEL, 0, 1, 17, 18,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (GTK_FILL), 0, 0);
   gtk_misc_set_alignment (GTK_MISC (WARPSPEED_LABEL), 1, 0.5);
@@ -2055,7 +2065,7 @@
   gtk_object_set_data_full (GTK_OBJECT (gum), "VECTOR_LABEL", VECTOR_LABEL,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (VECTOR_LABEL);
-  gtk_table_attach (GTK_TABLE (table4), VECTOR_LABEL, 0, 1, 16, 17,
+  gtk_table_attach (GTK_TABLE (table4), VECTOR_LABEL, 0, 1, 18, 19,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (GTK_FILL), 0, 0);
   gtk_misc_set_alignment (GTK_MISC (VECTOR_LABEL), 1, 0.5);
@@ -2066,7 +2076,7 @@
   gtk_object_set_data_full (GTK_OBJECT (gum), "hbox29", hbox29,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (hbox29);
-  gtk_table_attach (GTK_TABLE (table4), hbox29, 1, 2, 10, 11,
+  gtk_table_attach (GTK_TABLE (table4), hbox29, 1, 2, 12, 13,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (GTK_FILL), 0, 0);
 
@@ -2091,7 +2101,7 @@
   gtk_object_set_data_full (GTK_OBJECT (gum), "hbox28", hbox28,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (hbox28);
-  gtk_table_attach (GTK_TABLE (table4), hbox28, 1, 2, 9, 10,
+  gtk_table_attach (GTK_TABLE (table4), hbox28, 1, 2, 11, 12,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (GTK_FILL), 0, 0);
 
@@ -2166,7 +2176,7 @@
   gtk_object_set_data_full (GTK_OBJECT (gum), "hbox30", hbox30,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (hbox30);
-  gtk_table_attach (GTK_TABLE (table4), hbox30, 1, 2, 11, 12,
+  gtk_table_attach (GTK_TABLE (table4), hbox30, 1, 2, 13, 14,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (GTK_FILL), 0, 0);
 
@@ -2191,7 +2201,7 @@
   gtk_object_set_data_full (GTK_OBJECT (gum), "hbox31", hbox31,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (hbox31);
-  gtk_table_attach (GTK_TABLE (table4), hbox31, 1, 2, 14, 15,
+  gtk_table_attach (GTK_TABLE (table4), hbox31, 1, 2, 16, 17,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (GTK_FILL), 0, 0);
 
@@ -2216,7 +2226,7 @@
   gtk_object_set_data_full (GTK_OBJECT (gum), "hbox32", hbox32,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (hbox32);
-  gtk_table_attach (GTK_TABLE (table4), hbox32, 1, 2, 16, 17,
+  gtk_table_attach (GTK_TABLE (table4), hbox32, 1, 2, 18, 19,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (GTK_FILL), 0, 0);
 
@@ -2243,7 +2253,7 @@
   gtk_object_set_data_full (GTK_OBJECT (gum), "hbox10", hbox10,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (hbox10);
-  gtk_table_attach (GTK_TABLE (table4), hbox10, 1, 2, 12, 13,
+  gtk_table_attach (GTK_TABLE (table4), hbox10, 1, 2, 14, 15,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (GTK_FILL), 0, 0);
 
@@ -2269,7 +2279,7 @@
   gtk_object_set_data_full (GTK_OBJECT (gum), "SURRSTART", SURRSTART,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (SURRSTART);
-  gtk_table_attach (GTK_TABLE (table4), SURRSTART, 1, 2, 13, 14,
+  gtk_table_attach (GTK_TABLE (table4), SURRSTART, 1, 2, 15, 16,
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
   gtk_scale_set_digits (GTK_SCALE (SURRSTART), 0);
@@ -2280,7 +2290,7 @@
   gtk_object_set_data_full (GTK_OBJECT (gum), "WARPSPEED", WARPSPEED,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (WARPSPEED);
-  gtk_table_attach (GTK_TABLE (table4), WARPSPEED, 1, 2, 15, 16,
+  gtk_table_attach (GTK_TABLE (table4), WARPSPEED, 1, 2, 17, 18,
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
   gtk_spin_button_set_snap_to_ticks (GTK_SPIN_BUTTON (WARPSPEED), TRUE);
@@ -2326,6 +2336,78 @@
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (GTK_FILL), 0, 0);
   gtk_scale_set_digits (GTK_SCALE (SBPLANETS), 0);
+
+  RESTRICT_BOMB_LABEL = gtk_label_new ("Disallow bombing out of T-Mode:");
+  gtk_widget_ref (RESTRICT_BOMB_LABEL);
+  gtk_object_set_data_full (GTK_OBJECT (gum), "RESTRICT_BOMB_LABEL", RESTRICT_BOMB_LABEL,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (RESTRICT_BOMB_LABEL);
+  gtk_table_attach (GTK_TABLE (table4), RESTRICT_BOMB_LABEL, 0, 1, 9, 10,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_misc_set_alignment (GTK_MISC (RESTRICT_BOMB_LABEL), 1, 0.5);
+  gtk_misc_set_padding (GTK_MISC (RESTRICT_BOMB_LABEL), 10, 0);
+
+  NO_UNWARRING_BOMBING_LABEL = gtk_label_new ("Disallow 3rd space bombing:");
+  gtk_widget_ref (NO_UNWARRING_BOMBING_LABEL);
+  gtk_object_set_data_full (GTK_OBJECT (gum), "NO_UNWARRING_BOMBING_LABEL", NO_UNWARRING_BOMBING_LABEL,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (NO_UNWARRING_BOMBING_LABEL);
+  gtk_table_attach (GTK_TABLE (table4), NO_UNWARRING_BOMBING_LABEL, 0, 1, 10, 11,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_misc_set_alignment (GTK_MISC (NO_UNWARRING_BOMBING_LABEL), 1, 0.5);
+  gtk_misc_set_padding (GTK_MISC (NO_UNWARRING_BOMBING_LABEL), 10, 0);
+
+  hbox57 = gtk_hbox_new (FALSE, 0);
+  gtk_widget_ref (hbox57);
+  gtk_object_set_data_full (GTK_OBJECT (gum), "hbox57", hbox57,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (hbox57);
+  gtk_table_attach (GTK_TABLE (table4), hbox57, 1, 2, 9, 10,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (GTK_FILL), 0, 0);
+
+  RESTRICT_BOMB_0 = gtk_radio_button_new_with_label (RESTRICT_BOMB_group, "No");
+  RESTRICT_BOMB_group = gtk_radio_button_group (GTK_RADIO_BUTTON (RESTRICT_BOMB_0));
+  gtk_widget_ref (RESTRICT_BOMB_0);
+  gtk_object_set_data_full (GTK_OBJECT (gum), "RESTRICT_BOMB_0", RESTRICT_BOMB_0,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (RESTRICT_BOMB_0);
+  gtk_box_pack_start (GTK_BOX (hbox57), RESTRICT_BOMB_0, FALSE, FALSE, 0);
+
+  RESTRICT_BOMB_1 = gtk_radio_button_new_with_label (RESTRICT_BOMB_group, "Yes");
+  RESTRICT_BOMB_group = gtk_radio_button_group (GTK_RADIO_BUTTON (RESTRICT_BOMB_1));
+  gtk_widget_ref (RESTRICT_BOMB_1);
+  gtk_object_set_data_full (GTK_OBJECT (gum), "RESTRICT_BOMB_1", RESTRICT_BOMB_1,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (RESTRICT_BOMB_1);
+  gtk_box_pack_start (GTK_BOX (hbox57), RESTRICT_BOMB_1, FALSE, FALSE, 0);
+
+  hbox58 = gtk_hbox_new (FALSE, 0);
+  gtk_widget_ref (hbox58);
+  gtk_object_set_data_full (GTK_OBJECT (gum), "hbox58", hbox58,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (hbox58);
+  gtk_table_attach (GTK_TABLE (table4), hbox58, 1, 2, 10, 11,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (GTK_FILL), 0, 0);
+
+  NO_UNWARRING_BOMBING_0 = gtk_radio_button_new_with_label (NO_UNWARRING_BOMBING_group, "No");
+  NO_UNWARRING_BOMBING_group = gtk_radio_button_group (GTK_RADIO_BUTTON (NO_UNWARRING_BOMBING_0));
+  gtk_widget_ref (NO_UNWARRING_BOMBING_0);
+  gtk_object_set_data_full (GTK_OBJECT (gum), "NO_UNWARRING_BOMBING_0", NO_UNWARRING_BOMBING_0,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (NO_UNWARRING_BOMBING_0);
+  gtk_box_pack_start (GTK_BOX (hbox58), NO_UNWARRING_BOMBING_0, FALSE, FALSE, 0);
+
+  NO_UNWARRING_BOMBING_1 = gtk_radio_button_new_with_label (NO_UNWARRING_BOMBING_group, "Yes");
+  NO_UNWARRING_BOMBING_group = gtk_radio_button_group (GTK_RADIO_BUTTON (NO_UNWARRING_BOMBING_1));
+  gtk_widget_ref (NO_UNWARRING_BOMBING_1);
+  gtk_object_set_data_full (GTK_OBJECT (gum), "NO_UNWARRING_BOMBING_1", NO_UNWARRING_BOMBING_1,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (NO_UNWARRING_BOMBING_1);
+  gtk_box_pack_start (GTK_BOX (hbox58), NO_UNWARRING_BOMBING_1, FALSE, FALSE, 0);
 
   label6 = gtk_label_new ("Style");
   gtk_widget_ref (label6);