From 4eb5879d0447bc2a2eb22eae96159253e1dc4558 Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Sat, 5 Mar 2011 23:15:07 +0000
Subject: [PATCH] - bugfix for ultifd, screenshots now save even when loading
 from open with

---
 source/g3d_viewer/main.cpp | 27 +++++++++++++++++++++++----
 source/g3d_viewer/main.h   |  5 ++++-
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/source/g3d_viewer/main.cpp b/source/g3d_viewer/main.cpp
index 55de91ad..d2d497a9 100644
--- a/source/g3d_viewer/main.cpp
+++ b/source/g3d_viewer/main.cpp
@@ -186,11 +186,13 @@ MainWindow::MainWindow(	std::pair<string,vector<string> > unitToLoad,
 						const string splashParticlePath,
 						float defaultAnimation,
 						int defaultParticleLoopStart,
-						float defaultZoom,float defaultXRot, float defaultYRot)
+						float defaultZoom,float defaultXRot, float defaultYRot,
+						string appPath)
     :	wxFrame(NULL, -1, ToUnicode(winHeader),
     	        wxPoint(Renderer::windowX, Renderer::windowY),
 		        wxSize(Renderer::windowW, Renderer::windowH)), model(NULL), glCanvas(NULL), renderer(NULL), initTextureManager(true), timer(NULL)
 {
+	this->appPath = appPath;
     //getGlPlatformExtensions();
 	int args[] = { WX_GL_RGBA, WX_GL_DOUBLEBUFFER,  WX_GL_MIN_ALPHA,  8  }; // to prevent flicker
 	glCanvas = new GlCanvas(this, args);
@@ -714,14 +716,22 @@ void MainWindow::saveScreenshot() {
 			}
 	    }
 	    else {
-			string path = "screens/";
+			string screenShotsPath = extractDirectoryPathFromFile(appPath) + string("screens/");
+
+			printf("screenShotsPath [%s]\n",screenShotsPath.c_str());
+
+	        if(isdir(screenShotsPath.c_str()) == false) {
+	        	createDirectoryPaths(screenShotsPath);
+	        }
+
+			string path = screenShotsPath;
 			if(isdir(path.c_str()) == true) {
 				//Config &config= Config::getInstance();
 				//string fileFormat = config.getString("ScreenShotFileType","png");
 				string fileFormat = "png";
 
 				for(int i=0; i < 1000; ++i) {
-					path = "screens/";
+					path = screenShotsPath;
 					path += string("screen") + intToStr(i) + string(".") + fileFormat;
 					FILE *f= fopen(path.c_str(), "rb");
 					if(f == NULL) {
@@ -1987,6 +1997,14 @@ bool App::OnInit(){
 
 	}
 
+	string appPath = "";
+#if defined(__MINGW32__)
+		const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(wxFNCONV(argv[0]));
+		appPath = tmp_buf;
+#else
+		appPath = wxFNCONV(argv[0]);
+#endif
+
 	mainWindow= new MainWindow(	unitToLoad,
 								modelPath,
 								particlePath,
@@ -1996,7 +2014,8 @@ bool App::OnInit(){
 								newParticleLoopValue,
 								newZoomValue,
 								newXRotValue,
-								newYRotValue);
+								newYRotValue,
+								appPath);
 	mainWindow->Show();
 	mainWindow->init();
 	mainWindow->Update();
diff --git a/source/g3d_viewer/main.h b/source/g3d_viewer/main.h
index 2726b8a3..761fa18a 100644
--- a/source/g3d_viewer/main.h
+++ b/source/g3d_viewer/main.h
@@ -104,6 +104,8 @@ private:
 
 	bool isControlKeyPressed;
 
+	string appPath;
+
 	void loadUnit(string path, string skillName);
 	void loadModel(string path);
 	void loadParticle(string path);
@@ -117,7 +119,8 @@ public:
 				const string modelPath,const string particlePath,
 				const string projectileParticlePath,const string splashParticlePath,
 				float defaultAnimation,int defaultParticleLoopStart,
-				float defaultZoom,float defaultXRot, float defaultYRot);
+				float defaultZoom,float defaultXRot, float defaultYRot,
+				string appPath);
 	~MainWindow();
 	void init();