From 245b8b6bee6eb3874e3fd37c29cbd531233076cc Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 25 Sep 2010 16:18:15 +0200 Subject: [PATCH] Fixed: tile_edit compilation --- code/nel/tools/3d/tile_edit/DllEntry.cpp | 1 - code/nel/tools/3d/tile_edit/Popup.cpp | 1 - code/nel/tools/3d/tile_edit/TileCtrl.cpp | 1 - code/nel/tools/3d/tile_edit/TileCtrl.h | 4 +--- code/nel/tools/3d/tile_edit/TileList.cpp | 2 +- code/nel/tools/3d/tile_edit/TileView.cpp | 6 +++--- code/nel/tools/3d/tile_edit/cpu.cpp | 1 - 7 files changed, 5 insertions(+), 11 deletions(-) diff --git a/code/nel/tools/3d/tile_edit/DllEntry.cpp b/code/nel/tools/3d/tile_edit/DllEntry.cpp index b07ac0727..bb530641e 100644 --- a/code/nel/tools/3d/tile_edit/DllEntry.cpp +++ b/code/nel/tools/3d/tile_edit/DllEntry.cpp @@ -15,7 +15,6 @@ // along with this program. If not, see . #include "stdafx.h" -#include "tile_edit.h" extern ClassDesc2* GetTile_editDesc(); diff --git a/code/nel/tools/3d/tile_edit/Popup.cpp b/code/nel/tools/3d/tile_edit/Popup.cpp index c7caa67b4..18b34f500 100644 --- a/code/nel/tools/3d/tile_edit/Popup.cpp +++ b/code/nel/tools/3d/tile_edit/Popup.cpp @@ -15,7 +15,6 @@ // along with this program. If not, see . #include "stdafx.h" -#include "tile_edit.h" #include "Popup.h" #ifdef _DEBUG diff --git a/code/nel/tools/3d/tile_edit/TileCtrl.cpp b/code/nel/tools/3d/tile_edit/TileCtrl.cpp index 141d04c1d..00603dcd6 100644 --- a/code/nel/tools/3d/tile_edit/TileCtrl.cpp +++ b/code/nel/tools/3d/tile_edit/TileCtrl.cpp @@ -15,7 +15,6 @@ // along with this program. If not, see . #include "stdafx.h" -#include "tile_edit.h" #include "TileCtrl.h" #include "browse.h" diff --git a/code/nel/tools/3d/tile_edit/TileCtrl.h b/code/nel/tools/3d/tile_edit/TileCtrl.h index 7bc8f7e06..941bb5290 100644 --- a/code/nel/tools/3d/tile_edit/TileCtrl.h +++ b/code/nel/tools/3d/tile_edit/TileCtrl.h @@ -59,9 +59,7 @@ public: int h,b,g,d; //index dans la liste des bordures pour le haut, le bas, la gauche et la droite du tile }; -using namespace std; - -typedef list tilelist; +typedef std::list tilelist; class TileList { diff --git a/code/nel/tools/3d/tile_edit/TileList.cpp b/code/nel/tools/3d/tile_edit/TileList.cpp index aea68b227..14a5b752a 100644 --- a/code/nel/tools/3d/tile_edit/TileList.cpp +++ b/code/nel/tools/3d/tile_edit/TileList.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . #include "stdafx.h" -#include "tile_edit.h" +#include "tile_edit_exe.h" #include "TileList.h" #include "browse.h" diff --git a/code/nel/tools/3d/tile_edit/TileView.cpp b/code/nel/tools/3d/tile_edit/TileView.cpp index b6dbbf36c..58db4d1f9 100644 --- a/code/nel/tools/3d/tile_edit/TileView.cpp +++ b/code/nel/tools/3d/tile_edit/TileView.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . #include "stdafx.h" -#include "tile_edit.h" +#include "tile_edit_exe.h" #include "TileView.h" #ifdef _DEBUG @@ -50,8 +50,8 @@ END_MESSAGE_MAP() void TileView::OnDropFiles(HDROP hDropInfo) { // TODO: Add your message handler code here and/or call default - *parent=this->GetParent(); - if (parent) parent-> +// *parent=this->GetParent(); +// if (parent) parent-> CListCtrl::OnDropFiles(hDropInfo); } diff --git a/code/nel/tools/3d/tile_edit/cpu.cpp b/code/nel/tools/3d/tile_edit/cpu.cpp index 9a63ad89c..32e13ffe7 100644 --- a/code/nel/tools/3d/tile_edit/cpu.cpp +++ b/code/nel/tools/3d/tile_edit/cpu.cpp @@ -46,7 +46,6 @@ typedef struct ROUT unsigned long time; } ROUT; */ -#include "..\tile_edit\tile_edit.h" ROUT Routines[20];