Updated readme and now remembers prewviously set warcraft directory

stijnherfst · Jun 11, 2018 · 4af9183 · 4af9183
1 parent 6b9d3c6
commit 4af9183
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/HiveWE/GLWidget.cpp b/HiveWE/GLWidget.cpp
@@ -44,9 +44,6 @@ void APIENTRY gl_debug_output(const GLenum source, const GLenum type, const GLui
 }
 
 GLWidget::GLWidget(QWidget* parent) : QOpenGLWidget(parent) {
-	//connect(&timer, &QTimer::timeout, this, &GLWidget::update_scene);
-	//timer.start(15);
-
 	QTimer::singleShot(16, this, &GLWidget::update_scene);
 
 	camera = &tps_camera;
@@ -77,7 +74,6 @@ void GLWidget::initializeGL() {
 	shapes.init();
 
 	map.load(L"Data/Test.w3x");
-	new TerrainPalette(this);
 }
 
 void GLWidget::resizeGL(const int w, const int h) {

diff --git a/HiveWE/HiveWE.cpp b/HiveWE/HiveWE.cpp
@@ -7,6 +7,8 @@ HiveWE::HiveWE(QWidget* parent) : QMainWindow(parent) {
 	while (!fs::exists(directory / "War3x.mpq")) {
 		directory = QFileDialog::getExistingDirectory(this, "Select Warcraft Directory", "/home", QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks).toStdWString();
 	}
+	QSettings settings;
+	settings.setValue("warcraftDirectory", QString::fromStdString(directory.string()));
 	hierarchy.warcraft_directory = directory;
 	hierarchy.init();
 

diff --git a/HiveWE/Utilities.cpp b/HiveWE/Utilities.cpp
@@ -89,12 +89,15 @@ std::string read_text_file(const std::string& path) {
 }
 
 fs::path find_warcraft_directory() {
-	if (fs::exists(L"C:/Program Files (x86)/Warcraft III/War3x.mpq")) {
-		return L"C:/Program Files (x86)/Warcraft III/";
-	} else if (fs::exists(L"D:/Program Files (x86)/Warcraft III/War3x.mpq")) {
-		return L"D:/Program Files (x86)/Warcraft III/";
+	QSettings settings;
+	if (settings.contains("warcraftDirectory")) {
+		return settings.value("warcraftDirectory").toString().toStdString();
+	} else if (fs::exists("C:/Program Files (x86)/Warcraft III/War3x.mpq")) {
+		return "C:/Program Files (x86)/Warcraft III/";
+	} else if (fs::exists("D:/Program Files (x86)/Warcraft III/War3x.mpq")) {
+		return "D:/Program Files (x86)/Warcraft III/";
 	} else {
-		return L"";
+		return "";
 	}
 }
 

diff --git a/README.md b/README.md
@@ -1,13 +1,23 @@
 # HiveWE
 A Warcraft III world editor. [Thread on Hive](https://www.hiveworkshop.com/threads/introducing-hivewe.303183/)
 
-![HiveWE Screenshot](http://g2f.nl/0scv6qu)
+![HiveWE Screenshot](http://g2f.nl/0egc6n4)
+
+
 
 ## Features
 
 - Directly edit the pathing map  
+![Edit the Pathing Map](http://g2f.nl/046bx1s)
 - Fly around with a First Person camera
-- Edit the tileset
+![Fly around the Map](http://g2f.nl/018g8ym)
+- Edit the terrain
+![Edit the Terrain](http://g2f.nl/0q18ikj)
+- Manage your imports with folders!
+![Manage imports](http://g2f.nl/0j59f6v)
+- Edit global tile pathing  
+![Edit global tile pathing](http://g2f.nl/0ihyqgo)
+
 
 ## Build Instructions