diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-15 18:50:51 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-15 18:50:51 +0200 |
commit | ad6bc13dc2b70741ee3f006e321ba46dd421b9b5 (patch) | |
tree | 72540c0d47f5501f6080f7b03de600daed0a029a /src/ui/studio.cpp | |
parent | 95d2f8da2c1df9a02fc1d668f2ce9c0b64c4bf65 (diff) | |
parent | 94e7fd920353c39471d8836a8bf87ffb113f1349 (diff) | |
download | colobot-ad6bc13dc2b70741ee3f006e321ba46dd421b9b5.tar.gz colobot-ad6bc13dc2b70741ee3f006e321ba46dd421b9b5.tar.bz2 colobot-ad6bc13dc2b70741ee3f006e321ba46dd421b9b5.zip |
Merge dev-common and various fixes to achieve compilation
- merged changes from dev-common
- fixed many compilation errors (CBrain, UI, ...)
- temporarily commented out some problematic code (e.g. input bindings)
- (partially) fixed #include styling
- everything compiles except for CRobotMain, CMainDialog and CStudio
Diffstat (limited to 'src/ui/studio.cpp')
-rw-r--r-- | src/ui/studio.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/ui/studio.cpp b/src/ui/studio.cpp index 5062798..2b90b8f 100644 --- a/src/ui/studio.cpp +++ b/src/ui/studio.cpp @@ -22,6 +22,10 @@ #include <script/cbottoken.h> + +const int MAX_FNAME = 255; + + namespace Ui { @@ -36,7 +40,7 @@ CStudio::CStudio() m_event = static_cast<CEventQueue*>(m_iMan->SearchInstance(CLASS_EVENT)); m_interface = static_cast<CInterface*>(m_iMan->SearchInstance(CLASS_INTERFACE)); m_main = static_cast<CRobotMain*>(m_iMan->SearchInstance(CLASS_MAIN)); - m_camera = static_cast<CCamera*>(m_iMan->SearchInstance(CLASS_CAMERA)); + m_camera = static_cast<Gfx::CCamera*>(m_iMan->SearchInstance(CLASS_CAMERA)); m_sound = static_cast<CSoundInterface*>(m_iMan->SearchInstance(CLASS_SOUND)); m_app = CApplication::GetInstancePointer(); @@ -537,7 +541,7 @@ void CStudio::StartEditScript(CScript *script, std::string name, int rank) m_bInitPause = m_engine->GetPause(); m_main->SetSpeed(1.0f); m_editCamera = m_camera->GetType(); - m_camera->SetType(CAM_TYPE_EDIT); + m_camera->SetType(Gfx::CAM_TYPE_EDIT); m_bRunning = m_script->IsRunning(); m_bRealTime = m_bRunning; @@ -1447,8 +1451,8 @@ void CStudio::UpdateDialogPublic() CCheck* pc; CLabel* pl; char name[100]; - char dir[_MAX_FNAME]; - char text[_MAX_FNAME+100]; + char dir[MAX_FNAME]; + char text[MAX_FNAME+100]; pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW9); if ( pw == nullptr ) return; @@ -1486,8 +1490,8 @@ void CStudio::UpdateDialogList() struct _finddata_t fileBuffer; struct _finddata_t* listBuffer; bool bDo; - char dir[_MAX_FNAME]; - char temp[_MAX_FNAME]; + char dir[MAX_FNAME]; + char temp[MAX_FNAME]; int nbFilenames, i; pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW9); |