diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-27 20:36:52 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-27 20:36:52 +0200 |
commit | 2ef1c8b6f8976c2c11034a6d30d941e5b22bfac0 (patch) | |
tree | 2aaef121c41843066ecefc40a17021f84569129d /src/object | |
parent | 80d3a9bff1d5999ec5504b50103be7687672227a (diff) | |
download | colobot-2ef1c8b6f8976c2c11034a6d30d941e5b22bfac0.tar.gz colobot-2ef1c8b6f8976c2c11034a6d30d941e5b22bfac0.tar.bz2 colobot-2ef1c8b6f8976c2c11034a6d30d941e5b22bfac0.zip |
Fixed blinking light problem
- temporarily commented out misbehaving code in CPhysics
- some fixes in CLightManager
- minor refactoring in CRobotMain
Diffstat (limited to 'src/object')
-rw-r--r-- | src/object/robotmain.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index 10733f7..521b518 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -3913,7 +3913,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject) ); } - if (Cmd(line, "FrontsizeName") && !resetObject) + if (Cmd(line, "ForegroundName") && !resetObject) { OpString(line, "image", name); m_engine->SetForegroundName(name); @@ -3962,7 +3962,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject) OpTypeWater(line, "water", Gfx::WATER_TT), name, OpColor(line, "diffuse", Gfx::Color(1.0f, 1.0f, 1.0f, 1.0f)), - OpColor(line, "ambiant", Gfx::Color(1.0f, 1.0f, 1.0f, 1.0f)), + OpColor(line, "ambient", Gfx::Color(1.0f, 1.0f, 1.0f, 1.0f)), OpFloat(line, "level", 100.0f)*UNIT, OpFloat(line, "glint", 1.0f), pos); @@ -3978,7 +3978,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject) OpString(line, "image", name); m_cloud->Create(name, OpColor(line, "diffuse", Gfx::Color(1.0f, 1.0f, 1.0f, 1.0f)), - OpColor(line, "ambiant", Gfx::Color(1.0f, 1.0f, 1.0f, 1.0f)), + OpColor(line, "ambient", Gfx::Color(1.0f, 1.0f, 1.0f, 1.0f)), OpFloat(line, "level", 500.0f) * UNIT); } |