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

First person camera unlocked for Me and Tech 

*unlocked camaera button for Me and Tech
*unlocked first ferson view for Me and Tech
*Me and Tech have no "camera view" effect like robots in first person
mode

#156
dev-time-step
Smok94 2016-04-02 14:43:40 +02:00
parent 831276f378
commit 6afdb7b6c8
2 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/level/robotmain.cpp
View File

@ -2270,7 +2270,9 @@ void CRobotMain::ChangeCamera()
ObjectType oType = obj->GetType(); ObjectType oType = obj->GetType();
Gfx::CameraType type = controllableObj->GetCameraType(); Gfx::CameraType type = controllableObj->GetCameraType();
if ( oType != OBJECT_MOBILEfa && if ( oType != OBJECT_HUMAN &&
oType != OBJECT_TECH &&
oType != OBJECT_MOBILEfa &&
oType != OBJECT_MOBILEta && oType != OBJECT_MOBILEta &&
oType != OBJECT_MOBILEwa && oType != OBJECT_MOBILEwa &&
oType != OBJECT_MOBILEia && oType != OBJECT_MOBILEia &&

49
src/ui/object_interface.cpp
View File

@ -1302,8 +1302,9 @@ bool CObjectInterface::CreateInterface(bool bSelect)
pw->CreateButton(pos, ddim, 19, EVENT_OBJECT_HELP); pw->CreateButton(pos, ddim, 19, EVENT_OBJECT_HELP);
} }
if ( type != OBJECT_HUMAN && //camera button no more disabled for humans
type != OBJECT_TECH && if ( //type != OBJECT_HUMAN &&
//type != OBJECT_TECH &&
!m_object->GetCameraLock() ) !m_object->GetCameraLock() )
{ {
//? if ( m_main->GetShowMap() ) //? if ( m_main->GetShowMap() )
@ -1396,29 +1397,33 @@ bool CObjectInterface::CreateInterface(bool bSelect)
pt->ClearState(STATE_GLINT); pt->ClearState(STATE_GLINT);
} }
ddim.x = 64.0f/640.0f; if (type != OBJECT_HUMAN &&
ddim.y = 64.0f/480.0f; type != OBJECT_TECH)
pos.x = 30.0f/640.0f; {
pos.y = 430.0f/480.0f-ddim.y; ddim.x = 64.0f / 640.0f;
pw->CreateGroup(pos, ddim, 13, EVENT_OBJECT_CORNERul); ddim.y = 64.0f / 480.0f;
pos.x = 30.0f / 640.0f;
pos.y = 430.0f / 480.0f - ddim.y;
pw->CreateGroup(pos, ddim, 13, EVENT_OBJECT_CORNERul);
ddim.x = 64.0f/640.0f; ddim.x = 64.0f / 640.0f;
ddim.y = 64.0f/480.0f; ddim.y = 64.0f / 480.0f;
pos.x = 610.0f/640.0f-ddim.x; pos.x = 610.0f / 640.0f - ddim.x;
pos.y = 430.0f/480.0f-ddim.y; pos.y = 430.0f / 480.0f - ddim.y;
pw->CreateGroup(pos, ddim, 14, EVENT_OBJECT_CORNERur); pw->CreateGroup(pos, ddim, 14, EVENT_OBJECT_CORNERur);
ddim.x = 64.0f/640.0f; ddim.x = 64.0f / 640.0f;
ddim.y = 64.0f/480.0f; ddim.y = 64.0f / 480.0f;
pos.x = 30.0f/640.0f; pos.x = 30.0f / 640.0f;
pos.y = 110.0f/480.0f; pos.y = 110.0f / 480.0f;
pw->CreateGroup(pos, ddim, 15, EVENT_OBJECT_CORNERdl); pw->CreateGroup(pos, ddim, 15, EVENT_OBJECT_CORNERdl);
ddim.x = 64.0f/640.0f; ddim.x = 64.0f / 640.0f;
ddim.y = 64.0f/480.0f; ddim.y = 64.0f / 480.0f;
pos.x = 610.0f/640.0f-ddim.x; pos.x = 610.0f / 640.0f - ddim.x;
pos.y = 110.0f/480.0f; pos.y = 110.0f / 480.0f;
pw->CreateGroup(pos, ddim, 16, EVENT_OBJECT_CORNERdr); pw->CreateGroup(pos, ddim, 16, EVENT_OBJECT_CORNERdr);
}
UpdateInterface(); UpdateInterface();
m_lastUpdateTime = 0.0f; m_lastUpdateTime = 0.0f;