immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes to Scribbler interface

dev-ui
krzys-h 2013-03-27 19:55:27 +01:00
parent 0691460682
commit 8f379e5cf1
3 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/object/brain.cpp
View File

@ -1944,9 +1944,7 @@ bool CBrain::CreateInterface(bool bSelect)
void CBrain::UpdateInterface(float rTime) void CBrain::UpdateInterface(float rTime)
{ {
Ui::CWindow* pw; Ui::CWindow* pw;
/* TODO: #if _TEEN
Ui::CButton* pb; Ui::CButton* pb;
#endif*/
Ui::CGauge* pg; Ui::CGauge* pg;
Ui::CCompass* pc; Ui::CCompass* pc;
Ui::CGroup* pgr; Ui::CGroup* pgr;
@ -2058,8 +2056,7 @@ void CBrain::UpdateInterface(float rTime)
pc->SetState(Ui::STATE_VISIBLE, m_main->GetShowMap()); pc->SetState(Ui::STATE_VISIBLE, m_main->GetShowMap());
} }
#if _TEEN pb = (Ui::CButton*)pw->SearchControl(EVENT_OBJECT_REC);
pb = (CButton*)pw->SearchControl(EVENT_OBJECT_REC);
if ( pb != 0 ) if ( pb != 0 )
{ {
if ( m_bTraceRecord && Math::Mod(m_time, 0.4f) >= 0.2f ) if ( m_bTraceRecord && Math::Mod(m_time, 0.4f) >= 0.2f )
@ -2071,7 +2068,6 @@ void CBrain::UpdateInterface(float rTime)
pb->ClearState(Ui::STATE_CHECK); pb->ClearState(Ui::STATE_CHECK);
} }
} }
#endif
bOnBoard = m_camera->GetType() == Gfx::CAM_TYPE_ONBOARD; bOnBoard = m_camera->GetType() == Gfx::CAM_TYPE_ONBOARD;
@ -2151,10 +2147,8 @@ void CBrain::UpdateInterface()
Ui::CWindow* pw; Ui::CWindow* pw;
Ui::CButton* pb; Ui::CButton* pb;
Ui::CSlider* ps; Ui::CSlider* ps;
#if _TEEN Ui::CColor* pc;
CColor* pc;
int color; int color;
#endif
bool bEnable, bFly, bRun; bool bEnable, bFly, bRun;
char title[100]; char title[100];
@ -2189,7 +2183,6 @@ void CBrain::UpdateInterface()
EnableInterface(pw, EVENT_OBJECT_FIRE, bEnable); EnableInterface(pw, EVENT_OBJECT_FIRE, bEnable);
EnableInterface(pw, EVENT_OBJECT_SPIDEREXPLO, bEnable); EnableInterface(pw, EVENT_OBJECT_SPIDEREXPLO, bEnable);
EnableInterface(pw, EVENT_OBJECT_RESET, bEnable); EnableInterface(pw, EVENT_OBJECT_RESET, bEnable);
#if _TEEN
EnableInterface(pw, EVENT_OBJECT_PEN0, bEnable); EnableInterface(pw, EVENT_OBJECT_PEN0, bEnable);
EnableInterface(pw, EVENT_OBJECT_PEN1, bEnable); EnableInterface(pw, EVENT_OBJECT_PEN1, bEnable);
EnableInterface(pw, EVENT_OBJECT_PEN2, bEnable); EnableInterface(pw, EVENT_OBJECT_PEN2, bEnable);
@ -2201,7 +2194,6 @@ void CBrain::UpdateInterface()
EnableInterface(pw, EVENT_OBJECT_PEN8, bEnable); EnableInterface(pw, EVENT_OBJECT_PEN8, bEnable);
EnableInterface(pw, EVENT_OBJECT_REC, bEnable); EnableInterface(pw, EVENT_OBJECT_REC, bEnable);
EnableInterface(pw, EVENT_OBJECT_STOP, bEnable); EnableInterface(pw, EVENT_OBJECT_STOP, bEnable);
#endif
if ( type == OBJECT_HUMAN ) // builder? if ( type == OBJECT_HUMAN ) // builder?
{ {
@ -2352,7 +2344,6 @@ void CBrain::UpdateInterface()
CheckInterface(pw, EVENT_OBJECT_MFRONT, m_manipStyle==EVENT_OBJECT_MFRONT); CheckInterface(pw, EVENT_OBJECT_MFRONT, m_manipStyle==EVENT_OBJECT_MFRONT);
} }
#if _TEEN
if ( m_object->GetTraceDown() ) if ( m_object->GetTraceDown() )
{ {
pb = static_cast< Ui::CButton* >(pw->SearchControl(EVENT_OBJECT_PEN0)); pb = static_cast< Ui::CButton* >(pw->SearchControl(EVENT_OBJECT_PEN0));
@ -2452,7 +2443,6 @@ void CBrain::UpdateInterface()
pc->ClearState(Ui::STATE_CHECK); pc->ClearState(Ui::STATE_CHECK);
} }
} }
#endif
} }
// Updates the list of programs. // Updates the list of programs.

15
src/object/robotmain.cpp
View File

@ -4328,12 +4328,13 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
Math::Vector pos = OpPos(line, "pos")*g_unit; Math::Vector pos = OpPos(line, "pos")*g_unit;
float dir = OpFloat(line, "dir", 0.0f)*Math::PI; float dir = OpFloat(line, "dir", 0.0f)*Math::PI;
bool trainer = OpInt(line, "trainer", 0);
CObject* obj = CreateObject(pos, dir, CObject* obj = CreateObject(pos, dir,
OpFloat(line, "z", 1.0f), OpFloat(line, "z", 1.0f),
OpFloat(line, "h", 0.0f), OpFloat(line, "h", 0.0f),
type, type,
OpFloat(line, "power", 1.0f), OpFloat(line, "power", 1.0f),
OpInt(line, "trainer", 0), trainer,
OpInt(line, "toy", 0), OpInt(line, "toy", 0),
OpInt(line, "option", 0)); OpInt(line, "option", 0));
@ -4395,12 +4396,14 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
obj->SetShield(OpFloat(line, "shield", 1.0f)); obj->SetShield(OpFloat(line, "shield", 1.0f));
obj->SetMagnifyDamage(OpFloat(line, "magnifyDamage", 1.0f)); obj->SetMagnifyDamage(OpFloat(line, "magnifyDamage", 1.0f));
obj->SetClip(OpInt(line, "clip", 1)); obj->SetClip(OpInt(line, "clip", 1));
obj->SetCheckToken(OpInt(line, "checkToken", 1)); obj->SetCheckToken(m_version >= 2 ? trainer : OpInt(line, "manual", 1));
obj->SetManual(OpInt(line, "manual", 0)); obj->SetManual(m_version >= 2 ? !trainer : OpInt(line, "manual", 0));
Math::Vector zoom = OpDir(line, "zoom"); if(m_version >= 2) {
if (zoom.x != 0.0f || zoom.y != 0.0f || zoom.z != 0.0f) Math::Vector zoom = OpDir(line, "zoom");
obj->SetZoom(0, zoom); if (zoom.x != 0.0f || zoom.y != 0.0f || zoom.z != 0.0f)
obj->SetZoom(0, zoom);
}
CMotion* motion = obj->GetMotion(); CMotion* motion = obj->GetMotion();
if (motion != nullptr) if (motion != nullptr)

1
src/script/script.cpp
View File

@ -1210,6 +1210,7 @@ bool CScript::rProduce(CBotVar* var, CBotVar* result, int& exception, void* user
physics->SetFreeze(false); // can move physics->SetFreeze(false); // can move
} }
object->SetLock(false); // vehicle useable object->SetLock(false); // vehicle useable
object->SetManual(true);
object->SetActivity(true); object->SetActivity(true);
script->m_main->CreateShortcuts(); script->m_main->CreateShortcuts();
} }