From 6a0d150539897ec65ccc161305db48de10ea35ba Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Sun, 16 Sep 2012 10:38:08 +0200 Subject: 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 --- src/object/auto/autobase.cpp | 8 ++++---- src/object/auto/autoportico.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/object/auto') 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); } -- cgit v1.2.3-1-g7c22