assimilation

2 files changed, 12 insertions, 3 deletions

diff --git a/ue2/imgsynth2/cpixmap.cpp b/ue2/imgsynth2/cpixmap.cpp
index ff5a83c..de9ec94 100644
--- a/ue2/imgsynth2/cpixmap.cpp
+++ b/ue2/imgsynth2/cpixmap.cpp
@@ -71,10 +71,13 @@ void CPixMap::read(std::ifstream& in)
     istr2 >> character;
     istr2 >> mode;
     istr2 >> colors;
-    m_fileheader.xpmColors[character][mode] = colors;
+    //m_fileheader.xpmColors[character][mode] = colors;
+   m_fileheader.xpmColors[character] = colors;
    
     getline( in, str, '"' );
   }
+  
+  
 /*    colors.replace(0,1,"0x");
     colors.insert(4, " 0x");
     colors.insert(9," 0x");
@@ -121,6 +124,12 @@ void CPixMap::read(std::ifstream& in)
 
 void CPixMap::write(std::ofstream& out)
 {
+  out<<"/* XPM */"<<endl;
+  out<<"static char * yellow_man1_default_xpm[] = {"<<endl;
+  out<<"\""<<m_fileheader.xpmWidth<<" "<<m_fileheader.xpmHeight
+        <<" "<<m_fileheader.nColor<<" "<<m_fileheader.nChar<<"\","<<endl;
+  
+
   dump(out);
 }
 
diff --git a/ue2/imgsynth2/cpixmap.h b/ue2/imgsynth2/cpixmap.h
index 6e147ed..c7537cd 100644
--- a/ue2/imgsynth2/cpixmap.h
+++ b/ue2/imgsynth2/cpixmap.h
@@ -112,8 +112,8 @@ class CPixMap : public CBitmap
       uint32_t yHotspot;
       
       /* color tables*/
-       std::map<unsigned const char, std::map<  std::string,  std::string > > xpmColors;
-
+     //  std::map<std::string, std::map<  std::string,  std::string > > xpmColors;
+    //  std::map<std::string, uint32_t[3]> xpmColors;
 
 
     } PIXMAP_FILEHEADER;