Added support for patrols and platforms.

3 files changed, 42 insertions, 11 deletions

diff --git a/INSTALL b/INSTALL
index 7d1c323..007e939 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -226,6 +226,11 @@ order to use an ANSI C compiler:
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
@@ -304,9 +309,10 @@ causes the specified `gcc' to be used as the C compiler (unless it is
 overridden in the site shell script).
 
 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
 
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
@@ -362,4 +368,3 @@ operates.
 
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
-
diff --git a/src/editorwindow.cc b/src/editorwindow.cc
index 88ed470..f08cc2c 100644
--- a/src/editorwindow.cc
+++ b/src/editorwindow.cc
@@ -72,39 +72,45 @@ bool EditorWindow::loadFile(const QString &filename)
 		
 		if (ini.got_section()) {
 			
-			//qDebug() << "got section" << ini.section();
-			in_subsection = false;
-			
 			if (ini.got_section("zone")) {
 				editorwindow_zoneproperties.set_comment(ini.comment());
 				in_entity = false;
 				
 			} else if (ini.got_section("entity")) {
 				in_entity = true;
+				in_subsection = false;
 				
 			} else if (ini.got_section("jumpgate")) {
 				in_entity = true;
+				in_subsection = false;
 				
 			} else if (ini.got_section("jumppoint")) {
 				in_entity = true;
+				in_subsection = false;
 				
 			} else if (ini.got_section("navpoint")) {
 				in_entity = true;
+				in_subsection = false;
 				
 			} else if (ini.got_section("station")) {
 				in_entity = true;
+				in_subsection = false;
 				
 			} else if (ini.got_section("star")) {
 				in_entity = true;
+				in_subsection = false;
 				
 			} else if (ini.got_section("planet")) {
 				in_entity = true;
+				in_subsection = false;
 				
 			} else if (ini.got_section("racetrack")) {
 				in_entity = true;
+				in_subsection = false;
 				
 			} else if (ini.got_section("checkpoint")) {
 				in_entity = true;
+				in_subsection = false;
 				
 			} else if (ini.got_section("cargo")) {
 				in_entity = false;
@@ -117,10 +123,27 @@ bool EditorWindow::loadFile(const QString &filename)
 			} else if (ini.got_section("weapon")) {
 				in_entity = false;
 				in_subsection = true;
+			
+			} else if (ini.got_section("platform")) {
+				in_entity = true;
+				in_subsection = false;
+			
+			} else if (ini.got_section("patrol")) {
+				in_entity = true;
+				in_subsection = false;
+				
+			} else if (ini.got_section("waypoint")) {
+				in_entity = false;
+				in_subsection = true;
+				
+			} else if (ini.got_section("npc")) {
+				in_entity = false;
+				in_subsection = true;
 				
 			} else {
 				entity = 0;
 				in_entity = false;
+				in_subsection = false;
 			}
 			
 			if (in_entity) {
diff --git a/src/sidebar.cc b/src/sidebar.cc
index 3093fc1..aced7bd 100644
--- a/src/sidebar.cc
+++ b/src/sidebar.cc
@@ -47,12 +47,15 @@ SideBar::SideBar(QWidget *parent) : QWidget(parent)
 	// TODO this should probably be read from entities.ini
 	// note that EditorWindow::loadFile should use the same list
 	combo_entitytype->addItem(tr("entity"));
-	combo_entitytype->addItem(tr("planet"));
-	combo_entitytype->addItem(tr("station"));
-	combo_entitytype->addItem(tr("star"));
 	combo_entitytype->addItem(tr("jumpgate"));
 	combo_entitytype->addItem(tr("jumppoint"));
 	combo_entitytype->addItem(tr("navpoint"));
+	combo_entitytype->addItem(tr("patrol"));
+	combo_entitytype->addItem(tr("platform"));
+	combo_entitytype->addItem(tr("planet"));
+	combo_entitytype->addItem(tr("station"));
+	combo_entitytype->addItem(tr("star"));
+	
 	combo_entitytype->setEditable(true);
 	
 	box_entitytype->addWidget(label_entitytype);