mape: initialize the landscape pixmaps (#1162)

CMakeLists.txt

@@ -495,6 +495,7 @@ set(MAPE_SOURCES
 	src/mape/cpp-handles/c4def-handle.cpp
 	src/mape/cpp-handles/group-handle.h
 	src/mape/cpp-handles/group-handle.cpp
+	src/mape/cpp-handles/landscape-handle.cpp
 	src/mape/cpp-handles/log-handle.h
 	src/mape/cpp-handles/log-handle.cpp
 	src/mape/cpp-handles/mapgen-handle.h

src/mape/cpp-handles/landscape-handle.cpp

@@ -0,0 +1,56 @@
+/*
+ * mape - C4 Landscape.txt editor
+ *
+ * Copyright (c) 2005-2009, Armin Burgmeier
+ *
+ * Distributed under the terms of the ISC license; see accompanying file
+ * "COPYING" for details.
+ *
+ * "Clonk" is a registered trademark of Matthes Bender, used with permission.
+ * See accompanying file "TRADEMARK" for details.
+ *
+ * To redistribute this file separately, substitute the full license texts
+ * for the above references.
+ */
+
+#include "C4Include.h"
+
+#include "C4Landscape.h"
+#include "C4Texture.h"
+
+/* This is a small part of the implementation of C4Landscape for what is
+ * required by mape. We cannot link the full implementation since it would
+ * introduce a dependency on C4Game, and therefore the rest of the engine. */
+int32_t PixCol2Mat(BYTE pixc)
+{
+        // Get texture 
+        int32_t iTex = PixCol2Tex(pixc);
+        if (!iTex) return MNone;
+        // Get material-texture mapping
+        const C4TexMapEntry *pTex = ::TextureMap.GetEntry(iTex);
+        // Return material
+        return pTex ? pTex->GetMaterialIndex() : MNone;
+}
+
+void C4Landscape::HandleTexMapUpdate()
+{
+	printf("HandleTexMex\n");
+	UpdatePixMaps();
+}
+
+void C4Landscape::UpdatePixMaps() // Copied from C4Landscape.cpp
+{
+	printf("UpdatePixMaps\n");
+
+        int32_t i;
+        for (i = 0; i < 256; i++) Pix2Mat[i] = PixCol2Mat(i);
+        for (i = 0; i < 256; i++) Pix2Dens[i] = MatDensity(Pix2Mat[i]); 
+        for (i = 0; i < 256; i++) Pix2Place[i] = MatValid(Pix2Mat[i]) ? ::MaterialMap.Map[Pix2Mat[i]].Placement : 0;
+        Pix2Place[0] = 0;
+        // clear bridge mat conversion buffers
+        for (int32_t i = 0; i<128; ++i)
+        {
+                delete [] BridgeMatConversion[i];
+                BridgeMatConversion[i] = NULL;
+        }
+}

src/mape/cpp-handles/stub-handle.cpp

@@ -114,7 +114,6 @@ bool C4Landscape::InsertMaterial(int32_t, int32_t *, int32_t *, int32_t, int32_t
 bool C4Landscape::Incinerate(int32_t, int32_t) { return false; }
 bool C4Landscape::ClearPix(int32_t, int32_t) { return false; }
 void C4Landscape::CheckInstabilityRange(int32_t, int32_t) {}
-void C4Landscape::HandleTexMapUpdate() {}
 
 void C4Sky::Default() {}
 C4Sky::~C4Sky() {}

src/mape/cpp-handles/texture-handle.cpp

@@ -33,6 +33,7 @@ C4TextureMapHandle* c4_texture_map_handle_new(void)
   //but yeah...
   C4TextureMap* map = &::TextureMap;
   map->Clear();
+  map->Init();
   return TEXTURE_MAP_TO_HANDLE(map); //new C4TextureMap);
 }