From b2d4da16533cccd04a499d32961f1af9929f7f9f Mon Sep 17 00:00:00 2001
From: dnk-88 <none@none>
Date: Sun, 3 Jul 2011 17:12:31 +0300
Subject: [PATCH] Fixed: #1301 Fixed build landscape plugin under linux.

--HG--
branch : gsoc2011-worldeditorqt
---
 code/nel/src/ligo/zone_bank.cpp                     | 13 +++++++------
 .../src/plugins/landscape_editor/builder_zone.cpp   |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/code/nel/src/ligo/zone_bank.cpp b/code/nel/src/ligo/zone_bank.cpp
index 5f03c4bb5..a79b98449 100644
--- a/code/nel/src/ligo/zone_bank.cpp
+++ b/code/nel/src/ligo/zone_bank.cpp
@@ -19,14 +19,15 @@
 
 #include "nel/ligo/zone_bank.h"
 
-#ifdef NL_OS_WINDOWS
-
 #include "nel/misc/debug.h"
 #include "nel/misc/file.h"
 #include "nel/misc/i_xml.h"
 #include "nel/misc/o_xml.h"
+
+#ifdef NL_OS_WINDOWS
 #define NOMINMAX
 #include <windows.h>
+#endif // NL_OS_WINDOWS
 
 using namespace std;
 using namespace NLMISC;
@@ -496,8 +497,9 @@ void CZoneBank::reset ()
 	_Selection.clear ();
 }
 
+#ifdef NL_OS_WINDOWS
 // ---------------------------------------------------------------------------
-bool CZoneBank::initFromPath(const string &sPathName, std::string &error)
+bool CZoneBank::initFromPath(const std::string &sPathName, std::string &error)
 {
 	char sDirBackup[512];
 	GetCurrentDirectory (512, sDirBackup);
@@ -520,6 +522,7 @@ bool CZoneBank::initFromPath(const string &sPathName, std::string &error)
 	SetCurrentDirectory (sDirBackup);
 	return true;
 }
+#endif // NL_OS_WINDOWS
 
 // ---------------------------------------------------------------------------
 bool CZoneBank::addElement (const std::string &elementName, std::string &error)
@@ -694,6 +697,4 @@ void CZoneBank::getSelection (std::vector<CZoneBankElement*> &SelectedElements)
 
 // ***************************************************************************
 
-} // namespace NLLIGO
-
-#endif // NL_OS_WINDOWS
+} // namespace NLLIGO
\ No newline at end of file
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/builder_zone.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/builder_zone.cpp
index 0e00d72be..21ab1118b 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/builder_zone.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/builder_zone.cpp
@@ -78,7 +78,7 @@ bool PixmapDatabase::loadPixmaps(const QString &zonePath, NLLIGO::CZoneBank &zon
 			m_pixmapMap.insert(zonePixmapName, pixmap);
 	}
 
-	QPixmap *pixmap = new QPixmap(zonePath + "_UNUSED_.png");
+	QPixmap *pixmap = new QPixmap(zonePath + "_unused_.png");
 	QPixmap *scaledPixmap = new QPixmap(pixmap->scaled(m_textureSize, m_textureSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
 	delete pixmap;
 	m_pixmapMap.insert(QString(STRING_UNUSED), scaledPixmap);