Tweaks

IonAgorria · Oct 12, 2024 · 63336ed · 63336ed
1 parent 170808c
commit 63336ed
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/Source/Render/D3D/D3DRenderTilemap.cpp b/Source/Render/D3D/D3DRenderTilemap.cpp
@@ -38,7 +38,7 @@ int cD3DRender::CreateTilemap(cTileMap *TileMap)
 {
     int err = cInterfaceRenderDevice::CreateTilemap(TileMap);
     if (err == 0) {
-        cTileMapRender* p = TileMap->GetTilemapRender(cTileMap::RenderType::DIRECT);
+        cTileMapRender* p = TileMap->GetTilemapRender();
         xassert(p);
         if (p) {
             tilemaps.push_back(p);
@@ -49,7 +49,7 @@ int cD3DRender::CreateTilemap(cTileMap *TileMap)
 
 int cD3DRender::DeleteTilemap(cTileMap *TileMap)
 {
-    cTileMapRender* p = TileMap->GetTilemapRender(cTileMap::RenderType::DIRECT);
+    cTileMapRender* p = TileMap->GetTilemapRender();
     if (p) {
         auto removed = std::remove(tilemaps.begin(), tilemaps.end(), p);
         tilemaps.erase(removed, tilemaps.end());

diff --git a/Source/Render/src/Texture.h b/Source/Render/src/Texture.h
@@ -42,7 +42,6 @@ class cTexture : public cUnknownClass, public sAttribute
 	int			number_mipmap;
 public:
     float       bump_scale = 1;
-	sColor4c	skin_color;
 	std::vector<TextureImage> frames;
 
 	cTexture(const char *TexName=0);

diff --git a/Source/Render/tilemap/TileMapRender.cpp b/Source/Render/tilemap/TileMapRender.cpp
@@ -565,7 +565,7 @@ void cTileMapRender::DrawBump(cCamera* DrawNode,eBlendMode MatMode,TILEMAP_DRAW
 
 //	if(pNormalCamera==DrawNode)
 //		gb_RenderDevice->SetRenderState(RS_WIREFRAME,1);
-    int first_texture_number = 0;
+    int first_texture_number = use_shadow_map ? 1 : 0;
 #ifdef PERIMETER_D3D9
     uint32_t tss_colorarg2 = 0;
     uint32_t tss_alphaarg2 = 0;
@@ -580,11 +580,6 @@ void cTileMapRender::DrawBump(cCamera* DrawNode,eBlendMode MatMode,TILEMAP_DRAW
         }
     }
 #endif
-#ifdef PERIMETER_SOKOL
-        if (use_shadow_map) {
-            first_texture_number = 1;
-        }
-#endif
 
 #ifdef DEBUG_TILES
     int st_VBSw = 0, st_Poly = 0;