Interface works

- removed mock of CInterface and fixed event passing to CRobotMain
- changed texture names from tga and bmp to png
- UI now works but interaction is still broken

4 files changed, 11 insertions, 11 deletions

diff --git a/src/object/auto/autobase.cpp b/src/object/auto/autobase.cpp
index d196376..9948c01 100644
--- a/src/object/auto/autobase.cpp
+++ b/src/object/auto/autobase.cpp
@@ -1391,18 +1391,18 @@ void CAutoBase::BeginTransit()
 
     if ( m_param == PARAM_TRANSIT2 )
     {
-        m_bgBack = "back01.tga";  // clouds orange / blue
+        m_bgBack = "back01.png";  // clouds orange / blue
     }
     else if ( m_param == PARAM_TRANSIT3 )
     {
-        m_bgBack = "back22.tga";  // blueberries clouds
+        m_bgBack = "back22.png";  // blueberries clouds
     }
     else
     {
 #if _DEMO
-        m_bgBack = "back46b.tga";  // paintings
+        m_bgBack = "back46b.png";  // paintings
 #else
-        m_bgBack = "back46.tga";  // paintings
+        m_bgBack = "back46.png";  // paintings
 #endif
     }
 
diff --git a/src/object/auto/autoportico.cpp b/src/object/auto/autoportico.cpp
index 01c981d..9738aed 100644
--- a/src/object/auto/autoportico.cpp
+++ b/src/object/auto/autoportico.cpp
@@ -414,11 +414,11 @@ void CAutoPortico::UpdateTrackMapping(float left, float right)
     limit[0] = 0.0f;
     limit[1] = 1000000.0f;
 
-    m_engine->TrackTextureMapping(rank, mat, Gfx::ENG_RSTATE_PART1, "lemt.tga", "",
+    m_engine->TrackTextureMapping(rank, mat, Gfx::ENG_RSTATE_PART1, "lemt.png", "",
                                   limit[0], limit[1], Gfx::ENG_TEX_MAPPING_X,
                                   right, 8.0f, 8.0f, 192.0f, 256.0f);
 
-    m_engine->TrackTextureMapping(rank, mat, Gfx::ENG_RSTATE_PART2, "lemt.tga", "",
+    m_engine->TrackTextureMapping(rank, mat, Gfx::ENG_RSTATE_PART2, "lemt.png", "",
                                   limit[0], limit[1], Gfx::ENG_TEX_MAPPING_X,
                                   left, 8.0f, 8.0f, 192.0f, 256.0f);
 }
diff --git a/src/object/motion/motionvehicle.cpp b/src/object/motion/motionvehicle.cpp
index 1e54562..1a4b98f 100644
--- a/src/object/motion/motionvehicle.cpp
+++ b/src/object/motion/motionvehicle.cpp
@@ -2007,11 +2007,11 @@ void CMotionVehicle::UpdateTrackMapping(float left, float right, ObjectType type
         limit[2] = limit[1];
         limit[3] = m_engine->GetLimitLOD(1);
 
-        m_engine->TrackTextureMapping(rRank, mat, Gfx::ENG_RSTATE_PART1, "drawer.tga", "",
+        m_engine->TrackTextureMapping(rRank, mat, Gfx::ENG_RSTATE_PART1, "drawer.png", "",
                                       limit[0], limit[1], Gfx::ENG_TEX_MAPPING_X,
                                       right, 1.0f, 8.0f, 192.0f, 256.0f);
 
-        m_engine->TrackTextureMapping(lRank, mat, Gfx::ENG_RSTATE_PART2, "drawer.tga", "",
+        m_engine->TrackTextureMapping(lRank, mat, Gfx::ENG_RSTATE_PART2, "drawer.png", "",
                                       limit[0], limit[1], Gfx::ENG_TEX_MAPPING_X,
                                       left, 1.0f, 8.0f, 192.0f, 256.0f);
     }
@@ -2024,11 +2024,11 @@ void CMotionVehicle::UpdateTrackMapping(float left, float right, ObjectType type
 
         for ( i=0 ; i<2 ; i++ )
         {
-            m_engine->TrackTextureMapping(rRank, mat, Gfx::ENG_RSTATE_PART1, "lemt.tga", "",
+            m_engine->TrackTextureMapping(rRank, mat, Gfx::ENG_RSTATE_PART1, "lemt.png", "",
                                           limit[i*2+0], limit[i*2+1], Gfx::ENG_TEX_MAPPING_X,
                                           right, 1.0f, 8.0f, 192.0f, 256.0f);
 
-            m_engine->TrackTextureMapping(lRank, mat, Gfx::ENG_RSTATE_PART2, "lemt.tga", "",
+            m_engine->TrackTextureMapping(lRank, mat, Gfx::ENG_RSTATE_PART2, "lemt.png", "",
                                           limit[i*2+0], limit[i*2+1], Gfx::ENG_TEX_MAPPING_X,
                                           left, 1.0f, 8.0f, 192.0f, 256.0f);
         }
diff --git a/src/object/object.cpp b/src/object/object.cpp
index c29e59b..889065e 100644
--- a/src/object/object.cpp
+++ b/src/object/object.cpp
@@ -6062,7 +6062,7 @@ void CObject::UpdateEnergyMapping()
     for ( j=0 ; j<3 ; j++ )
     {
         m_engine->ChangeTextureMapping(m_objectPart[0].object,
-                                       mat, Gfx::ENG_RSTATE_PART3, "lemt.tga", "",
+                                       mat, Gfx::ENG_RSTATE_PART3, "lemt.png", "",
                                        limit[j*2+0], limit[j*2+1], Gfx::ENG_TEX_MAPPING_1Y,
                                        au, bu, 1.0f, 0.0f);
     }