diff --git a/Utils/MapEdit/Core.cpp b/Utils/MapEdit/Core.cpp
index fd3d56546..29c88df08 100644
--- a/Utils/MapEdit/Core.cpp
+++ b/Utils/MapEdit/Core.cpp
@@ -44,7 +44,7 @@ CCore::CCore()
 		GridFlag=true;
 		Is3dFlag=true;
 		CurrentView=NULL;
-		CursorPos.x=CursorPos.y=0;
+		CursorPos.x=CursorPos.y=-1;
 		CurrentLayer=0;
 
 GString	Filename;
@@ -53,6 +53,7 @@ GString	Filename;
 		GetExecPath(Filename);
 		Filename+=theApp.GetConfigStr("FileLocation","Iconz");
 		IconBank->AddSet(Filename);
+		RenderTGAFlag=false;
 }
 
 /*****************************************************************************/
@@ -104,6 +105,7 @@ void	CCore::Load(CFile *File)
 int		Version,i;
 BOOL	F;
 Vector3	DuffVector;
+
 		File->Read(&Version,sizeof(int));
 		if (Version>100000) Version=1;	// Check fix for changing version to int from float
 #ifndef _DEBUG
@@ -155,8 +157,8 @@ int		MapHeight=ActionLayer->GetHeight();
 		{
 			Layer[i]->CheckLayerSize(MapWidth,MapHeight);
 		}
-
 }
+
 /*****************************************************************************/
 void	CCore::Validate(int Type)
 {
@@ -219,11 +221,10 @@ Vector3	&ThisCam=GetCam();
 			return;
 		}
 		if (IconBank->NeedLoad()) IconBank->LoadAllSets(this);
-
+		if (RenderTGAFlag) RenderToTga();
 		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);	// Clear Screen
 
 		RenderLayers(IsSubView() || CurrentLayer->IsUnique());
-
 }
 
 /*****************************************************************************/
@@ -835,3 +836,18 @@ CExport	Exp(ExportName);
 
 }
 
+/*****************************************************************************/
+void	CCore::RenderToTga(char *Filename)
+{
+		TGAFilename=Filename;
+		RenderTGAFlag=true;
+		RedrawView();
+}
+
+/*****************************************************************************/
+void	CCore::RenderToTga()
+{
+		RenderTGAFlag=false;
+		ActionLayer->Render4TGA(TGAFilename);
+}
+
diff --git a/Utils/MapEdit/Core.h b/Utils/MapEdit/Core.h
index ade45bbd3..13ae06275 100644
--- a/Utils/MapEdit/Core.h
+++ b/Utils/MapEdit/Core.h
@@ -45,6 +45,8 @@ public:
 		void					RenderLayers(bool OneShot=false);
 		void					RenderNumber(int No);
 		void					Export(char *Filename);
+		void					RenderToTga(char *Filename);
+		void					RenderToTga();
 
 // View Stuff
 		void					SetView(CMapEditView *View)			{CurrentView=View;}
@@ -139,6 +141,8 @@ private:
 		bool					Is3dFlag;
 
 		CElemBank				*IconBank;
+		bool					RenderTGAFlag;
+		GString					TGAFilename;
 	
 };
 
diff --git a/Utils/MapEdit/Layer.h b/Utils/MapEdit/Layer.h
index 063d599ef..424896fc4 100644
--- a/Utils/MapEdit/Layer.h
+++ b/Utils/MapEdit/Layer.h
@@ -72,6 +72,7 @@ virtual	int				GetSubType()					{return(LayerDef.SubType);}
 
 
 virtual	void			Render(CCore *Core,Vector3 &CamPos,bool Is3d){};
+virtual	void			Render4TGA(const char *Filename){}
 virtual	void			RenderGrid(CCore *Core,Vector3 &CamPos,bool Active);
 virtual void			RenderSelection(CCore *Core,Vector3 &ThisCam){};
 virtual	void			RenderCursor(CCore *Core,Vector3 &CamPos,bool Is3d){};
diff --git a/Utils/MapEdit/LayerThing.cpp b/Utils/MapEdit/LayerThing.cpp
index 1d7f16de9..5be8711aa 100644
--- a/Utils/MapEdit/LayerThing.cpp
+++ b/Utils/MapEdit/LayerThing.cpp
@@ -69,6 +69,11 @@ int		i,ListSize;
 			File->Read(&ThisThing.Data,sizeof(sLayerThingData));
 		}
 		LoadThingNames(File,Version);
+
+//		CurrentDefThing=-1;
+//		CurrentThing=-1;
+//		CurrentThingPoint=-1;
+
 }
 
 /*****************************************************************************/
@@ -79,7 +84,8 @@ int		i,ListSize;
 		ThisThing.XY.resize(ListSize);
 		for (i=0 ;i<ListSize; i++)
 		{
-			File->Read(&ThisThing.XY[i],sizeof(CPoint));
+			CPoint	&ThisPoint=ThisThing.XY[i];
+			File->Read(&ThisPoint,sizeof(CPoint));
 		}
 }
 
@@ -131,8 +137,9 @@ void	CLayerThing::SaveThing(CFile *File,sLayerThing &ThisThing)
 int		i,ListSize=ThisThing.XY.size();
 		File->Write(&ListSize,sizeof(int));
 		for (i=0 ;i<ListSize; i++)
-		{
-			File->Write(&ThisThing.XY[i],sizeof(CPoint));
+		{	
+			CPoint	&ThisPoint=ThisThing.XY[i];
+			File->Write(&ThisPoint,sizeof(CPoint));
 		}
 }
 
@@ -327,12 +334,14 @@ int			i,ListSize;
 			ListSize=ThisThing.XY.size();
 				for (i=0; i<ListSize; i++)
 				{
+					CPoint	&ThisPoint=ThisThing.XY[i];
 					CString	Str;
-					Str.Format("%i: %i, %i",i,ThisThing.XY[i].x,ThisThing.XY[i].y);
+					Str.Format("%i: %i, %i",i,ThisPoint.x,ThisPoint.y);
 					List.AddString(Str);
 				}
 		}
 		List.SetCurSel(CurrentThingPoint);
+
 }
 
 /*****************************************************************************/
diff --git a/Utils/MapEdit/LayerTile.cpp b/Utils/MapEdit/LayerTile.cpp
index 1f03865a8..ca69cfb77 100644
--- a/Utils/MapEdit/LayerTile.cpp
+++ b/Utils/MapEdit/LayerTile.cpp
@@ -341,6 +341,135 @@ float		Y1=Rect.bottom-1;
 }
 
 
+/*****************************************************************************/
+#define	TGA_TILE_SIZE	8
+void	CLayerTile::Render4TGA(const char *Filename)
+{
+u8		*Buffer;
+int		MapW=Map.GetWidth();
+int		MapH=Map.GetHeight();
+int		PixW=MapW*8;
+int		PixH=MapH*8;
+
+		Buffer=(u8*)malloc(PixW*PixH*3);
+		ASSERT(Buffer);
+		memset(Buffer,0,PixW*PixH*3);
+
+u8		*Ptr=Buffer;
+		for (int Y=0; Y<MapH; Y++)
+		{
+			Ptr=&Buffer[((MapH-1)-Y)*PixW*TGA_TILE_SIZE*3];
+			for (int X=0; X<MapW; X++)
+			{
+				sMapElem &Elem=Map.Get(X,Y);
+				if (Elem.Tile!=0)
+				{
+					WriteTile2Buffer(Elem,Ptr,X,Y,PixW,PixH);
+				}
+				Ptr+=(TGA_TILE_SIZE*3);
+			}
+		}
+
+		SaveTGA(Filename,PixW,PixH,Buffer,true);
+		free(Buffer);
+
+}
+
+/*****************************************************************************/
+void	ProcessRGB(u8 *Src,int SrcW,int SrcH,u8 *Dst,int DstW,int DstH)
+{
+		for (int y=0;y<DstH;y++)
+		{
+			for (int x=0;x<DstW;x++)
+			{
+				float	XFrac=float(x)/float(DstW);
+				float	YFrac=float(y)/float(DstH);
+				int		FromX=float(SrcW)*XFrac;
+				int		FromY=float(SrcH)*YFrac;
+
+				u8	R=Src[((FromX+(FromY*SrcW))*3)+0];
+				u8	G=Src[((FromX+(FromY*SrcW))*3)+1];
+				u8	B=Src[((FromX+(FromY*SrcW))*3)+2];
+				if (R==255 && G==0 && B==255)
+				{
+					R=G=B=0;
+				}
+				Dst[((x+(y*DstW))*3)+0]=R;
+				Dst[((x+(y*DstW))*3)+1]=G;
+				Dst[((x+(y*DstW))*3)+2]=B;
+			}
+		}
+}
+
+void	FlipX(u8 *_Src,u8 *_Dst,int W,int H)
+{
+int		RGBW=W*3;
+u8		Tmp[TGA_TILE_SIZE*TGA_TILE_SIZE*3];
+u8		*Dst=Tmp;
+		
+		for (int Y=0; Y<H; Y++)
+		{
+			for (int X=0; X<W; X++)
+			{
+				int	PX=((W-1)-X);
+				u8	*Src=&_Src[(PX*3)+Y*RGBW];
+
+				*Dst++=*Src++;
+				*Dst++=*Src++;
+				*Dst++=*Src++;
+			}
+		}
+		memcpy(_Dst,Tmp,W*H*3);
+}
+
+/*****************************************************************************/
+void	FlipY(u8 *_Src,u8 *_Dst,int W,int H)
+{
+int		RGBW=W*3;
+u8		Tmp[TGA_TILE_SIZE*TGA_TILE_SIZE*3];
+
+		for (int Y=0; Y<H; Y++)
+		{
+			u8	*Src=&_Src[(Y)*RGBW];
+			u8	*Dst= &Tmp[((H-1)-Y)*RGBW];
+
+			memcpy(Dst,Src,RGBW);
+		}
+		memcpy(_Dst,Tmp,W*H*3);
+}
+
+/*****************************************************************************/
+void	CLayerTile::WriteTile2Buffer(sMapElem &Elem,u8 *Out,int XPos,int YPos,int PixW,int PixH)
+{
+u8		LilBlock[TGA_TILE_SIZE*TGA_TILE_SIZE*3];
+CElem	&Tile=TileBank->GetElem(Elem.Set,Elem.Tile);
+int		TileW=Tile.GetElemWidth();
+int		TileH=Tile.GetElemHeight();
+
+		if (TileW>16 || TileH>16 || TileW<0 || TileH<0)
+		{
+			TRACE2("%i %i\n",TileW,TileH);
+			return;
+		}
+		ProcessRGB(Tile.GetElemRGB(),TileW,TileH,LilBlock,TGA_TILE_SIZE,TGA_TILE_SIZE);
+		if (Elem.Flags & PC_TILE_FLAG_MIRROR_X) FlipX(LilBlock,LilBlock,TGA_TILE_SIZE,TGA_TILE_SIZE);
+		if (Elem.Flags & PC_TILE_FLAG_MIRROR_Y) FlipY(LilBlock,LilBlock,TGA_TILE_SIZE,TGA_TILE_SIZE);
+
+u8		*RGB=LilBlock;
+		for (int Y=0; Y<TGA_TILE_SIZE; Y++)
+		{
+			u8	*NextOut=Out+(PixW*3);
+			for (int X=0; X<TGA_TILE_SIZE; X++)
+			{
+				*Out++=*RGB++;
+				*Out++=*RGB++;
+				*Out++=*RGB++;
+			}
+			Out=NextOut;
+		}
+
+}
+
 /*****************************************************************************/
 /*** Gui *********************************************************************/
 /*****************************************************************************/
diff --git a/Utils/MapEdit/LayerTile.h b/Utils/MapEdit/LayerTile.h
index 1da2dae90..2a8815b61 100644
--- a/Utils/MapEdit/LayerTile.h
+++ b/Utils/MapEdit/LayerTile.h
@@ -34,6 +34,8 @@ public:
 virtual	void			Render(CCore *Core,Vector3 &CamPos,bool Is3d);
 virtual	void			RenderSelection(CCore *Core,Vector3 &ThisCam);
 		void			RenderCursor(CCore *Core,Vector3 &CamPos,bool Is3d);
+		void			Render4TGA(const char *Filename);
+		void			WriteTile2Buffer(sMapElem &Elem,u8 *Buffer,int X,int Y,int PixW,int PixH);
 
 virtual	void			GUIInit(CCore *Core);
 virtual	void			GUIKill(CCore *Core);
diff --git a/Utils/MapEdit/MapEdit.clw b/Utils/MapEdit/MapEdit.clw
index 4e6e82754..6b0d400a3 100644
--- a/Utils/MapEdit/MapEdit.clw
+++ b/Utils/MapEdit/MapEdit.clw
@@ -2,7 +2,7 @@
 
 [General Info]
 Version=1
-LastClass=CGUILayerItem
+LastClass=CMapEditDoc
 LastTemplate=CDialog
 NewFileInclude1=#include "stdafx.h"
 NewFileInclude2=#include "mapedit.h"
@@ -29,24 +29,24 @@ Class17=CMapEditDoc
 Class18=CMapEditView
 
 ResourceCount=18
-Resource1=IDD_ABOUTBOX (English (U.S.))
+Resource1=IDD_RESIZE
 Resource2=IDR_MAPEDITYPE (English (U.S.))
-Resource3=IDD_LAYER_COLLISION
-Resource4=IDD_MULTIBAR (English (U.S.))
-Resource5=IDD_LAYER_LIST
-Resource6=IDD_ADDLAYER
-Resource7=IDR_TOOLBAR (English (U.S.))
+Resource3=IDR_TOOLBAR (English (U.S.))
+Resource4=IDD_NEWMAP
+Resource5=IDD_ADDLAYER
+Resource6=IDD_LAYER_SHADE
+Resource7=IDD_MULTIBAR (English (U.S.))
 Resource8=xxxx
-Resource9=IDD_LAYER_SHADE
-Resource10=IDD_LAYER_ACTOR
-Resource11=IDD_TOOLBAR
-Resource12=IDD_RESIZE
-Resource13=IDR_MAINFRAME (English (U.S.))
-Resource14=IDD_NEWMAP
+Resource9=IDD_LAYER_ACTOR
+Resource10=IDD_ABOUTBOX (English (U.S.))
+Resource11=IDD_ELEMLIST
+Resource12=IDD_TILEBANK
+Resource13=IDD_LAYER_LIST
+Resource14=IDD_TOOLBAR
 Resource15=IDD_LAYER_ACTOR2
 Class19=CGUILayerActor
-Resource16=IDD_TILEBANK
-Resource17=IDD_ELEMLIST
+Resource16=IDD_LAYER_COLLISION
+Resource17=IDR_MAINFRAME (English (U.S.))
 Class20=CGUILayerItem
 Resource18=IDD_LAYER_ITEM
 
@@ -155,6 +155,9 @@ Type=0
 BaseClass=CDocument
 HeaderFile=MapEditDoc.h
 ImplementationFile=MapEditDoc.cpp
+Filter=N
+VirtualFilter=DC
+LastObject=ID_RENDER_TO_TGA
 
 [CLS:CMapEditView]
 Type=0
@@ -263,31 +266,32 @@ Command3=ID_FILE_CLOSE
 Command4=ID_FILE_SAVE
 Command5=ID_FILE_SAVE_AS
 Command6=ID_EXPORT
-Command7=ID_FILE_MRU_FILE1
-Command8=ID_APP_EXIT
-Command9=ID_EDIT_UNDO
-Command10=ID_EDIT_CUT
-Command11=ID_EDIT_COPY
-Command12=ID_EDIT_PASTE
-Command13=ID_RESET_VIEW
-Command14=ID_VIEW_TOOLBAR
-Command15=ID_VIEW_STATUS_BAR
-Command16=ID_MAP_SETSIZE
-Command17=ID_TOGGLE_GRID
-Command18=ID_ZOOM_IN
-Command19=ID_ZOOM_OUT
-Command20=ID_MIRRORX
-Command21=ID_MIRRORY
-Command22=ID_ACTIVEBRUSH_LEFT
-Command23=ID_ACTIVEBRUSH_RIGHT
-Command24=ID_TOGGLE_SUBVIEW
-Command25=ID_2D_3D_TOGGLE
-Command26=ID_WINDOW_NEW
-Command27=ID_WINDOW_CASCADE
-Command28=ID_WINDOW_TILE_HORZ
-Command29=ID_WINDOW_ARRANGE
-Command30=ID_APP_ABOUT
-CommandCount=30
+Command7=ID_RENDER_TO_TGA
+Command8=ID_FILE_MRU_FILE1
+Command9=ID_APP_EXIT
+Command10=ID_EDIT_UNDO
+Command11=ID_EDIT_CUT
+Command12=ID_EDIT_COPY
+Command13=ID_EDIT_PASTE
+Command14=ID_RESET_VIEW
+Command15=ID_VIEW_TOOLBAR
+Command16=ID_VIEW_STATUS_BAR
+Command17=ID_MAP_SETSIZE
+Command18=ID_TOGGLE_GRID
+Command19=ID_ZOOM_IN
+Command20=ID_ZOOM_OUT
+Command21=ID_MIRRORX
+Command22=ID_MIRRORY
+Command23=ID_ACTIVEBRUSH_LEFT
+Command24=ID_ACTIVEBRUSH_RIGHT
+Command25=ID_TOGGLE_SUBVIEW
+Command26=ID_2D_3D_TOGGLE
+Command27=ID_WINDOW_NEW
+Command28=ID_WINDOW_CASCADE
+Command29=ID_WINDOW_TILE_HORZ
+Command30=ID_WINDOW_ARRANGE
+Command31=ID_APP_ABOUT
+CommandCount=31
 
 [ACL:IDR_MAINFRAME (English (U.S.))]
 Type=1
@@ -444,5 +448,5 @@ ImplementationFile=GUILayerItem.cpp
 BaseClass=CDialog
 Filter=D
 VirtualFilter=dWC
-LastObject=IDC_ITEM_LIST
+LastObject=ID_MIRRORX
 
diff --git a/Utils/MapEdit/MapEdit.rc b/Utils/MapEdit/MapEdit.rc
index 7023df876..39bc42b14 100644
--- a/Utils/MapEdit/MapEdit.rc
+++ b/Utils/MapEdit/MapEdit.rc
@@ -94,6 +94,8 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "Export ",                     ID_EXPORT
         MENUITEM SEPARATOR
+        MENUITEM "Create Map TGA",              ID_RENDER_TO_TGA
+        MENUITEM SEPARATOR
         MENUITEM "Recent File",                 ID_FILE_MRU_FILE1, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "E&xit",                       ID_APP_EXIT
diff --git a/Utils/MapEdit/MapEditDoc.cpp b/Utils/MapEdit/MapEditDoc.cpp
index ad928b640..c0faef8fc 100644
--- a/Utils/MapEdit/MapEditDoc.cpp
+++ b/Utils/MapEdit/MapEditDoc.cpp
@@ -37,6 +37,7 @@ BEGIN_MESSAGE_MAP(CMapEditDoc, CDocument)
 	ON_COMMAND(ID_RESET_VIEW, OnResetView)
 	ON_COMMAND(ID_TOOLBAR_TILEPALETTE, OnToggleSubView)
 	ON_COMMAND(ID_TOGGLE_GRID, OnToggleGrid)
+	ON_COMMAND(ID_RENDER_TO_TGA, OnRenderToTga)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -213,6 +214,19 @@ char	Filename[256];
 		Core.Export(Filename);
 }
 
+/*********************************************************************************/
+void CMapEditDoc::OnRenderToTga() 
+{
+char		BASED_CODE Filter[]= "TGA File  (*.TGA)|*.TGA||";
+CFileDialog	Dlg(FALSE,"*.TGA",NULL,OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,Filter);
+
+		if (Dlg.DoModal()!=IDOK) return;
+
+char	Filename[256];
+	sprintf(Filename,"%s",Dlg.GetPathName());
+	Core.RenderToTga(Filename);
+}
+
 /*********************************************************************************/
 /*** Tilebank Functions **********************************************************/
 /*********************************************************************************/
@@ -279,3 +293,4 @@ void	CMapEditDoc::FocusView()
 }
 
 /*********************************************************************************/
+
diff --git a/Utils/MapEdit/MapEditDoc.h b/Utils/MapEdit/MapEditDoc.h
index 0b4cbd189..0fa51e560 100644
--- a/Utils/MapEdit/MapEditDoc.h
+++ b/Utils/MapEdit/MapEditDoc.h
@@ -80,6 +80,7 @@ protected:
 	afx_msg void OnEditPaste();
 	afx_msg void On2d3dToggle();
 	afx_msg void OnResetView();
+	afx_msg void OnRenderToTga();
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 
diff --git a/Utils/MapEdit/resource.h b/Utils/MapEdit/resource.h
index 11dfa1790..f75ad3308 100644
--- a/Utils/MapEdit/resource.h
+++ b/Utils/MapEdit/resource.h
@@ -100,6 +100,7 @@
 #define ID_ZOOM_IN                      32797
 #define ID_ZOOM_OUT                     32798
 #define ID_RESET_VIEW                   32799
+#define ID_RENDER_TO_TGA                32800
 #define ID_INDICATOR_CURSORXY           59142
 
 // Next default values for new objects
@@ -108,7 +109,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        180
-#define _APS_NEXT_COMMAND_VALUE         32800
+#define _APS_NEXT_COMMAND_VALUE         32801
 #define _APS_NEXT_CONTROL_VALUE         1103
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
diff --git a/Utils/MapEdit/utils.cpp b/Utils/MapEdit/utils.cpp
index 0b66ad8fc..6e032cb4b 100644
--- a/Utils/MapEdit/utils.cpp
+++ b/Utils/MapEdit/utils.cpp
@@ -163,9 +163,7 @@ struct	sTgaHdr
 	char	imagedesc;	   // 16
 };
 
-
-
-void SaveTGA(char *Filename,int W,int H,u8 *Data)
+void SaveTGA(const char *Filename,int W,int H,u8 *Data,bool IsBGR)
 {
 FILE			*File;
 sTgaHdr			FileHdr;
@@ -180,8 +178,22 @@ sTgaHdr			FileHdr;
 		FileHdr.depth=24;
 
 		fwrite(&FileHdr,sizeof(sTgaHdr),1,File);
+		if (!IsBGR)
+		{
+			fwrite(Data,W*H*3,1,File);
+		}
+		else
+		{
+			int	Size=W*H;
+			for (int i=0; i<Size;i++)
+			{
+				fwrite(&Data[2],1,1,File);
+				fwrite(&Data[1],1,1,File);
+				fwrite(&Data[0],1,1,File);
+				Data+=3;
 
-		fwrite(Data,W*H*3,1,File);
+			}
+		}
 
 		fclose(File);
 }
diff --git a/Utils/MapEdit/utils.h b/Utils/MapEdit/utils.h
index 5170bcee2..49aa35579 100644
--- a/Utils/MapEdit/utils.h
+++ b/Utils/MapEdit/utils.h
@@ -44,7 +44,9 @@ void	BuildGLQuad(float XMin,float XMax,float YMin,float YMax,float Z);
 CPoint	IDToPoint(int ID,int Width);
 int		PointToID(CPoint &Pnt,int Width);
 
-void	SaveTGA(char *Filename,int W,int H,u8 *Data);
+//void	SaveTGA(const char *Filename,int W,int H,u8 *Data);
+void SaveTGA(const char *Filename,int W,int H,u8 *Data,bool IsBGR=false);
+
 void	SaveBmp(char *Filename,int Width,int Height,RGBQUAD *Pal,u8 *Image);
 
 void	BGR2RGB(int W,int H,u8 *Data);