From 9bfdcacc52305266a3ff942ba0666b1b54ed7bf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Konopacki?= <konopacki.m@gmail.com>
Date: Thu, 13 Sep 2012 18:28:50 +0200
Subject: Fixes in [object/auto]

---
 src/object/auto/auto.h          |  4 ++--
 src/object/auto/autobase.cpp    | 23 +++++++++++++----------
 src/object/auto/autoderrick.cpp |  2 +-
 src/object/auto/autonest.cpp    |  2 +-
 4 files changed, 17 insertions(+), 14 deletions(-)

(limited to 'src/object/auto')

diff --git a/src/object/auto/auto.h b/src/object/auto/auto.h
index be7e66b..dd55904 100644
--- a/src/object/auto/auto.h
+++ b/src/object/auto/auto.h
@@ -95,8 +95,8 @@ protected:
     Gfx::CLightManager* m_lightMan;
     Gfx::CTerrain*      m_terrain;
     Gfx::CWater*        m_water;
-    Gfx::CCloud  *      m_cloud;
-    Gfx::CPlanet *      m_planet;
+    Gfx::CCloud*        m_cloud;
+    Gfx::CPlanet*       m_planet;
     Gfx::CLightning*    m_lightning;
     Gfx::CCamera*       m_camera;
     Ui::CInterface*     m_interface;
diff --git a/src/object/auto/autobase.cpp b/src/object/auto/autobase.cpp
index d5e8608..d196376 100644
--- a/src/object/auto/autobase.cpp
+++ b/src/object/auto/autobase.cpp
@@ -197,7 +197,7 @@ begin:
 
             pos = m_pos;
             pos.x -= 150.0f;
-            m_terrain->MoveOnFloor(pos);
+            m_terrain->AdjustToFloor(pos);
             pos.y += 10.0f;
             m_camera->SetScriptEye(pos);
             m_posSound = pos;
@@ -335,7 +335,7 @@ begin:
 
         pos = m_pos;
         pos.x -= 110.0f;
-        m_terrain->MoveOnFloor(pos);
+        m_terrain->AdjustToFloor(pos);
         pos.y += 10.0f;
         m_camera->SetScriptEye(pos);
         m_posSound = pos;
@@ -382,7 +382,7 @@ begin:
 
             pos = m_pos;
             pos.x -= 150.0f;
-            m_terrain->MoveOnFloor(pos);
+            m_terrain->AdjustToFloor(pos);
             pos.y += 10.0f;
             m_camera->SetScriptEye(pos);
 
@@ -416,7 +416,7 @@ begin:
                 // Particles are ejected from the jet engine.
                 pos = m_object->GetPosition(0);
                 pos.y += 6.0f;
-                h = m_terrain->GetFloorHeight(pos)/300.0f;
+                h = m_terrain->GetHeightToFloor(pos)/300.0f;
                 speed.x = (Math::Rand()-0.5f)*(80.0f-50.0f*h);
                 speed.z = (Math::Rand()-0.5f)*(80.0f-50.0f*h);
                 speed.y = -(Math::Rand()*(h+1.0f)*40.0f+(h+1.0f)*40.0f);
@@ -526,7 +526,7 @@ begin:
                 pos = m_pos;
                 pos.x += p.x;
                 pos.z += p.y;
-                m_terrain->MoveOnFloor(pos);
+                m_terrain->AdjustToFloor(pos);
                 pos.y += 10.0f;
                 pos.y += m_progress*40.0f;
                 m_camera->SetScriptEye(pos);
@@ -588,7 +588,7 @@ begin:
                 pos = m_pos;
                 pos.x += p.x;
                 pos.z += p.y;
-                m_terrain->MoveOnFloor(pos);
+                m_terrain->AdjustToFloor(pos);
                 pos.y += 10.0f;
                 pos.y += m_progress*40.0f;
                 m_camera->SetScriptEye(pos);
@@ -785,7 +785,7 @@ begin:
 
             pos = m_pos;
             pos.x -= 110.0f+m_progress*250.0f;
-            m_terrain->MoveOnFloor(pos);
+            m_terrain->AdjustToFloor(pos);
             pos.y += 10.0f;
             m_camera->SetScriptEye(pos);
 
@@ -1413,10 +1413,13 @@ void CAutoBase::BeginTransit()
     m_engine->GetBackground(m_bgName, m_bgUp, m_bgDown, m_bgCloudUp, m_bgCloudDown, bFull, bQuarter);
     m_engine->DeleteTexture(m_bgName);
 
-    m_engine->SetBackground(m_bgBack, 0x00000000, 0x00000000, 0x00000000, 0x00000000);
+    m_engine->SetBackground(m_bgBack, Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f),
+            Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f),
+            Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f),
+            Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f));
     m_engine->LoadTexture(m_bgBack);
 
-    m_cloud->SetEnable(false);  // cache clouds
+    m_cloud->SetEnabled(false);  // cache clouds
     m_planet->SetMode(1);
 }
 
@@ -1433,7 +1436,7 @@ void CAutoBase::EndTransit()
     m_engine->SetBackground(m_bgName, m_bgUp, m_bgDown, m_bgCloudUp, m_bgCloudDown);
     m_engine->LoadTexture(m_bgName);
 
-    m_cloud->SetEnable(true);  // gives the clouds
+    m_cloud->SetEnabled(true);  // gives the clouds
     m_planet->SetMode(0);
 
     m_main->StartMusic();
diff --git a/src/object/auto/autoderrick.cpp b/src/object/auto/autoderrick.cpp
index a560bc8..432c5ea 100644
--- a/src/object/auto/autoderrick.cpp
+++ b/src/object/auto/autoderrick.cpp
@@ -126,7 +126,7 @@ void CAutoDerrick::Init()
     pos = Math::Vector(7.0f, 0.0f, 0.0f);
     mat = m_object->GetWorldMatrix(0);
     pos = Math::Transform(*mat, pos);
-    m_terrain->MoveOnFloor(pos);
+    m_terrain->AdjustToFloor(pos);
     m_fretPos = pos;
 }
 
diff --git a/src/object/auto/autonest.cpp b/src/object/auto/autonest.cpp
index 9658e23..d7f94e1 100644
--- a/src/object/auto/autonest.cpp
+++ b/src/object/auto/autonest.cpp
@@ -76,7 +76,7 @@ void CAutoNest::Init()
     m_lastParticle = 0.0f;
 
     pos = m_object->GetPosition(0);
-    m_terrain->MoveOnFloor(pos);
+    m_terrain->AdjustToFloor(pos);
     m_fretPos = pos;
 }
 
-- 
cgit v1.2.3-1-g7c22