From 8ad15c0ef7d06d80abfa736295fbec3c5b005183 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Sat, 15 Sep 2012 21:47:19 +0200 Subject: CMainDialog rewrite - rewritten CMainDialog and updated CRobotMain --- src/CMakeLists.txt | 4 +- src/common/misc.cpp | 2 +- src/object/robotmain.cpp | 129 ++--- src/object/robotmain.h | 2 +- src/sound/sound.h | 20 +- src/ui/maindialog.cpp | 1284 ++++++++++++++++++++++++---------------------- src/ui/maindialog.h | 115 +++-- 7 files changed, 804 insertions(+), 752 deletions(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1297c73..2f1b954 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -125,7 +125,7 @@ object/motion/motiontoto.cpp object/motion/motionvehicle.cpp object/motion/motionworm.cpp object/object.cpp -# object/robotmain.cpp +object/robotmain.cpp object/task/task.cpp object/task/taskadvance.cpp object/task/taskbuild.cpp @@ -167,7 +167,7 @@ ui/interface.cpp ui/key.cpp ui/label.cpp ui/list.cpp -# ui/maindialog.cpp +ui/maindialog.cpp ui/mainmap.cpp ui/mainshort.cpp ui/map.cpp diff --git a/src/common/misc.cpp b/src/common/misc.cpp index 57c16f4..11f60ae 100644 --- a/src/common/misc.cpp +++ b/src/common/misc.cpp @@ -189,7 +189,7 @@ char GetToLower(char letter) // Converting time to string. -void GimeToAscii(time_t time, char *buffer) +void TimeToAscii(time_t time, char *buffer) { struct tm when; int year; diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index b521862..1c61574 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -1175,10 +1175,10 @@ bool CRobotMain::EventProcess(const Event &event) if (event.type == EVENT_KEY_DOWN) { - if (event.key.key == m_app->GetKey(KEYRANK_HELP, 0) || - event.key.key == m_app->GetKey(KEYRANK_HELP, 1) || - event.key.key == m_app->GetKey(KEYRANK_PROG, 0) || - event.key.key == m_app->GetKey(KEYRANK_PROG, 1) || + if (event.key.key == m_app->GetInputBinding(INPUT_SLOT_HELP).key /* TODO: joystick + || event.key.key == m_app->GetInputBinding(INPUT_SLOT_HELP).joy */ || + event.key.key == m_app->GetInputBinding(INPUT_SLOT_PROG).key /* TODO: joystick + || event.key.key == m_app->GetInputBinding(INPUT_SLOT_PROG).joy */ || event.key.key == KEY(ESCAPE)) { StopDisplayInfo(); @@ -1213,14 +1213,14 @@ bool CRobotMain::EventProcess(const Event &event) } if (m_editLock) // current edition? { - if (event.key.key == m_app->GetKey(KEYRANK_HELP, 0) || - event.key.key == m_app->GetKey(KEYRANK_HELP, 1)) + if (event.key.key == m_app->GetInputBinding(INPUT_SLOT_HELP).key /* TODO: joystick + || event.key.key == m_app->GetInputBinding(INPUT_SLOT_HELP).joy*/ ) { StartDisplayInfo(SATCOM_HUSTON, false); return false; } - if (event.key.key == m_app->GetKey(KEYRANK_PROG, 0) || - event.key.key == m_app->GetKey(KEYRANK_PROG, 1)) + if (event.key.key == m_app->GetInputBinding(INPUT_SLOT_PROG).key /* TODO: joystick + || event.key.key == m_app->GetInputBinding(INPUT_SLOT_PROG).joy*/) { StartDisplayInfo(SATCOM_PROG, false); return false; @@ -1229,8 +1229,8 @@ bool CRobotMain::EventProcess(const Event &event) } if (m_movieLock) // current movie? { - if (event.key.key == m_app->GetKey(KEYRANK_QUIT, 0) || - event.key.key == m_app->GetKey(KEYRANK_QUIT, 1) || + if (event.key.key == m_app->GetInputBinding(INPUT_SLOT_QUIT).key /* TODO: joystick + || event.key.key == m_app->GetInputBinding(INPUT_SLOT_QUIT).joy */ || event.key.key == KEY(ESCAPE)) { AbortMovie(); @@ -1239,21 +1239,21 @@ bool CRobotMain::EventProcess(const Event &event) } if (m_camera->GetType() == Gfx::CAM_TYPE_VISIT) { - if (event.key.key == m_app->GetKey(KEYRANK_VISIT, 0) || - event.key.key == m_app->GetKey(KEYRANK_VISIT, 1)) + if (event.key.key == m_app->GetInputBinding(INPUT_SLOT_VISIT).key /* TODO: joystick + || event.key.key == m_app->GetInputBinding(INPUT_SLOT_VISIT).joy*/) { StartDisplayVisit(EVENT_NULL); } - if (event.key.key == m_app->GetKey(KEYRANK_QUIT, 0) || - event.key.key == m_app->GetKey(KEYRANK_QUIT, 1) || + if (event.key.key == m_app->GetInputBinding(INPUT_SLOT_QUIT).key /* TODO: joystick + || event.key.key == m_app->GetInputBinding(INPUT_SLOT_QUIT).joy */ || event.key.key == KEY(ESCAPE)) { StopDisplayVisit(); } return false; } - if (event.key.key == m_app->GetKey(KEYRANK_QUIT, 0) || - event.key.key == m_app->GetKey(KEYRANK_QUIT, 1)) + if (event.key.key == m_app->GetInputBinding(INPUT_SLOT_QUIT).key /* TODO: joystick + || event.key.key == m_app->GetInputBinding(INPUT_SLOT_QUIT).joy*/) { if (m_movie->IsExist()) StartDisplayInfo(SATCOM_HUSTON, false); @@ -1273,55 +1273,55 @@ bool CRobotMain::EventProcess(const Event &event) ChangePause(!m_engine->GetPause()); } } - if (event.key.key == m_app->GetKey(KEYRANK_CAMERA, 0) || - event.key.key == m_app->GetKey(KEYRANK_CAMERA, 1)) + if (event.key.key == m_app->GetInputBinding(INPUT_SLOT_CAMERA).key /* TODO: joystick + || event.key.key == m_app->GetInputBinding(INPUT_SLOT_CAMERA).joy*/) { ChangeCamera(); } - if (event.key.key == m_app->GetKey(KEYRANK_DESEL, 0) || - event.key.key == m_app->GetKey(KEYRANK_DESEL, 1)) + if (event.key.key == m_app->GetInputBinding(INPUT_SLOT_DESEL).key /* TODO: joystick + || event.key.key == m_app->GetInputBinding(INPUT_SLOT_DESEL).joy*/) { if (m_shortCut) DeselectObject(); } - if (event.key.key == m_app->GetKey(KEYRANK_HUMAN, 0) || - event.key.key == m_app->GetKey(KEYRANK_HUMAN, 1)) + if (event.key.key == m_app->GetInputBinding(INPUT_SLOT_HUMAN).key /* TODO: joystick + || event.key.key == m_app->GetInputBinding(INPUT_SLOT_HUMAN).joy*/) { SelectHuman(); } - if (event.key.key == m_app->GetKey(KEYRANK_NEXT, 0) || - event.key.key == m_app->GetKey(KEYRANK_NEXT, 1)) + if (event.key.key == m_app->GetInputBinding(INPUT_SLOT_NEXT).key /* TODO: joystick + || event.key.key == m_app->GetInputBinding(INPUT_SLOT_NEXT).joy*/) { if (m_shortCut) m_short->SelectNext(); } - if (event.key.key == m_app->GetKey(KEYRANK_HELP, 0) || - event.key.key == m_app->GetKey(KEYRANK_HELP, 1)) + if (event.key.key == m_app->GetInputBinding(INPUT_SLOT_HELP).key /* TODO: joystick + || event.key.key == m_app->GetInputBinding(INPUT_SLOT_HELP).joy*/) { StartDisplayInfo(SATCOM_HUSTON, true); } - if (event.key.key == m_app->GetKey(KEYRANK_PROG, 0) || - event.key.key == m_app->GetKey(KEYRANK_PROG, 1)) + if (event.key.key == m_app->GetInputBinding(INPUT_SLOT_PROG).key /* TODO: joystick + || event.key.key == m_app->GetInputBinding(INPUT_SLOT_PROG).joy*/) { StartDisplayInfo(SATCOM_PROG, true); } - if (event.key.key == m_app->GetKey(KEYRANK_VISIT, 0) || - event.key.key == m_app->GetKey(KEYRANK_VISIT, 1)) + if (event.key.key == m_app->GetInputBinding(INPUT_SLOT_VISIT).key /* TODO: joystick + || event.key.key == m_app->GetInputBinding(INPUT_SLOT_VISIT).joy*/) { StartDisplayVisit(EVENT_NULL); } - if (event.key.key == m_app->GetKey(KEYRANK_SPEED10, 0) || - event.key.key == m_app->GetKey(KEYRANK_SPEED10, 1)) + if (event.key.key == m_app->GetInputBinding(INPUT_SLOT_SPEED10).key /* TODO: joystick + || event.key.key == m_app->GetInputBinding(INPUT_SLOT_SPEED10).joy*/) { SetSpeed(1.0f); } - if (event.key.key == m_app->GetKey(KEYRANK_SPEED15, 0) || - event.key.key == m_app->GetKey(KEYRANK_SPEED15, 1)) + if (event.key.key == m_app->GetInputBinding(INPUT_SLOT_SPEED15).key /* TODO: joystick + || event.key.key == m_app->GetInputBinding(INPUT_SLOT_SPEED15).joy*/) { SetSpeed(1.5f); } - if (event.key.key == m_app->GetKey(KEYRANK_SPEED20, 0) || - event.key.key == m_app->GetKey(KEYRANK_SPEED20, 1)) + if (event.key.key == m_app->GetInputBinding(INPUT_SLOT_SPEED20).key /* TODO: joystick + || event.key.key == m_app->GetInputBinding(INPUT_SLOT_SPEED20).joy*/) { SetSpeed(2.0f); } @@ -2694,12 +2694,11 @@ void CRobotMain::HiliteObject(Math::Point pos) CObject* obj = m_short->DetectShort(pos); - char name[100]; - - if (m_dialog->GetTooltip() && m_interface->GetTooltip(pos, name)) + std::string nameStr; + if (m_dialog->GetTooltip() && m_interface->GetTooltip(pos, nameStr)) { m_tooltipPos = pos; - strcpy(m_tooltipName, name); + strcpy(m_tooltipName, nameStr.c_str()); m_tooltipTime = 0.0f; if (obj == nullptr) return; } @@ -2722,6 +2721,7 @@ void CRobotMain::HiliteObject(Math::Point pos) } } + char name[100]; if (obj != nullptr) { if (m_dialog->GetTooltip() && obj->GetTooltipName(name)) @@ -2734,8 +2734,8 @@ void CRobotMain::HiliteObject(Math::Point pos) if (IsSelectable(obj)) { obj->SetHilite(true); - m_map->SetHilite(obj); - m_short->SetHilite(obj); + m_map->SetHighlight(obj); + m_short->SetHighlight(obj); m_hilite = true; } } @@ -2903,26 +2903,26 @@ void CRobotMain::KeyCamera(EventType type, long key) if (type == EVENT_KEY_UP) { - if (key == m_app->GetKey(KEYRANK_LEFT, 0) || - key == m_app->GetKey(KEYRANK_LEFT, 1)) + if (key == m_app->GetInputBinding(INPUT_SLOT_LEFT).key /* TODO: joystick + || key == m_app->GetInputBinding(INPUT_SLOT_LEFT).joy*/) { m_cameraPan = 0.0f; } - if (key == m_app->GetKey(KEYRANK_RIGHT, 0) || - key == m_app->GetKey(KEYRANK_RIGHT, 1)) + if (key == m_app->GetInputBinding(INPUT_SLOT_RIGHT).key /* TODO: joystick + || key == m_app->GetInputBinding(INPUT_SLOT_RIGHT).joy*/) { m_cameraPan = 0.0f; } - if (key == m_app->GetKey(KEYRANK_UP, 0) || - key == m_app->GetKey(KEYRANK_UP, 1)) + if (key == m_app->GetInputBinding(INPUT_SLOT_UP).key /* TODO: joystick + || key == m_app->GetInputBinding(INPUT_SLOT_UP).joy*/ ) { m_cameraZoom = 0.0f; } - if (key == m_app->GetKey(KEYRANK_DOWN, 0) || - key == m_app->GetKey(KEYRANK_DOWN, 1)) + if (key == m_app->GetInputBinding(INPUT_SLOT_DOWN).key /* TODO: joystick + || key == m_app->GetInputBinding(INPUT_SLOT_DOWN).joy*/ ) { m_cameraZoom = 0.0f; } @@ -2938,26 +2938,26 @@ void CRobotMain::KeyCamera(EventType type, long key) if (type == EVENT_KEY_DOWN) { - if (key == m_app->GetKey(KEYRANK_LEFT, 0) || - key == m_app->GetKey(KEYRANK_LEFT, 1)) + if (key == m_app->GetInputBinding(INPUT_SLOT_LEFT).key /* TODO: joystick + || key == m_app->GetInputBinding(INPUT_SLOT_LEFT).joy*/) { m_cameraPan = -1.0f; } - if (key == m_app->GetKey(KEYRANK_RIGHT, 0) || - key == m_app->GetKey(KEYRANK_RIGHT, 1)) + if (key == m_app->GetInputBinding(INPUT_SLOT_RIGHT).key /* TODO: joystick + || key == m_app->GetInputBinding(INPUT_SLOT_RIGHT).joy*/) { m_cameraPan = 1.0f; } - if (key == m_app->GetKey(KEYRANK_UP, 0) || - key == m_app->GetKey(KEYRANK_UP, 1)) + if (key == m_app->GetInputBinding(INPUT_SLOT_UP).key /* TODO: joystick + || key == m_app->GetInputBinding(INPUT_SLOT_UP).joy*/) { m_cameraZoom = -1.0f; } - if (key == m_app->GetKey(KEYRANK_DOWN, 0) || - key == m_app->GetKey(KEYRANK_DOWN, 1)) + if (key == m_app->GetInputBinding(INPUT_SLOT_DOWN).key /* TODO: joystick + || key == m_app->GetInputBinding(INPUT_SLOT_DOWN).joy*/) { m_cameraZoom = 1.0f; } @@ -3588,15 +3588,16 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject) } } - sprintf(op, "Title.%c", GetLanguageLetter()); + // TODO: language letters + sprintf(op, "Title.%c", 'E' /*GetLanguageLetter()*/); if (Cmd(line, op) && !resetObject) OpString(line, "text", m_title); - sprintf(op, "Resume.%c", GetLanguageLetter()); + sprintf(op, "Resume.%c", 'E' /*GetLanguageLetter()*/); if (Cmd(line, op) && !resetObject) OpString(line, "text", m_resume); - sprintf(op, "ScriptName.%c", GetLanguageLetter()); + sprintf(op, "ScriptName.%c", 'E' /*GetLanguageLetter()*/); if (Cmd(line, op) && !resetObject) OpString(line, "text", m_scriptName); @@ -4266,7 +4267,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject) CreateShortcuts(); m_map->UpdateMap(); // TODO: m_engine->TimeInit(); ?? - m_app->FlushPressKey(); + m_app->ResetKeyStates(); m_time = 0.0f; m_gameTime = 0.0f; m_checkEndTime = 0.0f; @@ -6416,7 +6417,7 @@ void CRobotMain::SetSpeed(float speed) float CRobotMain::GetSpeed() { - return m_engine->GetSpeed(); + return m_app->GetSimulationSpeed(); } @@ -6486,7 +6487,7 @@ void CRobotMain::SetEditLock(bool lock, bool edit) m_map->ShowMap(!m_editLock && m_mapShow); m_displayText->HideText(lock); - m_app->FlushPressKey(); + m_app->ResetKeyStates(); if (m_editLock) HiliteClear(); diff --git a/src/object/robotmain.h b/src/object/robotmain.h index fead48d..db96016 100644 --- a/src/object/robotmain.h +++ b/src/object/robotmain.h @@ -309,7 +309,7 @@ protected: void HiliteClear(); void HiliteObject(Math::Point pos); void HiliteFrame(float rTime); - void CreateTooltip(Math::Point pos, char* text); + void CreateTooltip(Math::Point pos, const char* text); void ClearTooltip(); CObject* DetectObject(Math::Point pos); void ChangeCamera(); diff --git a/src/sound/sound.h b/src/sound/sound.h index 45ec7e1..566efd5 100644 --- a/src/sound/sound.h +++ b/src/sound/sound.h @@ -175,45 +175,45 @@ class CSoundInterface : public CPluginInterface */ virtual bool Cache(Sound bSound, std::string bFile) = 0; - /** Return if plugin is enabled + /** Geturn if plugin is enabled * @return return true if plugin is enabled */ - virtual bool RetEnable() = 0; + virtual bool GetEnable() = 0; /** Change sound mode to 2D/3D * @param bool bMode - true to enable 3D sound */ virtual void SetSound3D(bool bMode) = 0; - /** Return if we use 3D sound + /** Geturn if we use 3D sound * @return true if we have 3D sound enabled */ - virtual bool RetSound3D() = 0; + virtual bool GetSound3D() = 0; - /** Return if we have 3D sound capable card + /** Geturn if we have 3D sound capable card * @return true for 3D sound support */ - virtual bool RetSound3DCap() = 0; + virtual bool GetSound3DCap() = 0; /** Change global sound volume * @param int volume - range from 0 to MAXVOLUME */ virtual void SetAudioVolume(int volume) = 0; - /** Return global sound volume + /** Geturn global sound volume * @return global volume as int in range from 0 to MAXVOLUME */ - virtual int RetAudioVolume() = 0; + virtual int GetAudioVolume() = 0; /** Set music volume * @param int volume - range from 0 to MAXVOLUME */ virtual void SetMusicVolume(int volume) = 0; - /** Return music volume + /** Geturn music volume * @return music volume as int in range from 0 to MAXVOLUME */ - virtual int RetMusicVolume() = 0; + virtual int GetMusicVolume() = 0; /** Set listener position * @param Math::Vector eye - position of listener diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp index 84a4871..c6b70cb 100644 --- a/src/ui/maindialog.cpp +++ b/src/ui/maindialog.cpp @@ -8,7 +8,7 @@ // * // * This program is distributed in the hope that it will be useful, // * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * MERCHANTABILITY or FITNESS FOR A Gfx::PARTICULAR PURPOSE. See the // * GNU General Public License for more details. // * // * You should have received a copy of the GNU General Public License @@ -16,6 +16,7 @@ // maindialog.cpp +#include "ui/maindialog.h" #include "common/global.h" #include "common/event.h" @@ -23,6 +24,9 @@ #include "common/profile.h" #include "common/iman.h" #include "common/restext.h" +#include "object/robotmain.h" +#include "script/cmdtoken.h" +#include "sound/sound.h" #include "ui/interface.h" #include "ui/button.h" #include "ui/color.h" @@ -37,19 +41,20 @@ #include "ui/window.h" #include "ui/edit.h" #include "ui/editvalue.h" -#include "script/cmdtoken.h" -#include "object/robotmain.h" -#include "ui/maindialog.h" +#include +#include +namespace Ui +{ + const int KEY_VISIBLE = 6; // number of visible keys redefinable -#if _SCHOOL & _TEEN +/*TODO: #if _SCHOOL & _TEEN const int KEY_TOTAL = 13; // total number of keys redefinable -#else +#else*/ const int KEY_TOTAL = 21; // total number of keys redefinable -#endif const int WELCOME_LENGTH = 6.0f; @@ -93,7 +98,7 @@ static int perso_color[3*10*3] = }; -#if _NET +/* TODO: ? #if _NET // Check if the key "school" is present in the registry. bool SchoolCheck() @@ -122,24 +127,24 @@ bool SchoolCheck() return true; } #endif - +*/ // Constructor of robot application. CMainDialog::CMainDialog(CInstanceManager* iMan) { - int i; - m_iMan = iMan; m_iMan->AddInstance(CLASS_DIALOG, this); + m_app = CApplication::GetInstancePointer(); + m_main = (CRobotMain*)m_iMan->SearchInstance(CLASS_MAIN); m_interface = (CInterface*)m_iMan->SearchInstance(CLASS_INTERFACE); - m_event = (CEvent*)m_iMan->SearchInstance(CLASS_EVENT); - m_engine = (CD3DEngine*)m_iMan->SearchInstance(CLASS_ENGINE); - m_particule = (CParticule*)m_iMan->SearchInstance(CLASS_PARTICULE); - m_camera = (CCamera*)m_iMan->SearchInstance(CLASS_CAMERA); - m_sound = (CSound*)m_iMan->SearchInstance(CLASS_SOUND); + m_eventQueue = (CEventQueue*)m_iMan->SearchInstance(CLASS_EVENT); + m_engine = (Gfx::CEngine*)m_iMan->SearchInstance(CLASS_ENGINE); + m_particle = (Gfx::CParticle*)m_iMan->SearchInstance(CLASS_PARTICULE); + m_camera = (Gfx::CCamera*)m_iMan->SearchInstance(CLASS_CAMERA); + m_sound = (CSoundInterface*)m_iMan->SearchInstance(CLASS_SOUND); m_phase = PHASE_NAME; m_phaseSetup = PHASE_SETUPg; @@ -150,18 +155,18 @@ CMainDialog::CMainDialog(CInstanceManager* iMan) m_sceneRank = 0; m_bSceneSoluce = false; m_bSimulSetup = false; -#if _NET +/* TODO: ? #if _NET m_accessEnable = SchoolCheck(); m_accessMission= false; m_accessUser = false; -#else +#else*/ m_accessEnable = true; m_accessMission= true; m_accessUser = true; -#endif + m_bDeleteGamer = true; - for ( i=0 ; i<10 ; i++ ) + for (int i = 0; i < 10; i++) { m_chap[i] = 0; m_sel[i] = 0; @@ -169,7 +174,7 @@ CMainDialog::CMainDialog(CInstanceManager* iMan) m_index = 0; m_maxList = 0; - ZeroMemory(&m_perso, sizeof(GamerPerso)); + memset(&m_perso, 0, sizeof(GamerPerso)); DefPerso(); m_bTooltip = true; @@ -179,11 +184,11 @@ CMainDialog::CMainDialog(CInstanceManager* iMan) m_bMovies = true; m_bNiceReset = true; m_bHimselfDamage = true; -#if _TEEN +/* TODO: #if _TEEN m_bCameraScroll = false; -#else +#else*/ m_bCameraScroll = true; -#endif + m_bCameraInvertX = false; m_bCameraInvertY = false; m_bEffect = true; @@ -192,7 +197,7 @@ CMainDialog::CMainDialog(CInstanceManager* iMan) m_glintMouse = Math::Point(0.0f, 0.0f); m_glintTime = 1000.0f; - for ( i=0 ; i<10 ; i++ ) + for (int i = 0; i < 10; i++) { m_partiPhase[i] = 0; m_partiTime[i] = 0.0f; @@ -236,9 +241,9 @@ void CMainDialog::ChangePhase(Phase phase) char* gamer; int res, i, j; - m_camera->SetType(CAMERA_DIALOG); + m_camera->SetType(Gfx::CAM_TYPE_DIALOG); m_engine->SetOverFront(false); - m_engine->SetOverColor(RetColor(0.0f), D3DSTATETCb); + m_engine->SetOverColor(Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::ENG_RSTATE_TCOLOR_BLACK); // TODO: color ok? if ( phase == PHASE_TERM ) { @@ -260,11 +265,11 @@ void CMainDialog::ChangePhase(Phase phase) pos.y = 0.10f; ddim.x = 0.30f; ddim.y = 0.80f; -#if _TEEN +/* TODO: #if _TEEN pw = m_interface->CreateWindows(pos, ddim, 12, EVENT_WINDOW5); -#else +#else*/ pw = m_interface->CreateWindows(pos, ddim, 10, EVENT_WINDOW5); -#endif + GetResource(RES_TEXT, RT_TITLE_INIT, name); pw->SetName(name); @@ -279,7 +284,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.y = 0.30f; pw->CreateGroup(pos, ddim, 4, EVENT_INTERFACE_GLINTr); // blue corner -#if _SCHOOL +/* TODO: #if _SCHOOL ddim.x = 0.20f; ddim.y = dim.y*2.4f; pos.x = 0.40f; @@ -293,7 +298,7 @@ void CMainDialog::ChangePhase(Phase phase) pos.y = oy+sy*1.9f; pg = pw->CreateGroup(pos, ddim, 26, EVENT_LABEL1); // red pg->SetState(STATE_SHADOW); -#else +#else */ ddim.x = 0.20f; ddim.y = dim.y*2.4f; pos.x = 0.40f; @@ -313,9 +318,8 @@ void CMainDialog::ChangePhase(Phase phase) pos.y = oy+sy*1.9f; pg = pw->CreateGroup(pos, ddim, 26, EVENT_LABEL1); // red pg->SetState(STATE_SHADOW); -#endif -#if _SCHOOL +/* TODO: #if _SCHOOL ddim.x = 0.18f; ddim.y = dim.y*1; pos.x = 0.41f; @@ -333,7 +337,7 @@ void CMainDialog::ChangePhase(Phase phase) pb->ClearState(STATE_ENABLE); #endif pb->SetState(STATE_SHADOW); -#else +#else */ ddim.x = 0.18f; ddim.y = dim.y*1; pos.x = 0.41f; @@ -356,14 +360,15 @@ void CMainDialog::ChangePhase(Phase phase) pos.y = oy+sy*6.9f; pb = pw->CreateButton(pos, ddim, -1, EVENT_INTERFACE_DEFI); pb->SetState(STATE_SHADOW); -#endif - if ( m_engine->RetSetupMode() ) + + /* TODO: setup mode? + if ( m_engine->GetSetupMode() ) { pos.y = oy+sy*5.1f; pb = pw->CreateButton(pos, ddim, -1, EVENT_INTERFACE_SETUP); pb->SetState(STATE_SHADOW); - } + } */ pos.y = oy+sy*4.0f; pb = pw->CreateButton(pos, ddim, -1, EVENT_INTERFACE_NAME); @@ -373,22 +378,22 @@ void CMainDialog::ChangePhase(Phase phase) pb = pw->CreateButton(pos, ddim, -1, EVENT_INTERFACE_QUIT); pb->SetState(STATE_SHADOW); -#if !_DEMO & !_SCHOOL +// TODO: #if !_DEMO & !_SCHOOL if ( m_accessEnable && m_accessUser ) { pos.x = 447.0f/640.0f; pos.y = 313.0f/480.0f; ddim.x = 0.09f; -#if _POLISH +/*#if _POLISH pos.x -= 5.0f/640.0f; ddim.x += 10.0f/640.0f; -#endif +#endif*/ pb = pw->CreateButton(pos, ddim, -1, EVENT_INTERFACE_USER); pb->SetState(STATE_SHADOW); } -#endif +// #endif - if ( m_engine->RetDebugMode() ) + if ( m_app->GetDebugMode() ) { pos.x = 139.0f/640.0f; pos.y = 313.0f/480.0f; @@ -404,19 +409,16 @@ void CMainDialog::ChangePhase(Phase phase) pg = pw->CreateGroup(pos, ddim, 1, EVENT_LABEL1); pg->SetState(STATE_SHADOW); pos.y -= 5.0f/480.0f; -#if _WG - pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL1, " "); -#else -#if _NEWLOOK - pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL1, "www.epsitec.ch"); -#else - pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL1, "www.ceebot.com"); -#endif -#endif - pl->SetFontType(FONT_COURIER); + pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL1, "PPC Team"); + pl->SetFontType(Gfx::FONT_COURIER); pl->SetFontSize(8.0f); - m_engine->SetBackground("inter01.tga", 0,0, 0,0, true, true); + m_engine->SetBackground("inter01.png", + 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), + true, true); m_engine->SetBackForce(true); } @@ -430,7 +432,7 @@ void CMainDialog::ChangePhase(Phase phase) GetResource(RES_TEXT, RT_TITLE_NAME, name); pw->SetName(name); -#if _NEWLOOK +/* TODO: #if _NEWLOOK pos.x = 80.0f/640.0f; pos.y = 93.0f/480.0f; ddim.x = 285.0f/640.0f; @@ -441,7 +443,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.x = 188.0f/640.0f; pg = pw->CreateGroup(pos, ddim, 26, EVENT_LABEL1); // violet pg->SetState(STATE_SHADOW); -#endif +#endif*/ pos.x = 0.10f; pos.y = 0.40f; @@ -460,7 +462,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.y = 32.0f/480.0f; GetResource(RES_EVENT, EVENT_INTERFACE_NLABEL, name); pl = pw->CreateLabel(pos, ddim, -1, EVENT_INTERFACE_NLABEL, name); - pl->SetJustif(-1); + pl->SetTextAlign(Gfx::TEXT_ALIGN_RIGHT); pos.x = 200.0f/640.0f; pos.y = 320.0f/480.0f; @@ -475,7 +477,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.y = 18.0f/480.0f; pe = pw->CreateEdit(pos, ddim, 0, EVENT_INTERFACE_NEDIT); pe->SetMaxChar(15); - gamer = m_main->RetGamerName(); + gamer = m_main->GetGamerName(); if ( gamer[0] == 0 ) { GetResource(RES_TEXT, RT_NAME_DEFAULT, name); @@ -495,14 +497,14 @@ void CMainDialog::ChangePhase(Phase phase) pb = pw->CreateButton(pos, ddim, -1, EVENT_INTERFACE_NOK); pb->SetState(STATE_SHADOW); -#if !_TEEN +/* TODO: #if !_TEEN pos.x = 380.0f/640.0f; pos.y = 250.0f/480.0f; ddim.x =100.0f/640.0f; ddim.y = 52.0f/480.0f; pb = pw->CreateButton(pos, ddim, -1, EVENT_INTERFACE_PERSO); pb->SetState(STATE_SHADOW); -#endif +#endif*/ pos.x = 200.0f/640.0f; pos.y = 150.0f/480.0f; @@ -533,7 +535,12 @@ void CMainDialog::ChangePhase(Phase phase) UpdateNameControl(); UpdateNameFace(); - m_engine->SetBackground("inter01.tga", 0,0, 0,0, true, true); + m_engine->SetBackground("inter01.png", + 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), + true, true); m_engine->SetBackForce(true); } @@ -547,14 +554,14 @@ void CMainDialog::ChangePhase(Phase phase) GetResource(RES_TEXT, RT_TITLE_PERSO, name); pw->SetName(name); -#if _NEWLOOK +/* TODO: #if _NEWLOOK pos.x = 95.0f/640.0f; pos.y = 66.0f/480.0f; ddim.x = 443.0f/640.0f; ddim.y = 42.0f/480.0f; pg = pw->CreateGroup(pos, ddim, 26, EVENT_LABEL1); // violet pg->SetState(STATE_SHADOW); -#endif +#endif*/ pos.x = 0.10f; pos.y = 0.40f; @@ -612,7 +619,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.x = 200.0f/640.0f; ddim.y = 16.0f/480.0f; pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL11, ""); - pl->SetJustif(1); + pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT); pos.x = 340.0f/640.0f; pos.y = 312.0f/480.0f; @@ -636,7 +643,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.x = 200.0f/640.0f; ddim.y = 16.0f/480.0f; pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL12, ""); - pl->SetJustif(1); + pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT); pos.x = 340.0f/640.0f; pos.y = 240.0f/480.0f; @@ -645,7 +652,7 @@ void CMainDialog::ChangePhase(Phase phase) for ( i=0 ; i<6 ; i++ ) { int ti[6] = {11, 179, 180, 181, 182, 183}; - pb = pw->CreateButton(pos, ddim, ti[i], (EventMsg)(EVENT_INTERFACE_PGLASS0+i)); + pb = pw->CreateButton(pos, ddim, ti[i], (EventType)(EVENT_INTERFACE_PGLASS0+i)); pb->SetState(STATE_SHADOW); pos.x += (30.0f+2.8f)/640.0f; } @@ -656,7 +663,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.x = 200.0f/640.0f; ddim.y = 16.0f/480.0f; pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL14, ""); - pl->SetJustif(1); + pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT); pos.y = 282.0f/480.0f; ddim.x = 18.0f/640.0f; @@ -666,7 +673,7 @@ void CMainDialog::ChangePhase(Phase phase) pos.x = 340.0f/640.0f; for ( i=0 ; i<3 ; i++ ) { - pco = pw->CreateColor(pos, ddim, -1, (EventMsg)(EVENT_INTERFACE_PC0a+j*3+i)); + pco = pw->CreateColor(pos, ddim, -1, (EventType)(EVENT_INTERFACE_PC0a+j*3+i)); pco->SetState(STATE_SHADOW); pos.x += 20.0f/640.0f; } @@ -679,7 +686,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.y = 18.0f/480.0f; for ( i=0 ; i<3 ; i++ ) { - psl = pw->CreateSlider(pos, ddim, 0, (EventMsg)(EVENT_INTERFACE_PCRa+i)); + psl = pw->CreateSlider(pos, ddim, 0, (EventType)(EVENT_INTERFACE_PCRa+i)); psl->SetState(STATE_SHADOW); psl->SetLimit(0.0f, 255.0f); psl->SetArrowStep(16.0f); @@ -692,7 +699,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.x = 200.0f/640.0f; ddim.y = 16.0f/480.0f; pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL13, ""); - pl->SetJustif(1); + pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT); pos.y = 174.0f/480.0f; ddim.x = 18.0f/640.0f; @@ -702,7 +709,7 @@ void CMainDialog::ChangePhase(Phase phase) pos.x = 340.0f/640.0f; for ( i=0 ; i<3 ; i++ ) { - pco = pw->CreateColor(pos, ddim, -1, (EventMsg)(EVENT_INTERFACE_PC0b+j*3+i)); + pco = pw->CreateColor(pos, ddim, -1, (EventType)(EVENT_INTERFACE_PC0b+j*3+i)); pco->SetState(STATE_SHADOW); pos.x += 20.0f/640.0f; } @@ -715,7 +722,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.y = 18.0f/480.0f; for ( i=0 ; i<3 ; i++ ) { - psl = pw->CreateSlider(pos, ddim, 0, (EventMsg)(EVENT_INTERFACE_PCRb+i)); + psl = pw->CreateSlider(pos, ddim, 0, (EventType)(EVENT_INTERFACE_PCRb+i)); psl->SetState(STATE_SHADOW); psl->SetLimit(0.0f, 255.0f); psl->SetArrowStep(16.0f); @@ -788,7 +795,7 @@ void CMainDialog::ChangePhase(Phase phase) { strcpy(m_sceneName, "scene"); ReadGamerInfo(); - m_accessChap = RetChapPassed(); + m_accessChap = GetChapPassed(); } if ( m_phase == PHASE_TRAINER ) strcpy(m_sceneName, "train"); @@ -817,7 +824,7 @@ void CMainDialog::ChangePhase(Phase phase) GetResource(RES_TEXT, res, name); pw->SetName(name); -#if _NEWLOOK +/* TODO: #if _NEWLOOK pos.x = 100.0f/640.0f; pos.y = 226.0f/480.0f; ddim.x = 216.0f/640.0f; @@ -838,7 +845,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.y = 42.0f/480.0f; pg = pw->CreateGroup(pos, ddim, 26, EVENT_LABEL1); // violet pg->SetState(STATE_SHADOW); -#endif +#endif */ pos.x = 0.10f; pos.y = 0.40f; @@ -865,7 +872,7 @@ void CMainDialog::ChangePhase(Phase phase) if ( m_phase == PHASE_PROTO ) res = RT_PLAY_CHAPp; GetResource(RES_TEXT, res, name); pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL11, name); - pl->SetJustif(1); + pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT); pos.y = oy+sy*6.7f; ddim.y = dim.y*4.5f; @@ -889,7 +896,7 @@ void CMainDialog::ChangePhase(Phase phase) if ( m_phase == PHASE_PROTO ) res = RT_PLAY_LISTp; GetResource(RES_TEXT, res, name); pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL12, name); - pl->SetJustif(1); + pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT); pos.y = oy+sy*6.7f; ddim.y = dim.y*4.5f; @@ -898,8 +905,8 @@ void CMainDialog::ChangePhase(Phase phase) pli->SetState(STATE_SHADOW); UpdateSceneList(m_chap[m_index], m_sel[m_index]); if ( m_phase != PHASE_USER ) pli->SetState(STATE_EXTEND); - pos = pli->RetPos(); - ddim = pli->RetDim(); + pos = pli->GetPos(); + ddim = pli->GetDim(); // Displays the summary: pos.x = ox+sx*3; @@ -908,7 +915,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.y = dim.y*0.6f; GetResource(RES_TEXT, RT_PLAY_RESUME, name); pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL13, name); - pl->SetJustif(1); + pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT); pos.x = ox+sx*3; pos.y = oy+sy*3.6f; @@ -980,7 +987,12 @@ void CMainDialog::ChangePhase(Phase phase) pb = pw->CreateButton(pos, ddim, -1, EVENT_INTERFACE_BACK); pb->SetState(STATE_SHADOW); - m_engine->SetBackground("inter01.tga", 0,0, 0,0, true, true); + m_engine->SetBackground("inter01.png", + 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), + true, true); m_engine->SetBackForce(true); } @@ -1047,7 +1059,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.y = 0.05f; pw->CreateGroup(pos, ddim, 3, EVENT_NULL); // transparent -> gray -#if _NEWLOOK +/* TODO: #if _NEWLOOK if ( m_phase == PHASE_SETUPd || // setup/display ? m_phase == PHASE_SETUPds ) { @@ -1119,7 +1131,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.y = 42.0f/480.0f; pg = pw->CreateGroup(pos, ddim, 26, EVENT_LABEL1); // violet pg->SetState(STATE_SHADOW); -#endif +#endif */ ddim.x = 0.78f/5-0.01f; ddim.y = 0.06f; @@ -1174,7 +1186,12 @@ void CMainDialog::ChangePhase(Phase phase) if ( !m_bSimulSetup ) { - m_engine->SetBackground("inter01.tga", 0,0, 0,0, true, true); + m_engine->SetBackground("inter01.png", + 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), + true, true); m_engine->SetBackForce(true); } } @@ -1188,7 +1205,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.y = dim.y*1; GetResource(RES_TEXT, RT_SETUP_DEVICE, name); pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL1, name); - pl->SetJustif(1); + pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT); pos.x = ox+sx*3; pos.y = oy+sy*5.2f; @@ -1204,9 +1221,9 @@ void CMainDialog::ChangePhase(Phase phase) ddim.y = dim.y*1; GetResource(RES_TEXT, RT_SETUP_MODE, name); pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL2, name); - pl->SetJustif(1); + pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT); - m_setupFull = m_engine->RetFullScreen(); + m_setupFull = m_app->GetVideoConfig().fullScreen; pos.x = ox+sx*10; pos.y = oy+sy*5.2f; ddim.x = dim.x*6; @@ -1247,7 +1264,8 @@ void CMainDialog::ChangePhase(Phase phase) { pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_GROUND); pc->SetState(STATE_SHADOW); - if ( m_engine->IsVideo8MB() ) pc->ClearState(STATE_ENABLE); + // TODO: video 8 MB? + //if ( m_engine->IsVideo8MB() ) pc->ClearState(STATE_ENABLE); } pos.y -= 0.048f; pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_DIRTY); @@ -1255,7 +1273,8 @@ void CMainDialog::ChangePhase(Phase phase) pos.y -= 0.048f; pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_SKY); pc->SetState(STATE_SHADOW); - if ( m_engine->IsVideo8MB() ) pc->ClearState(STATE_ENABLE); + // TODO: video 8 MB? + //if ( m_engine->IsVideo8MB() ) pc->ClearState(STATE_ENABLE); pos.y -= 0.048f; pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_LENS); pc->SetState(STATE_SHADOW); @@ -1285,7 +1304,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.x = 0.40f; GetResource(RES_EVENT, EVENT_INTERFACE_PARTI, name); pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL10, name); - pl->SetJustif(1); + pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT); pos.x = ox+sx*8.5f; pos.y = 0.59f; @@ -1300,7 +1319,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.x = 0.40f; GetResource(RES_EVENT, EVENT_INTERFACE_CLIP, name); pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL11, name); - pl->SetJustif(1); + pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT); pos.x = ox+sx*8.5f; pos.y = 0.53f; @@ -1315,7 +1334,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.x = 0.40f; GetResource(RES_EVENT, EVENT_INTERFACE_DETAIL, name); pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL12, name); - pl->SetJustif(1); + pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT); if ( !m_bSimulSetup ) { @@ -1332,7 +1351,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.x = 0.40f; GetResource(RES_EVENT, EVENT_INTERFACE_GADGET, name); pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL13, name); - pl->SetJustif(1); + pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT); } #if 0 @@ -1353,7 +1372,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.x = 0.40f; GetResource(RES_EVENT, EVENT_INTERFACE_TEXTURE, name); pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL14, name); - pl->SetJustif(1); + pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT); } #endif @@ -1361,10 +1380,10 @@ void CMainDialog::ChangePhase(Phase phase) ddim.y = dim.y*1; pos.x = ox+sx*10; pos.y = oy+sy*2; -#if _POLISH +/* TODO: #if _POLISH ddim.x += 20.0f/640.0f; pos.x -= 20.0f/640.0f*3.0f; -#endif +#endif*/ pb = pw->CreateButton(pos, ddim, -1, EVENT_INTERFACE_MIN); pb->SetState(STATE_SHADOW); pos.x += ddim.x; @@ -1387,17 +1406,17 @@ void CMainDialog::ChangePhase(Phase phase) //? pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_TOTO); //? pc->SetState(STATE_SHADOW); //? pos.y -= 0.048f; -#if _SCHOOL +/*TODO: #if _SCHOOL #if _EDU pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_SOLUCE4); pc->SetState(STATE_SHADOW); pos.y -= 0.048f; #endif -#else +#else*/ pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_MOVIES); pc->SetState(STATE_SHADOW); pos.y -= 0.048f; -#endif +//#endif pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_SCROLL); pc->SetState(STATE_SHADOW); pos.y -= 0.048f; @@ -1454,7 +1473,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.y = 18.0f/480.0f; GetResource(RES_TEXT, RT_SETUP_KEY1, name); pl = pw->CreateLabel(pos, ddim, 0, EVENT_INTERFACE_KINFO1, name); - pl->SetJustif(1); + pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT); pos.x = ox+sx*3; pos.y = 302.0f/480.0f; @@ -1462,7 +1481,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.y = 18.0f/480.0f; GetResource(RES_TEXT, RT_SETUP_KEY2, name); pl = pw->CreateLabel(pos, ddim, 0, EVENT_INTERFACE_KINFO2, name); - pl->SetJustif(1); + pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT); ddim.x = 428.0f/640.0f; ddim.y = 128.0f/480.0f; @@ -1513,9 +1532,9 @@ void CMainDialog::ChangePhase(Phase phase) pos.y += ddim.y; GetResource(RES_EVENT, EVENT_INTERFACE_VOLSOUND, name); pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL1, name); - pl->SetJustif(1); + pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT); -#if (_FULL | _NET) & _SOUNDTRACKS +// TODO: #if (_FULL | _NET) & _SOUNDTRACKS pos.x = ox+sx*3; pos.y = 0.40f; ddim.x = dim.x*4.0f; @@ -1527,8 +1546,8 @@ void CMainDialog::ChangePhase(Phase phase) pos.y += ddim.y; GetResource(RES_EVENT, EVENT_INTERFACE_VOLMUSIC, name); pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL2, name); - pl->SetJustif(1); -#endif + pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT); +// #endif ddim.x = dim.x*6; ddim.y = dim.y*0.5f; @@ -1573,14 +1592,14 @@ void CMainDialog::ChangePhase(Phase phase) ddim.y = 0.50f; pw->CreateGroup(pos, ddim, 4, EVENT_INTERFACE_GLINTr); // blue corner -#if _NEWLOOK +/* TODO: #if _NEWLOOK pos.x = 100.0f/640.0f; pos.y = 66.0f/480.0f; ddim.x = 438.0f/640.0f; ddim.y = 42.0f/480.0f; pg = pw->CreateGroup(pos, ddim, 26, EVENT_LABEL1); // violet pg->SetState(STATE_SHADOW); -#endif +#endif */ pos.x = 290.0f/640.0f; ddim.x = 245.0f/640.0f; @@ -1589,13 +1608,13 @@ void CMainDialog::ChangePhase(Phase phase) ddim.y = 18.0f/480.0f; GetResource(RES_EVENT, EVENT_INTERFACE_IOLABEL, name); pl = pw->CreateLabel(pos, ddim, 0, EVENT_INTERFACE_IOLABEL, name); - pl->SetJustif(1); + pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT); pos.y = 130.0f/480.0f; ddim.y = 18.0f/480.0f; pe = pw->CreateEdit(pos, ddim, 0, EVENT_INTERFACE_IONAME); pe->SetState(STATE_SHADOW); - pe->SetFontType(FONT_COLOBOT); + pe->SetFontType(Gfx::FONT_COLOBOT); pe->SetMaxChar(35); IOReadName(); @@ -1657,14 +1676,14 @@ void CMainDialog::ChangePhase(Phase phase) ddim.y = 0.50f; pw->CreateGroup(pos, ddim, 4, EVENT_INTERFACE_GLINTr); // blue corner -#if _NEWLOOK +/* TODO: #if _NEWLOOK pos.x = 100.0f/640.0f; pos.y = 66.0f/480.0f; ddim.x = 438.0f/640.0f; ddim.y = 42.0f/480.0f; pg = pw->CreateGroup(pos, ddim, 26, EVENT_LABEL1); // violet pg->SetState(STATE_SHADOW); -#endif +#endif*/ pos.x = 290.0f/640.0f; ddim.x = 245.0f/640.0f; @@ -1709,7 +1728,12 @@ void CMainDialog::ChangePhase(Phase phase) if ( m_phase == PHASE_READ ) { - m_engine->SetBackground("inter01.tga", 0,0, 0,0, true, true); + m_engine->SetBackground("inter01.png", + 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), + true, true); m_engine->SetBackForce(true); } } @@ -1720,11 +1744,11 @@ void CMainDialog::ChangePhase(Phase phase) pos.y = 0.10f; ddim.x = 0.30f; ddim.y = 0.80f; -#if _TEEN +/*TODO: #if _TEEN pw = m_interface->CreateWindows(pos, ddim, 12, EVENT_WINDOW5); -#else +#else*/ pw = m_interface->CreateWindows(pos, ddim, 10, EVENT_WINDOW5); -#endif + pw->SetName(" "); pos.x = 0.35f; @@ -1752,9 +1776,14 @@ void CMainDialog::ChangePhase(Phase phase) GetResource(RES_TEXT, RT_DIALOG_LOADING, name); pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL1, name); pl->SetFontSize(12.0f); - pl->SetJustif(0); - - m_engine->SetBackground("inter01.tga", 0,0, 0,0, true, true); + pl->SetTextAlign(Gfx::TEXT_ALIGN_CENTER); + + m_engine->SetBackground("inter01.png", + 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), + true, true); m_engine->SetBackForce(true); m_loadingCounter = 1; // enough time to display! @@ -1771,30 +1800,21 @@ void CMainDialog::ChangePhase(Phase phase) ddim.y = 0.0f; pw = m_interface->CreateWindows(pos, ddim, -1, EVENT_WINDOW5); - m_engine->SetOverColor(RetColor(1.0f), D3DSTATETCb); + m_engine->SetOverColor(Gfx::Color(1.0f, 1.0f, 1.0f, 1.0f), Gfx::ENG_RSTATE_TCOLOR_BLACK); // TODO: color ok? m_engine->SetOverFront(true); -#if _FRENCH - m_engine->SetBackground("alsyd.tga", 0,0, 0,0, true, false); -#endif -#if _POLISH - m_engine->SetBackground("manta.tga", 0,0, 0,0, true, false); -#endif -#if _WG - m_engine->SetBackground("wg.tga", 0,0, 0,0, true, false); -#endif + m_engine->SetBackground("ppc.png", + 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), + true, false); m_engine->SetBackForce(true); } if ( m_phase == PHASE_WELCOME2 ) { -#if _ENGLISH - m_sound->StopMusic(); - m_sound->PlayMusic(11, false); -#endif -#if _POLISH m_sound->StopMusic(); m_sound->PlayMusic(11, false); -#endif pos.x = 0.0f; pos.y = 0.0f; @@ -1802,10 +1822,15 @@ void CMainDialog::ChangePhase(Phase phase) ddim.y = 0.0f; pw = m_interface->CreateWindows(pos, ddim, -1, EVENT_WINDOW5); - m_engine->SetOverColor(RetColor(1.0f), D3DSTATETCb); + m_engine->SetOverColor(Gfx::Color(1.0f, 1.0f, 1.0f, 1.0f), Gfx::ENG_RSTATE_TCOLOR_BLACK); // TODO: color ok? m_engine->SetOverFront(true); - m_engine->SetBackground("colobot.tga", 0,0, 0,0, true, false); + m_engine->SetBackground("colobot.png", + 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), + true, false); m_engine->SetBackForce(true); } if ( m_phase == PHASE_WELCOME3 ) @@ -1816,21 +1841,15 @@ void CMainDialog::ChangePhase(Phase phase) ddim.y = 0.0f; pw = m_interface->CreateWindows(pos, ddim, -1, EVENT_WINDOW5); - m_engine->SetOverColor(RetColor(0.0f), D3DSTATETCw); + m_engine->SetOverColor(Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f), Gfx::ENG_RSTATE_TCOLOR_WHITE); // TODO: color ok? m_engine->SetOverFront(true); -#if _FRENCH - m_engine->SetBackground("epsitecf.tga", 0,0, 0,0, true, false); -#endif -#if _ENGLISH - m_engine->SetBackground("epsitece.tga", 0,0, 0,0, true, false); -#endif -#if _GERMAN | _WG - m_engine->SetBackground("epsitecd.tga", 0,0, 0,0, true, false); -#endif -#if _POLISH - m_engine->SetBackground("epsitecp.tga", 0,0, 0,0, true, false); -#endif + m_engine->SetBackground("epsitece.png", + 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), + true, false); m_engine->SetBackForce(true); } @@ -1842,7 +1861,7 @@ void CMainDialog::ChangePhase(Phase phase) ddim.y = 0.0f; pw = m_interface->CreateWindows(pos, ddim, -1, EVENT_WINDOW5); -#if _FULL | _NET +// TODO: #if _FULL | _NET pos.x = 80.0f/640.0f; pos.y = 240.0f/480.0f; ddim.x = 490.0f/640.0f; @@ -1851,7 +1870,7 @@ void CMainDialog::ChangePhase(Phase phase) pe->SetGenericMode(true); pe->SetEditCap(false); pe->SetHiliteCap(false); - pe->SetFontType(FONT_COURIER); + pe->SetFontType(Gfx::FONT_COURIER); pe->SetFontSize(8.0f); pe->ReadText("help\\authors.txt"); @@ -1863,11 +1882,11 @@ void CMainDialog::ChangePhase(Phase phase) pe->SetGenericMode(true); pe->SetEditCap(false); pe->SetHiliteCap(false); - pe->SetFontType(FONT_COURIER); + pe->SetFontType(Gfx::FONT_COURIER); pe->SetFontSize(6.5f); pe->ReadText("help\\licences.txt"); -#endif -#if _SCHOOL +// #endif +/* TODO: #if _SCHOOL #if _CEEBOTDEMO pos.x = 80.0f/640.0f; pos.y = 210.0f/480.0f; @@ -1878,16 +1897,16 @@ void CMainDialog::ChangePhase(Phase phase) pos.y = 200.0f/480.0f; ddim.x = 490.0f/640.0f; ddim.y = 150.0f/480.0f; -#endif +#endif*/ pe = pw->CreateEdit(pos, ddim, 0, EVENT_EDIT1); pe->SetGenericMode(true); pe->SetEditCap(false); pe->SetHiliteCap(false); - pe->SetFontType(FONT_COURIER); + pe->SetFontType(Gfx::FONT_COURIER); pe->SetFontSize(8.0f); pe->ReadText("help\\authors.txt"); -#endif -#if _DEMO + +/* #if _DEMO //? pos.x = 80.0f/640.0f; //? pos.y = 240.0f/480.0f; //? ddim.x = 490.0f/640.0f; @@ -1896,7 +1915,7 @@ void CMainDialog::ChangePhase(Phase phase) //? pe->SetGenericMode(true); //? pe->SetEditCap(false); //? pe->SetHiliteCap(false); -//? pe->SetFontType(FONT_COURIER); +//? pe->SetFontType(Gfx::FONT_COURIER); //? pe->SetFontSize(8.0f); //? pe->ReadText("help\\demo.txt"); @@ -1908,25 +1927,25 @@ void CMainDialog::ChangePhase(Phase phase) //? pe->SetGenericMode(true); //? pe->SetEditCap(false); //? pe->SetHiliteCap(false); -//? pe->SetFontType(FONT_COURIER); +//? pe->SetFontType(Gfx::FONT_COURIER); //? pe->SetFontSize(8.0f); //? pe->ReadText("help\\authors.txt"); -#endif +#endif */ -#if !_DEMO +// TODO: #if !_DEMO pos.x = 40.0f/640.0f; pos.y = 83.0f/480.0f; ddim.x = 246.0f/640.0f; ddim.y = 16.0f/480.0f; GetResource(RES_TEXT, RT_GENERIC_DEV1, name); pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL1, name); - pl->SetFontType(FONT_COURIER); + pl->SetFontType(Gfx::FONT_COURIER); pl->SetFontSize(8.0f); pos.y = 13.0f/480.0f; GetResource(RES_TEXT, RT_GENERIC_DEV2, name); pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL2, name); - pl->SetFontType(FONT_COURIER); + pl->SetFontType(Gfx::FONT_COURIER); pl->SetFontSize(8.0f); pos.x = 355.0f/640.0f; @@ -1935,79 +1954,38 @@ void CMainDialog::ChangePhase(Phase phase) ddim.y = 16.0f/480.0f; GetResource(RES_TEXT, RT_GENERIC_EDIT1, name); pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL3, name); - pl->SetFontType(FONT_COURIER); + pl->SetFontType(Gfx::FONT_COURIER); pl->SetFontSize(8.0f); pos.y = 13.0f/480.0f; GetResource(RES_TEXT, RT_GENERIC_EDIT2, name); pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL4, name); - pl->SetFontType(FONT_COURIER); + pl->SetFontType(Gfx::FONT_COURIER); pl->SetFontSize(8.0f); -#endif +// #endif -#if _DEMO +/* TODO: #if _DEMO pos.x = 481.0f/640.0f; pos.y = 51.0f/480.0f; ddim.x = 30.0f/640.0f; ddim.y = 30.0f/480.0f; pb = pw->CreateButton(pos, ddim, 49, EVENT_INTERFACE_ABORT); pb->SetState(STATE_SHADOW); -#else +#else */ pos.x = 306.0f/640.0f; pos.y = 17.0f/480.0f; ddim.x = 30.0f/640.0f; ddim.y = 30.0f/480.0f; pb = pw->CreateButton(pos, ddim, 49, EVENT_INTERFACE_ABORT); pb->SetState(STATE_SHADOW); -#endif - -#if _NEWLOOK -#if _CEEBOTDEMO -#if _TEEN - m_engine->SetBackground("genedt.tga", 0,0, 0,0, true, true); -#else - m_engine->SetBackground("geneda.tga", 0,0, 0,0, true, true); -#endif -#else - m_engine->SetBackground("genern.tga", 0,0, 0,0, true, true); -#endif -#else -#if _FRENCH -#if _DEMO - m_engine->SetBackground("genedf.tga", 0,0, 0,0, true, true); -#else - m_engine->SetBackground("generf.tga", 0,0, 0,0, true, true); -#endif -#endif -#if _ENGLISH -#if _DEMO - m_engine->SetBackground("genede.tga", 0,0, 0,0, true, true); -#else - m_engine->SetBackground("genere.tga", 0,0, 0,0, true, true); -#endif -#endif -#if _GERMAN -#if _DEMO - m_engine->SetBackground("genedd.tga", 0,0, 0,0, true, true); -#else - m_engine->SetBackground("genere.tga", 0,0, 0,0, true, true); -#endif -#endif -#if _WG -#if _DEMO - m_engine->SetBackground("genedd.tga", 0,0, 0,0, true, true); -#else - m_engine->SetBackground("generd.tga", 0,0, 0,0, true, true); -#endif -#endif -#if _POLISH -#if _DEMO - m_engine->SetBackground("genedp.tga", 0,0, 0,0, true, true); -#else - m_engine->SetBackground("generp.tga", 0,0, 0,0, true, true); -#endif -#endif -#endif +// #endif + + m_engine->SetBackground("genere.png", + 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), + true, true); m_engine->SetBackForce(true); } @@ -2028,7 +2006,7 @@ void CMainDialog::ChangePhase(Phase phase) m_phase == PHASE_READ || m_phase == PHASE_LOADING ) { -#if _SCHOOL +/*TODO: #if _SCHOOL #if _TEEN pos.x = 50.0f/640.0f; pos.y = 430.0f/480.0f; @@ -2040,24 +2018,24 @@ void CMainDialog::ChangePhase(Phase phase) ddim.x = 170.0f/640.0f; ddim.y = 9.0f/480.0f; #endif -#else +#else */ pos.x = 540.0f/640.0f; pos.y = 9.0f/480.0f; ddim.x = 90.0f/640.0f; ddim.y = 10.0f/480.0f; -#endif +//#endif GetResource(RES_TEXT, RT_VERSION_ID, name); pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL1, name); - pl->SetFontType(FONT_COURIER); + pl->SetFontType(Gfx::FONT_COURIER); pl->SetFontSize(9.0f); } - m_engine->LoadAllTexture(); + m_engine->LoadAllTextures(); } // Processing an event. -// Returns false if the event has been processed completely. +// Geturns false if the event has been processed completely. bool CMainDialog::EventProcess(const Event &event) { @@ -2068,7 +2046,7 @@ bool CMainDialog::EventProcess(const Event &event) Event newEvent; float welcomeLength; - if ( event.event == EVENT_FRAME ) + if ( event.type == EVENT_FRAME ) { m_phaseTime += event.rTime; @@ -2081,7 +2059,7 @@ bool CMainDialog::EventProcess(const Event &event) m_phase == PHASE_WELCOME3 ) { float intensity; - int mode = D3DSTATETCb; + int mode = Gfx::ENG_RSTATE_TCOLOR_BLACK; if ( m_phaseTime < 1.5f ) { @@ -2102,10 +2080,10 @@ bool CMainDialog::EventProcess(const Event &event) m_phase == PHASE_WELCOME3 ) { intensity = 1.0f-intensity; - mode = D3DSTATETCw; + mode = Gfx::ENG_RSTATE_TCOLOR_WHITE; } - m_engine->SetOverColor(RetColor(intensity), mode); + m_engine->SetOverColor(Gfx::Color(intensity, intensity, intensity, intensity), mode); // TODO: color ok? } if ( m_phase == PHASE_WELCOME1 && m_phaseTime >= welcomeLength ) @@ -2147,7 +2125,7 @@ bool CMainDialog::EventProcess(const Event &event) m_glintTime += event.rTime; GlintMove(); // moves reflections - FrameParticule(event.rTime); + FrameParticle(event.rTime); if ( m_bDialog ) // this dialogue? { @@ -2157,18 +2135,18 @@ bool CMainDialog::EventProcess(const Event &event) return true; } - if ( event.event == EVENT_MOUSEMOVE ) + if ( event.type == EVENT_MOUSE_MOVE ) { m_glintMouse = event.pos; - NiceParticule(event.pos, event.keyState&KS_MLEFT); + NiceParticle(event.pos, event.keyState&KS_MLEFT); } if ( m_bDialog ) // this dialogue? { m_interface->EventProcess(event); - if ( event.event == EVENT_DIALOG_OK || - (event.event == EVENT_KEYDOWN && event.param == VK_RETURN ) ) + if ( event.type == EVENT_DIALOG_OK || + (event.type == EVENT_KEY_DOWN && event.param == KEY(RETURN) ) ) { StopDialog(); if ( m_phase == PHASE_NAME ) @@ -2177,8 +2155,8 @@ bool CMainDialog::EventProcess(const Event &event) } if ( m_phase == PHASE_INIT ) { -//? m_event->MakeEvent(newEvent, EVENT_QUIT); -//? m_event->AddEvent(newEvent); +//? m_eventQueue->MakeEvent(newEvent, EVENT_QUIT); +//? m_eventQueue->AddEvent(newEvent); m_main->ChangePhase(PHASE_GENERIC); } if ( m_phase == PHASE_SIMUL ) @@ -2193,12 +2171,12 @@ bool CMainDialog::EventProcess(const Event &event) } } } - if ( event.event == EVENT_DIALOG_CANCEL || - (event.event == EVENT_KEYDOWN && event.param == VK_ESCAPE ) ) + if ( event.type == EVENT_DIALOG_CANCEL || + (event.type == EVENT_KEY_DOWN && event.param == KEY(ESCAPE) ) ) { StopDialog(); } - if ( event.event == EVENT_INTERFACE_SETUP ) + if ( event.type == EVENT_INTERFACE_SETUP ) { StopDialog(); StartSuspend(); @@ -2208,18 +2186,18 @@ bool CMainDialog::EventProcess(const Event &event) if ( m_phaseSetup == PHASE_SETUPc ) ChangePhase(PHASE_SETUPcs); if ( m_phaseSetup == PHASE_SETUPs ) ChangePhase(PHASE_SETUPss); } - if ( event.event == EVENT_INTERFACE_AGAIN ) + if ( event.type == EVENT_INTERFACE_AGAIN ) { StopDialog(); m_main->ChangePhase(PHASE_LOADING); } - if ( event.event == EVENT_INTERFACE_WRITE ) + if ( event.type == EVENT_INTERFACE_WRITE ) { StopDialog(); StartSuspend(); ChangePhase(PHASE_WRITEs); } - if ( event.event == EVENT_INTERFACE_READ ) + if ( event.type == EVENT_INTERFACE_READ ) { StopDialog(); StartSuspend(); @@ -2229,7 +2207,7 @@ bool CMainDialog::EventProcess(const Event &event) return false; } - if ( !m_engine->RetMouseHide() && + if ( m_engine->GetMouseVisible() && !m_interface->EventProcess(event) ) { return false; @@ -2237,10 +2215,10 @@ bool CMainDialog::EventProcess(const Event &event) if ( m_phase == PHASE_INIT ) { - switch( event.event ) + switch( event.type ) { - case EVENT_KEYDOWN: - if ( event.param == VK_ESCAPE ) + case EVENT_KEY_DOWN: + if ( event.param == KEY(ESCAPE) ) { //? StartQuit(); // would you leave? m_sound->Play(SOUND_TZOING); @@ -2289,20 +2267,23 @@ bool CMainDialog::EventProcess(const Event &event) case EVENT_INTERFACE_NAME: m_main->ChangePhase(PHASE_NAME); break; + + default: + break; } return false; } if ( m_phase == PHASE_NAME ) { - switch( event.event ) + switch( event.type ) { - case EVENT_KEYDOWN: - if ( event.param == VK_RETURN ) + case EVENT_KEY_DOWN: + if ( event.param == KEY(RETURN) ) { NameSelect(); } - if ( event.param == VK_ESCAPE ) + if ( event.param == KEY(ESCAPE) ) { pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW5); if ( pw == 0 ) break; @@ -2342,21 +2323,24 @@ bool CMainDialog::EventProcess(const Event &event) if ( pw == 0 ) break; pl = (CList*)pw->SearchControl(EVENT_INTERFACE_NLIST); if ( pl == 0 ) break; - StartDeleteGame(pl->RetName(pl->RetSelect())); + StartDeleteGame(pl->GetName(pl->GetSelect())); + break; + + default: break; } } if ( m_phase == PHASE_PERSO ) { - switch( event.event ) + switch( event.type ) { - case EVENT_KEYDOWN: - if ( event.param == VK_RETURN ) + case EVENT_KEY_DOWN: + if ( event.param == KEY(RETURN) ) { m_main->ChangePhase(PHASE_INIT); } - if ( event.param == VK_ESCAPE ) + if ( event.param == KEY(ESCAPE) ) { m_main->ChangePhase(PHASE_NAME); } @@ -2379,8 +2363,8 @@ bool CMainDialog::EventProcess(const Event &event) case EVENT_INTERFACE_PFACE2: case EVENT_INTERFACE_PFACE3: case EVENT_INTERFACE_PFACE4: - m_perso.face = event.event-EVENT_INTERFACE_PFACE1; - WriteGamerPerso(m_main->RetGamerName()); + m_perso.face = event.type-EVENT_INTERFACE_PFACE1; + WriteGamerPerso(m_main->GetGamerName()); UpdatePerso(); m_main->ScenePerso(); break; @@ -2395,8 +2379,8 @@ bool CMainDialog::EventProcess(const Event &event) case EVENT_INTERFACE_PGLASS7: case EVENT_INTERFACE_PGLASS8: case EVENT_INTERFACE_PGLASS9: - m_perso.glasses = event.event-EVENT_INTERFACE_PGLASS0; - WriteGamerPerso(m_main->RetGamerName()); + m_perso.glasses = event.type-EVENT_INTERFACE_PGLASS0; + WriteGamerPerso(m_main->GetGamerName()); UpdatePerso(); m_main->ScenePerso(); break; @@ -2411,8 +2395,8 @@ bool CMainDialog::EventProcess(const Event &event) case EVENT_INTERFACE_PC7a: case EVENT_INTERFACE_PC8a: case EVENT_INTERFACE_PC9a: - FixPerso(event.event-EVENT_INTERFACE_PC0a, 0); - WriteGamerPerso(m_main->RetGamerName()); + FixPerso(event.type-EVENT_INTERFACE_PC0a, 0); + WriteGamerPerso(m_main->GetGamerName()); UpdatePerso(); m_main->ScenePerso(); break; @@ -2427,8 +2411,8 @@ bool CMainDialog::EventProcess(const Event &event) case EVENT_INTERFACE_PC7b: case EVENT_INTERFACE_PC8b: case EVENT_INTERFACE_PC9b: - FixPerso(event.event-EVENT_INTERFACE_PC0b, 1); - WriteGamerPerso(m_main->RetGamerName()); + FixPerso(event.type-EVENT_INTERFACE_PC0b, 1); + WriteGamerPerso(m_main->GetGamerName()); UpdatePerso(); m_main->ScenePerso(); break; @@ -2440,14 +2424,14 @@ bool CMainDialog::EventProcess(const Event &event) case EVENT_INTERFACE_PCGb: case EVENT_INTERFACE_PCBb: ColorPerso(); - WriteGamerPerso(m_main->RetGamerName()); + WriteGamerPerso(m_main->GetGamerName()); UpdatePerso(); m_main->ScenePerso(); break; case EVENT_INTERFACE_PDEF: DefPerso(); - WriteGamerPerso(m_main->RetGamerName()); + WriteGamerPerso(m_main->GetGamerName()); UpdatePerso(); m_main->ScenePerso(); break; @@ -2465,9 +2449,12 @@ bool CMainDialog::EventProcess(const Event &event) case EVENT_INTERFACE_PCANCEL: m_perso = m_persoCopy; - WriteGamerPerso(m_main->RetGamerName()); + WriteGamerPerso(m_main->GetGamerName()); m_main->ChangePhase(PHASE_NAME); break; + + default: + break; } } @@ -2482,9 +2469,9 @@ bool CMainDialog::EventProcess(const Event &event) pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW5); if ( pw == 0 ) return false; - if ( event.event == pw->RetEventMsgClose() || - event.event == EVENT_INTERFACE_BACK || - (event.event == EVENT_KEYDOWN && event.param == VK_ESCAPE) ) + if ( event.type == pw->GetEventTypeClose() || + event.type == EVENT_INTERFACE_BACK || + (event.type == EVENT_KEY_DOWN && event.param == KEY(ESCAPE)) ) { m_main->ChangePhase(PHASE_INIT); return false; @@ -2499,12 +2486,12 @@ bool CMainDialog::EventProcess(const Event &event) m_phase == PHASE_USER || m_phase == PHASE_PROTO ) { - switch( event.event ) + switch( event.type ) { case EVENT_INTERFACE_CHAP: pl = (CList*)pw->SearchControl(EVENT_INTERFACE_CHAP); if ( pl == 0 ) break; - m_chap[m_index] = pl->RetSelect(); + m_chap[m_index] = pl->GetSelect(); UpdateSceneList(m_chap[m_index], m_sel[m_index]); UpdateSceneResume((m_chap[m_index]+1)*100+(m_sel[m_index]+1)); break; @@ -2512,7 +2499,7 @@ bool CMainDialog::EventProcess(const Event &event) case EVENT_INTERFACE_LIST: pl = (CList*)pw->SearchControl(EVENT_INTERFACE_LIST); if ( pl == 0 ) break; - m_sel[m_index] = pl->RetSelect(); + m_sel[m_index] = pl->GetSelect(); UpdateSceneResume((m_chap[m_index]+1)*100+(m_sel[m_index]+1)); break; @@ -2538,6 +2525,9 @@ bool CMainDialog::EventProcess(const Event &event) m_phaseTerm = m_phase; m_main->ChangePhase(PHASE_READ); break; + + default: + break; } return false; } @@ -2551,9 +2541,9 @@ bool CMainDialog::EventProcess(const Event &event) pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW5); if ( pw == 0 ) return false; - if ( event.event == pw->RetEventMsgClose() || - event.event == EVENT_INTERFACE_BACK || - (event.event == EVENT_KEYDOWN && event.param == VK_ESCAPE) ) + if ( event.type == pw->GetEventTypeClose() || + event.type == EVENT_INTERFACE_BACK || + (event.type == EVENT_KEY_DOWN && event.param == KEY(ESCAPE)) ) { SetupMemorize(); m_engine->ApplyChange(); @@ -2561,7 +2551,7 @@ bool CMainDialog::EventProcess(const Event &event) return false; } - switch( event.event ) + switch( event.type ) { case EVENT_INTERFACE_SETUPd: m_main->ChangePhase(PHASE_SETUPd); @@ -2582,6 +2572,9 @@ bool CMainDialog::EventProcess(const Event &event) case EVENT_INTERFACE_SETUPs: m_main->ChangePhase(PHASE_SETUPs); break; + + default: + break; } } @@ -2594,9 +2587,9 @@ bool CMainDialog::EventProcess(const Event &event) pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW5); if ( pw == 0 ) return false; - if ( event.event == pw->RetEventMsgClose() || - event.event == EVENT_INTERFACE_BACK || - (event.event == EVENT_KEYDOWN && event.param == VK_ESCAPE) ) + if ( event.type == pw->GetEventTypeClose() || + event.type == EVENT_INTERFACE_BACK || + (event.type == EVENT_KEY_DOWN && event.param == KEY(ESCAPE)) ) { SetupMemorize(); m_engine->ApplyChange(); @@ -2606,7 +2599,7 @@ bool CMainDialog::EventProcess(const Event &event) return false; } - switch( event.event ) + switch( event.type ) { case EVENT_INTERFACE_SETUPd: ChangePhase(PHASE_SETUPds); @@ -2627,13 +2620,16 @@ bool CMainDialog::EventProcess(const Event &event) case EVENT_INTERFACE_SETUPs: ChangePhase(PHASE_SETUPss); break; + + default: + break; } } if ( m_phase == PHASE_SETUPd || // setup/display ? m_phase == PHASE_SETUPds ) { - switch( event.event ) + switch( event.type ) { case EVENT_LIST1: case EVENT_LIST2: @@ -2670,6 +2666,9 @@ bool CMainDialog::EventProcess(const Event &event) ChangeDisplay(); UpdateApply(); break; + + default: + break; } return false; } @@ -2677,53 +2676,53 @@ bool CMainDialog::EventProcess(const Event &event) if ( m_phase == PHASE_SETUPg || // setup/graphic ? m_phase == PHASE_SETUPgs ) { - switch( event.event ) + switch( event.type ) { case EVENT_INTERFACE_SHADOW: - m_engine->SetShadow(!m_engine->RetShadow()); + m_engine->SetShadow(!m_engine->GetShadow()); ChangeSetupButtons(); UpdateSetupButtons(); break; case EVENT_INTERFACE_GROUND: - m_engine->SetGroundSpot(!m_engine->RetGroundSpot()); + m_engine->SetGroundSpot(!m_engine->GetGroundSpot()); ChangeSetupButtons(); UpdateSetupButtons(); break; case EVENT_INTERFACE_DIRTY: - m_engine->SetDirty(!m_engine->RetDirty()); + m_engine->SetDirty(!m_engine->GetDirty()); ChangeSetupButtons(); UpdateSetupButtons(); break; case EVENT_INTERFACE_FOG: - m_engine->SetFog(!m_engine->RetFog()); - m_camera->SetOverBaseColor(RetColor(RetColor(0.0f))); + m_engine->SetFog(!m_engine->GetFog()); + m_camera->SetOverBaseColor(Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f)); // TODO: color ok? ChangeSetupButtons(); UpdateSetupButtons(); break; case EVENT_INTERFACE_LENS: - m_engine->SetLensMode(!m_engine->RetLensMode()); + m_engine->SetLensMode(!m_engine->GetLensMode()); ChangeSetupButtons(); UpdateSetupButtons(); break; case EVENT_INTERFACE_SKY: - m_engine->SetSkyMode(!m_engine->RetSkyMode()); + m_engine->SetSkyMode(!m_engine->GetSkyMode()); ChangeSetupButtons(); UpdateSetupButtons(); break; case EVENT_INTERFACE_PLANET: - m_engine->SetPlanetMode(!m_engine->RetPlanetMode()); + m_engine->SetPlanetMode(!m_engine->GetPlanetMode()); ChangeSetupButtons(); UpdateSetupButtons(); break; case EVENT_INTERFACE_LIGHT: - m_engine->SetLightMode(!m_engine->RetLightMode()); + m_engine->SetLightMode(!m_engine->GetLightMode()); ChangeSetupButtons(); UpdateSetupButtons(); break; @@ -2748,6 +2747,9 @@ bool CMainDialog::EventProcess(const Event &event) ChangeSetupQuality(1); UpdateSetupButtons(); break; + + default: + break; } return false; } @@ -2755,10 +2757,10 @@ bool CMainDialog::EventProcess(const Event &event) if ( m_phase == PHASE_SETUPp || // setup/game ? m_phase == PHASE_SETUPps ) { - switch( event.event ) + switch( event.type ) { case EVENT_INTERFACE_TOTO: - m_engine->SetTotoMode(!m_engine->RetTotoMode()); + m_engine->SetTotoMode(!m_engine->GetTotoMode()); ChangeSetupButtons(); UpdateSetupButtons(); break; @@ -2782,19 +2784,20 @@ bool CMainDialog::EventProcess(const Event &event) break; case EVENT_INTERFACE_MOUSE: - m_engine->SetNiceMouse(!m_engine->RetNiceMouse()); + m_engine->SetMouseVisible(!m_engine->GetMouseVisible()); + // TODO: system mouse visible ChangeSetupButtons(); UpdateSetupButtons(); break; case EVENT_INTERFACE_EDITMODE: - m_engine->SetEditIndentMode(!m_engine->RetEditIndentMode()); + m_engine->SetEditIndentMode(!m_engine->GetEditIndentMode()); ChangeSetupButtons(); UpdateSetupButtons(); break; case EVENT_INTERFACE_EDITVALUE: - if ( m_engine->RetEditIndentValue() == 2 ) + if ( m_engine->GetEditIndentValue() == 2 ) { m_engine->SetEditIndentValue(4); } @@ -2857,6 +2860,9 @@ bool CMainDialog::EventProcess(const Event &event) ChangeSetupButtons(); UpdateSetupButtons(); break; + + default: + break; } return false; } @@ -2864,7 +2870,7 @@ bool CMainDialog::EventProcess(const Event &event) if ( m_phase == PHASE_SETUPc || // setup/commands ? m_phase == PHASE_SETUPcs ) { - switch( event.event ) + switch( event.type ) { case EVENT_INTERFACE_KSCROLL: UpdateKey(); @@ -2892,19 +2898,22 @@ bool CMainDialog::EventProcess(const Event &event) case EVENT_INTERFACE_KSPEED20: case EVENT_INTERFACE_KSPEED30: case EVENT_INTERFACE_KVISIT: - ChangeKey(event.event); + ChangeKey(event.type); UpdateKey(); break; case EVENT_INTERFACE_KDEF: - m_engine->ResetKey(); + m_app->ResetKeyStates(); UpdateKey(); break; case EVENT_INTERFACE_JOYSTICK: - m_engine->SetJoystick(!m_engine->RetJoystick()); + m_app->SetJoystickEnabled(!m_app->GetJoystickEnabled()); UpdateSetupButtons(); break; + + default: + break; } return false; } @@ -2912,7 +2921,7 @@ bool CMainDialog::EventProcess(const Event &event) if ( m_phase == PHASE_SETUPs || // setup/sound ? m_phase == PHASE_SETUPss ) { - switch( event.event ) + switch( event.type ) { case EVENT_INTERFACE_VOLSOUND: case EVENT_INTERFACE_VOLMUSIC: @@ -2920,21 +2929,24 @@ bool CMainDialog::EventProcess(const Event &event) break; case EVENT_INTERFACE_SOUND3D: - m_sound->SetSound3D(!m_sound->RetSound3D()); + m_sound->SetSound3D(!m_sound->GetSound3D()); ChangeSetupButtons(); UpdateSetupButtons(); break; case EVENT_INTERFACE_SILENT: m_sound->SetAudioVolume(0); - m_sound->SetMidiVolume(0); + //TODO: m_sound->SetMidiVolume(0); UpdateSetupButtons(); break; case EVENT_INTERFACE_NOISY: m_sound->SetAudioVolume(MAXVOLUME); - m_sound->SetMidiVolume(MAXVOLUME*3/4); + //TODO: m_sound->SetMidiVolume(MAXVOLUME*3/4); UpdateSetupButtons(); break; + + default: + break; } return false; } @@ -2944,23 +2956,23 @@ bool CMainDialog::EventProcess(const Event &event) pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW5); if ( pw == 0 ) return false; - if ( event.event == pw->RetEventMsgClose() || - event.event == EVENT_INTERFACE_BACK || - (event.event == EVENT_KEYDOWN && event.param == VK_ESCAPE) ) + if ( event.type == pw->GetEventTypeClose() || + event.type == EVENT_INTERFACE_BACK || + (event.type == EVENT_KEY_DOWN && event.param == KEY(ESCAPE)) ) { ChangePhase(m_phaseTerm); } - if ( event.event == EVENT_INTERFACE_IOLIST ) + if ( event.type == EVENT_INTERFACE_IOLIST ) { IOUpdateList(); } - if ( event.event == EVENT_INTERFACE_IODELETE ) + if ( event.type == EVENT_INTERFACE_IODELETE ) { IODeleteScene(); IOUpdateList(); } - if ( event.event == EVENT_INTERFACE_IOREAD ) + if ( event.type == EVENT_INTERFACE_IOREAD ) { if ( IOReadScene() ) { @@ -2977,32 +2989,32 @@ bool CMainDialog::EventProcess(const Event &event) pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW5); if ( pw == 0 ) return false; - if ( event.event == pw->RetEventMsgClose() || - event.event == EVENT_INTERFACE_BACK || - (event.event == EVENT_KEYDOWN && event.param == VK_ESCAPE) ) + if ( event.type == pw->GetEventTypeClose() || + event.type == EVENT_INTERFACE_BACK || + (event.type == EVENT_KEY_DOWN && event.param == KEY(ESCAPE)) ) { m_interface->DeleteControl(EVENT_WINDOW5); ChangePhase(PHASE_SIMUL); StopSuspend(); } - if ( event.event == EVENT_INTERFACE_IOLIST ) + if ( event.type == EVENT_INTERFACE_IOLIST ) { IOUpdateList(); } - if ( event.event == EVENT_INTERFACE_IODELETE ) + if ( event.type == EVENT_INTERFACE_IODELETE ) { IODeleteScene(); IOUpdateList(); } - if ( event.event == EVENT_INTERFACE_IOWRITE ) + if ( event.type == EVENT_INTERFACE_IOWRITE ) { IOWriteScene(); m_interface->DeleteControl(EVENT_WINDOW5); ChangePhase(PHASE_SIMUL); StopSuspend(); } - if ( event.event == EVENT_INTERFACE_IOREAD ) + if ( event.type == EVENT_INTERFACE_IOREAD ) { if ( IOReadScene() ) { @@ -3018,9 +3030,8 @@ bool CMainDialog::EventProcess(const Event &event) if ( m_phase == PHASE_WELCOME1 ) { - if ( event.event == EVENT_KEYDOWN || - event.event == EVENT_LBUTTONDOWN || - event.event == EVENT_RBUTTONDOWN ) + if ( event.type == EVENT_KEY_DOWN || + event.type == EVENT_MOUSE_BUTTON_DOWN ) { ChangePhase(PHASE_WELCOME2); return true; @@ -3028,9 +3039,8 @@ bool CMainDialog::EventProcess(const Event &event) } if ( m_phase == PHASE_WELCOME2 ) { - if ( event.event == EVENT_KEYDOWN || - event.event == EVENT_LBUTTONDOWN || - event.event == EVENT_RBUTTONDOWN ) + if ( event.type == EVENT_KEY_DOWN || + event.type == EVENT_MOUSE_BUTTON_DOWN ) { ChangePhase(PHASE_WELCOME3); return true; @@ -3038,9 +3048,8 @@ bool CMainDialog::EventProcess(const Event &event) } if ( m_phase == PHASE_WELCOME3 ) { - if ( event.event == EVENT_KEYDOWN || - event.event == EVENT_LBUTTONDOWN || - event.event == EVENT_RBUTTONDOWN ) + if ( event.type == EVENT_KEY_DOWN || + event.type == EVENT_MOUSE_BUTTON_DOWN ) { ChangePhase(PHASE_NAME); return true; @@ -3049,29 +3058,26 @@ bool CMainDialog::EventProcess(const Event &event) if ( m_phase == PHASE_GENERIC ) { - if ( event.event == EVENT_INTERFACE_ABORT ) + if ( event.type == EVENT_INTERFACE_ABORT ) { ChangePhase(PHASE_INIT); } - if ( event.event == EVENT_KEYDOWN ) + if ( event.type == EVENT_KEY_DOWN ) { - if ( event.param == VK_ESCAPE ) + if ( event.param == KEY(ESCAPE) ) { ChangePhase(PHASE_INIT); } else { - m_event->MakeEvent(newEvent, EVENT_QUIT); - m_event->AddEvent(newEvent); + m_eventQueue->AddEvent(Event(EVENT_QUIT)); } } - if ( event.event == EVENT_LBUTTONDOWN || - event.event == EVENT_RBUTTONDOWN ) + if ( event.type == EVENT_MOUSE_BUTTON_DOWN ) { - m_event->MakeEvent(newEvent, EVENT_QUIT); - m_event->AddEvent(newEvent); + m_eventQueue->AddEvent(Event(EVENT_QUIT)); } } @@ -3235,7 +3241,7 @@ void CMainDialog::GlintMove() } -// Returns the position for a sound. +// Geturns the position for a sound. Math::Vector SoundPos(Math::Point pos) { @@ -3248,7 +3254,7 @@ Math::Vector SoundPos(Math::Point pos) return s; } -// Returns a random position for a sound. +// Geturns a random position for a sound. Math::Vector SoundRand() { @@ -3263,10 +3269,10 @@ Math::Vector SoundRand() // Makes pretty qq particles evolve. -void CMainDialog::FrameParticule(float rTime) +void CMainDialog::FrameParticle(float rTime) { -#if _NEWLOOK -#else +/* TODO: #if _NEWLOOK +#else */ Math::Vector pos, speed; Math::Point dim; float *pParti, *pGlint; @@ -3414,10 +3420,10 @@ void CMainDialog::FrameParticule(float rTime) speed.z = 0.0f; dim.x = 0.04f+Math::Rand()*0.04f; dim.y = dim.x/0.75f; - m_particule->CreateParticule(pos, speed, dim, - rand()%2?PARTIGLINT:PARTICONTROL, + m_particle->CreateParticle(pos, speed, dim, + rand()%2?Gfx::PARTIGLINT:Gfx::PARTICONTROL, Math::Rand()*0.4f+0.4f, 0.0f, 0.0f, - SH_INTERFACE); + Gfx::SH_INTERFACE); m_partiTime[i] = 0.5f+Math::Rand()*0.5f; } @@ -3480,9 +3486,9 @@ void CMainDialog::FrameParticule(float rTime) speed.z = 0.0f; dim.x = 0.005f+Math::Rand()*0.005f; dim.y = dim.x/0.75f; - m_particule->CreateParticule(pos, speed, dim, PARTIBLITZ, + m_particle->CreateParticle(pos, speed, dim, Gfx::PARTIBLITZ, Math::Rand()*0.2f+0.2f, 0.0f, 0.0f, - SH_INTERFACE); + Gfx::SH_INTERFACE); pos.x = m_partiPos[i].x; pos.y = m_partiPos[i].y; pos.z = 0.0f; @@ -3491,10 +3497,10 @@ void CMainDialog::FrameParticule(float rTime) speed.z = 0.0f; dim.x = 0.01f+Math::Rand()*0.01f; dim.y = dim.x/0.75f; - m_particule->CreateParticule(pos, speed, dim, - (ParticuleType)(PARTILENS1+rand()%3), + m_particle->CreateParticle(pos, speed, dim, + (Gfx::ParticleType)(Gfx::PARTILENS1+rand()%3), Math::Rand()*0.5f+0.5f, 2.0f, 0.0f, - SH_INTERFACE); + Gfx::SH_INTERFACE); } if ( m_partiPhase[i] == 2 ) // sparks? { @@ -3508,9 +3514,9 @@ void CMainDialog::FrameParticule(float rTime) speed.z = 0.0f; dim.x = 0.005f+Math::Rand()*0.005f; dim.y = dim.x/0.75f; - m_particule->CreateParticule(pos, speed, dim, PARTIBLITZ, + m_particle->CreateParticle(pos, speed, dim, Gfx::PARTIBLITZ, Math::Rand()*0.2f+0.2f, 0.0f, 0.0f, - SH_INTERFACE); + Gfx::SH_INTERFACE); pos.x = m_partiPos[i].x; pos.y = m_partiPos[i].y; pos.z = 0.0f; @@ -3519,9 +3525,9 @@ void CMainDialog::FrameParticule(float rTime) speed.z = 0.0f; dim.x = 0.005f+Math::Rand()*0.005f; dim.y = dim.x/0.75f; - m_particule->CreateParticule(pos, speed, dim, PARTISCRAPS, + m_particle->CreateParticle(pos, speed, dim, Gfx::PARTISCRAPS, Math::Rand()*0.5f+0.5f, 2.0f, 0.0f, - SH_INTERFACE); + Gfx::SH_INTERFACE); } if ( m_partiPhase[i] == 3 ) // smoke? { @@ -3535,9 +3541,9 @@ void CMainDialog::FrameParticule(float rTime) speed.z = 0.0f; dim.x = 0.03f+Math::Rand()*0.07f; dim.y = dim.x/0.75f; - m_particule->CreateParticule(pos, speed, dim, PARTICRASH, + m_particle->CreateParticle(pos, speed, dim, Gfx::PARTICRASH, Math::Rand()*0.4f+0.4f, 0.0f, 0.0f, - SH_INTERFACE); + Gfx::SH_INTERFACE); } } else @@ -3547,12 +3553,12 @@ void CMainDialog::FrameParticule(float rTime) } } } -#endif +// #endif } // Some nice particles following the mouse. -void CMainDialog::NiceParticule(Math::Point mouse, bool bPress) +void CMainDialog::NiceParticle(Math::Point mouse, bool bPress) { Math::Vector pos, speed; Math::Point dim; @@ -3574,9 +3580,9 @@ void CMainDialog::NiceParticule(Math::Point mouse, bool bPress) speed.z = 0.0f; dim.x = 0.005f+Math::Rand()*0.005f; dim.y = dim.x/0.75f; - m_particule->CreateParticule(pos, speed, dim, PARTISCRAPS, + m_particle->CreateParticle(pos, speed, dim, Gfx::PARTISCRAPS, Math::Rand()*0.5f+0.5f, 2.0f, 0.0f, - SH_INTERFACE); + Gfx::SH_INTERFACE); } else { @@ -3588,10 +3594,10 @@ void CMainDialog::NiceParticule(Math::Point mouse, bool bPress) speed.z = 0.0f; dim.x = 0.01f+Math::Rand()*0.01f; dim.y = dim.x/0.75f; - m_particule->CreateParticule(pos, speed, dim, - (ParticuleType)(PARTILENS1+rand()%3), + m_particle->CreateParticle(pos, speed, dim, + (Gfx::ParticleType)(Gfx::PARTILENS1+rand()%3), Math::Rand()*0.5f+0.5f, 2.0f, 0.0f, - SH_INTERFACE); + Gfx::SH_INTERFACE); } } @@ -3635,9 +3641,9 @@ void CMainDialog::BuildResumeName(char *filename, char *base, int rank) sprintf(filename, "Scene %s %d", base, rank); } -// Returns the name of the file or save the files. +// Geturns the name of the file or save the files. -char* CMainDialog::RetFilesDir() +char* CMainDialog::GetFilesDir() { return m_filesDir; } @@ -3650,11 +3656,11 @@ void CMainDialog::ReadNameList() CWindow* pw; CList* pl; long hFile; - struct _finddata_t fBuffer; + //struct _finddata_t fBuffer; bool bDo; - char dir[_MAX_FNAME]; - char temp[_MAX_FNAME]; - char filenames[_MAX_FNAME][100]; + char dir[MAX_FNAME]; + char temp[MAX_FNAME]; + char filenames[MAX_FNAME][100]; int nbFilenames, i; pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW5); @@ -3664,6 +3670,7 @@ void CMainDialog::ReadNameList() pl->Flush(); nbFilenames = 0; + /* TODO: list dir sprintf(dir, "%s\\*", m_savegameDir); hFile = _findfirst(dir, &fBuffer); if ( hFile != -1 ) @@ -3691,7 +3698,9 @@ void CMainDialog::ReadNameList() } } } - while ( bDo ); + while ( bDo );*/ + + strcpy(filenames[nbFilenames++], "Test"); for ( i=0 ; iSearchControl(EVENT_INTERFACE_NEDIT); if ( pe == 0 ) return; - gamer = m_main->RetGamerName(); - total = pl->RetTotal(); - sel = pl->RetSelect(); + gamer = m_main->GetGamerName(); + total = pl->GetTotal(); + sel = pl->GetSelect(); pe->GetText(name, 100); pb = (CButton*)pw->SearchControl(EVENT_INTERFACE_NCANCEL); @@ -3766,12 +3775,13 @@ void CMainDialog::UpdateNameList() if ( pe == 0 ) return; pe->GetText(name, 100); - total = pl->RetTotal(); - sel = pl->RetSelect(); + total = pl->GetTotal(); + sel = pl->GetSelect(); for ( i=0 ; iRetName(i)) == 0 ) + // TODO: stricmp? + if ( strcmp(name, pl->GetName(i)) == 0 ) { pl->SetSelect(i); pl->ShowSelect(false); @@ -3799,7 +3809,7 @@ void CMainDialog::UpdateNameEdit() pe = (CEdit*)pw->SearchControl(EVENT_INTERFACE_NEDIT); if ( pe == 0 ) return; - sel = pl->RetSelect(); + sel = pl->GetSelect(); if ( sel == -1 ) { pe->SetText(""); @@ -3807,7 +3817,7 @@ void CMainDialog::UpdateNameEdit() } else { - name = pl->RetName(sel); + name = pl->GetName(sel); pe->SetText(name); pe->SetCursor(strlen(name), 0); } @@ -3829,9 +3839,9 @@ void CMainDialog::UpdateNameFace() pl = (CList*)pw->SearchControl(EVENT_INTERFACE_NLIST); if ( pl == 0 ) return; - sel = pl->RetSelect(); + sel = pl->GetSelect(); if ( sel == -1 ) return; - name = pl->RetName(sel); + name = pl->GetName(sel); ReadGamerPerso(name); } @@ -3854,7 +3864,7 @@ void CMainDialog::NameSelect() if ( pe == 0 ) return; pe->GetText(name, 100); - sel = pl->RetSelect(); + sel = pl->GetSelect(); if ( sel == -1 ) { @@ -3862,13 +3872,13 @@ void CMainDialog::NameSelect() } else { - m_main->SetGamerName(pl->RetName(sel)); + m_main->SetGamerName(pl->GetName(sel)); m_main->ChangePhase(PHASE_INIT); } - RetGamerFace(m_main->RetGamerName()); + GetGamerFace(m_main->GetGamerName()); - SetLocalProfileString("Gamer", "LastName", m_main->RetGamerName()); + // TODO: SetLocalProfileString("Gamer", "LastName", m_main->GetGamerName()); } // Creates a new player. @@ -3898,7 +3908,7 @@ void CMainDialog::NameCreate() j = 0; for ( i=0 ; i= '0' && c <= '9') || (c >= 'a' && c <= 'z') || c == ' ' || @@ -3918,10 +3928,10 @@ void CMainDialog::NameCreate() return; } - _mkdir(m_savegameDir); // if does not exist yet! + // TODO: _mkdir(m_savegameDir); // if does not exist yet! sprintf(dir, "%s\\%s", m_savegameDir, name); - if ( _mkdir(dir) != 0 ) + // TODO: if ( _mkdir(dir) != 0 ) { m_sound->Play(SOUND_TZOING); pe->SetText(name); @@ -3940,6 +3950,7 @@ void CMainDialog::NameCreate() bool RemoveDir(char *dirname) { + /* TODO: remove dir long hFile; struct _finddata_t fBuffer; char filename[100]; @@ -3970,7 +3981,7 @@ bool RemoveDir(char *dirname) if ( _rmdir(dirname) != 0 ) { return false; - } + }*/ return true; } @@ -3989,13 +4000,13 @@ void CMainDialog::NameDelete() pl = (CList*)pw->SearchControl(EVENT_INTERFACE_NLIST); if ( pl == 0 ) return; - sel = pl->RetSelect(); + sel = pl->GetSelect(); if ( sel == -1 ) { m_sound->Play(SOUND_TZOING); return; } - gamer = pl->RetName(sel); + gamer = pl->GetName(sel); // Deletes all the contents of the file. sprintf(dir, "%s\\%s", m_savegameDir, gamer); @@ -4017,7 +4028,7 @@ void CMainDialog::NameDelete() // ests whether two colors are equal or nearly are. -bool EqColor(const D3DCOLORVALUE &c1, const D3DCOLORVALUE &c2) +bool EqColor(const Gfx::Color &c1, const Gfx::Color &c2) { return (fabs(c1.r-c2.r) < 0.01f && fabs(c1.g-c2.g) < 0.01f && @@ -4033,7 +4044,7 @@ void CMainDialog::UpdatePerso() CButton* pb; CColor* pc; CSlider* ps; - D3DCOLORVALUE color; + Gfx::Color color; char name[100]; int i; @@ -4106,7 +4117,7 @@ void CMainDialog::UpdatePerso() for ( i=0 ; i<4 ; i++ ) { - pb = (CButton*)pw->SearchControl((EventMsg)(EVENT_INTERFACE_PFACE1+i)); + pb = (CButton*)pw->SearchControl((EventType)(EVENT_INTERFACE_PFACE1+i)); if ( pb == 0 ) break; pb->SetState(STATE_VISIBLE, m_persoTab==0); pb->SetState(STATE_CHECK, i==m_perso.face); @@ -4114,7 +4125,7 @@ void CMainDialog::UpdatePerso() for ( i=0 ; i<10 ; i++ ) { - pb = (CButton*)pw->SearchControl((EventMsg)(EVENT_INTERFACE_PGLASS0+i)); + pb = (CButton*)pw->SearchControl((EventType)(EVENT_INTERFACE_PGLASS0+i)); if ( pb == 0 ) break; pb->SetState(STATE_VISIBLE, m_persoTab==0); pb->SetState(STATE_CHECK, i==m_perso.glasses); @@ -4122,7 +4133,7 @@ void CMainDialog::UpdatePerso() for ( i=0 ; i<3*3 ; i++ ) { - pc = (CColor*)pw->SearchControl((EventMsg)(EVENT_INTERFACE_PC0a+i)); + pc = (CColor*)pw->SearchControl((EventType)(EVENT_INTERFACE_PC0a+i)); if ( pc == 0 ) break; if ( m_persoTab == 0 ) { @@ -4139,7 +4150,7 @@ void CMainDialog::UpdatePerso() pc->SetState(STATE_CHECK, EqColor(color, m_perso.colorCombi)); } - pc = (CColor*)pw->SearchControl((EventMsg)(EVENT_INTERFACE_PC0b+i)); + pc = (CColor*)pw->SearchControl((EventType)(EVENT_INTERFACE_PC0b+i)); if ( pc == 0 ) break; color.r = perso_color[3*10*2*m_persoTab+3*i+0]/255.0f; color.g = perso_color[3*10*2*m_persoTab+3*i+1]/255.0f; @@ -4151,7 +4162,7 @@ void CMainDialog::UpdatePerso() for ( i=0 ; i<3 ; i++ ) { - ps = (CSlider*)pw->SearchControl((EventMsg)(EVENT_INTERFACE_PCRa+i)); + ps = (CSlider*)pw->SearchControl((EventType)(EVENT_INTERFACE_PCRa+i)); if ( ps == 0 ) break; ps->SetState(STATE_VISIBLE, m_persoTab==1); } @@ -4194,7 +4205,7 @@ void CMainDialog::CameraPerso() Math::Vector(0.0f, 1.6f, 4.5f), 0.0f); } - m_camera->SetType(CAMERA_SCRIPT); + m_camera->SetType(Gfx::CAM_TYPE_SCRIPT); m_camera->FixCamera(); } @@ -4234,7 +4245,7 @@ void CMainDialog::ColorPerso() { CWindow* pw; CSlider* ps; - D3DCOLORVALUE color; + Gfx::Color color; pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW5); if ( pw == 0 ) return; @@ -4242,19 +4253,19 @@ void CMainDialog::ColorPerso() color.a = 0.0f; ps = (CSlider*)pw->SearchControl(EVENT_INTERFACE_PCRa); - if ( ps != 0 ) color.r = ps->RetVisibleValue()/255.0f; + if ( ps != 0 ) color.r = ps->GetVisibleValue()/255.0f; ps = (CSlider*)pw->SearchControl(EVENT_INTERFACE_PCGa); - if ( ps != 0 ) color.g = ps->RetVisibleValue()/255.0f; + if ( ps != 0 ) color.g = ps->GetVisibleValue()/255.0f; ps = (CSlider*)pw->SearchControl(EVENT_INTERFACE_PCBa); - if ( ps != 0 ) color.b = ps->RetVisibleValue()/255.0f; + if ( ps != 0 ) color.b = ps->GetVisibleValue()/255.0f; if ( m_persoTab == 1 ) m_perso.colorCombi = color; ps = (CSlider*)pw->SearchControl(EVENT_INTERFACE_PCRb); - if ( ps != 0 ) color.r = ps->RetVisibleValue()/255.0f; + if ( ps != 0 ) color.r = ps->GetVisibleValue()/255.0f; ps = (CSlider*)pw->SearchControl(EVENT_INTERFACE_PCGb); - if ( ps != 0 ) color.g = ps->RetVisibleValue()/255.0f; + if ( ps != 0 ) color.g = ps->GetVisibleValue()/255.0f; ps = (CSlider*)pw->SearchControl(EVENT_INTERFACE_PCBb); - if ( ps != 0 ) color.b = ps->RetVisibleValue()/255.0f; + if ( ps != 0 ) color.b = ps->GetVisibleValue()/255.0f; if ( m_persoTab == 0 ) m_perso.colorHair = color; else m_perso.colorBand = color; } @@ -4312,7 +4323,7 @@ bool CMainDialog::IsIOReadScene() FILE* file; char filename[100]; - sprintf(filename, "%s\\%s\\save%c%.3d\\data.sav", m_savegameDir, m_main->RetGamerName(), m_sceneName[0], 0); + sprintf(filename, "%s\\%s\\save%c%.3d\\data.sav", m_savegameDir, m_main->GetGamerName(), m_sceneName[0], 0); file = fopen(filename, "r"); if ( file == NULL ) return false; fclose(file); @@ -4326,7 +4337,7 @@ void CMainDialog::IOReadName() FILE* file; CWindow* pw; CEdit* pe; - char filename[_MAX_FNAME]; + char filename[MAX_FNAME]; char op[100]; char line[500]; char resume[100]; @@ -4356,7 +4367,8 @@ void CMainDialog::IOReadName() } } - sprintf(op, "Title.%c", RetLanguageLetter()); + // TODO: language letters + sprintf(op, "Title.%c", 'E' /*MAX_FNAME()*/ ); if ( Cmd(line, op) ) { OpString(line, "resume", resume); @@ -4395,7 +4407,7 @@ void CMainDialog::IOReadList() for ( j=0 ; j<999 ; j++ ) { - sprintf(filename, "%s\\%s\\save%c%.3d\\data.sav", m_savegameDir, m_main->RetGamerName(), m_sceneName[0], j); + sprintf(filename, "%s\\%s\\save%c%.3d\\data.sav", m_savegameDir, m_main->GetGamerName(), m_sceneName[0], j); file = fopen(filename, "r"); if ( file == NULL ) break; @@ -4454,10 +4466,10 @@ void CMainDialog::IOUpdateList() pi = (CImage*)pw->SearchControl(EVENT_INTERFACE_IOIMAGE); if ( pi == 0 ) return; - sel = pl->RetSelect(); - max = pl->RetTotal(); + sel = pl->GetSelect(); + max = pl->GetTotal(); - sprintf(filename, "%s\\%s\\save%c%.3d\\screen.bmp", m_savegameDir, m_main->RetGamerName(), m_sceneName[0], sel); + sprintf(filename, "%s\\%s\\save%c%.3d\\screen.png", m_savegameDir, m_main->GetGamerName(), m_sceneName[0], sel); if ( m_phase == PHASE_WRITE || m_phase == PHASE_WRITEs ) @@ -4492,7 +4504,7 @@ void CMainDialog::IODeleteScene() char dir[100]; char old[100]; long hFile; - struct _finddata_t fBuffer; + //struct _finddata_t fBuffer; int sel, max, i; pw = (CWindow*)m_interface->SearchControl(EVENT_WINDOW5); @@ -4500,15 +4512,16 @@ void CMainDialog::IODeleteScene() pl = (CList*)pw->SearchControl(EVENT_INTERFACE_IOLIST); if ( pl == 0 ) return; - sel = pl->RetSelect(); + sel = pl->GetSelect(); if ( sel == -1 ) { m_sound->Play(SOUND_TZOING); return; } + /* TODO: remove files // Deletes all the contents of the file. - sprintf(dir, "%s\\%s\\save%c%.3d\\*", m_savegameDir, m_main->RetGamerName(), m_sceneName[0], sel); + sprintf(dir, "%s\\%s\\save%c%.3d\\*", m_savegameDir, m_main->GetGamerName(), m_sceneName[0], sel); hFile = _findfirst(dir, &fBuffer); if ( hFile != -1 ) { @@ -4516,27 +4529,28 @@ void CMainDialog::IODeleteScene() { if ( fBuffer.name[0] != '.' ) { - sprintf(dir, "%s\\%s\\save%c%.3d\\%s", m_savegameDir, m_main->RetGamerName(), m_sceneName[0], sel, fBuffer.name); + sprintf(dir, "%s\\%s\\save%c%.3d\\%s", m_savegameDir, m_main->GetGamerName(), m_sceneName[0], sel, fBuffer.name); remove(dir); } } while ( _findnext(hFile, &fBuffer) == 0 ); } - sprintf(dir, "%s\\%s\\save%c%.3d", m_savegameDir, m_main->RetGamerName(), m_sceneName[0], sel); + sprintf(dir, "%s\\%s\\save%c%.3d", m_savegameDir, m_main->GetGamerName(), m_sceneName[0], sel); if ( _rmdir(dir) != 0 ) { m_sound->Play(SOUND_TZOING); return; - } + }*/ - max = pl->RetTotal(); + /* TODO: rename + max = pl->GetTotal(); for ( i=sel+1 ; iRetGamerName(), m_sceneName[0], i); - sprintf(dir, "%s\\%s\\save%c%.3d", m_savegameDir, m_main->RetGamerName(), m_sceneName[0], i-1); + sprintf(old, "%s\\%s\\save%c%.3d", m_savegameDir, m_main->GetGamerName(), m_sceneName[0], i); + sprintf(dir, "%s\\%s\\save%c%.3d", m_savegameDir, m_main->GetGamerName(), m_sceneName[0], i-1); rename(old, dir); - } + }*/ IOReadList(); } @@ -4559,22 +4573,22 @@ bool CMainDialog::IOWriteScene() pe = (CEdit*)pw->SearchControl(EVENT_INTERFACE_IONAME); if ( pe == 0 ) return false; - sel = pl->RetSelect(); + sel = pl->GetSelect(); if ( sel == -1 ) return false; - _mkdir("Savegame"); // if doesn't exist yet! - sprintf(filename, "%s\\%s", m_savegameDir, m_main->RetGamerName()); - _mkdir(filename); - sprintf(filename, "%s\\%s\\save%c%.3d", m_savegameDir, m_main->RetGamerName(), m_sceneName[0], sel); - _mkdir(filename); + // TODO: _mkdir("Savegame"); // if doesn't exist yet! + sprintf(filename, "%s\\%s", m_savegameDir, m_main->GetGamerName()); + // TODO: _mkdir(filename); + sprintf(filename, "%s\\%s\\save%c%.3d", m_savegameDir, m_main->GetGamerName(), m_sceneName[0], sel); + // TODO: _mkdir(filename); - sprintf(filename, "%s\\%s\\save%c%.3d\\data.sav", m_savegameDir, m_main->RetGamerName(), m_sceneName[0], sel); - sprintf(filecbot, "%s\\%s\\save%c%.3d\\cbot.run", m_savegameDir, m_main->RetGamerName(), m_sceneName[0], sel); + sprintf(filename, "%s\\%s\\save%c%.3d\\data.sav", m_savegameDir, m_main->GetGamerName(), m_sceneName[0], sel); + sprintf(filecbot, "%s\\%s\\save%c%.3d\\cbot.run", m_savegameDir, m_main->GetGamerName(), m_sceneName[0], sel); pe->GetText(info, 100); m_main->IOWriteScene(filename, filecbot, info); m_shotDelay = 3; - sprintf(m_shotName, "%s\\%s\\save%c%.3d\\screen.bmp", m_savegameDir, m_main->RetGamerName(), m_sceneName[0], sel); + sprintf(m_shotName, "%s\\%s\\save%c%.3d\\screen.png", m_savegameDir, m_main->GetGamerName(), m_sceneName[0], sel); return true; } @@ -4597,11 +4611,11 @@ bool CMainDialog::IOReadScene() pl = (CList*)pw->SearchControl(EVENT_INTERFACE_IOLIST); if ( pl == 0 ) return false; - sel = pl->RetSelect(); + sel = pl->GetSelect(); if ( sel == -1 ) return false; - sprintf(filename, "%s\\%s\\save%c%.3d\\data.sav", m_savegameDir, m_main->RetGamerName(), m_sceneName[0], sel); - sprintf(filecbot, "%s\\%s\\save%c%.3d\\cbot.run", m_savegameDir, m_main->RetGamerName(), m_sceneName[0], sel); + sprintf(filename, "%s\\%s\\save%c%.3d\\data.sav", m_savegameDir, m_main->GetGamerName(), m_sceneName[0], sel); + sprintf(filecbot, "%s\\%s\\save%c%.3d\\cbot.run", m_savegameDir, m_main->GetGamerName(), m_sceneName[0], sel); file = fopen(filename, "r"); if ( file == NULL ) return false; @@ -4654,17 +4668,17 @@ bool CMainDialog::IOReadScene() } -// Returns the number of accessible chapters. +// Geturns the number of accessible chapters. -int CMainDialog::RetChapPassed() +int CMainDialog::GetChapPassed() { int j; - if ( m_main->RetShowAll() ) return 9; + if ( m_main->GetShowAll() ) return 9; for ( j=0 ; j<9 ; j++ ) { - if ( !RetGamerInfoPassed((j+1)*100) ) + if ( !GetGamerInfoPassed((j+1)*100) ) { return j; } @@ -4697,8 +4711,8 @@ void CMainDialog::UpdateSceneChap(int &chap) CWindow* pw; CList* pl; long hFile; - struct _finddata_t fileBuffer; - char filename[_MAX_FNAME]; + //struct _finddata_t fileBuffer; + char filename[MAX_FNAME]; char op[100]; char line[500]; char name[100]; @@ -4715,6 +4729,7 @@ void CMainDialog::UpdateSceneChap(int &chap) if ( m_phase == PHASE_USER ) { j = 0; + /* TODO: list files hFile = _findfirst("user\\*", &fileBuffer); if ( hFile != -1 ) { @@ -4727,7 +4742,7 @@ void CMainDialog::UpdateSceneChap(int &chap) } } while ( _findnext(hFile, &fileBuffer) == 0 && j < 100 ); - } + }*/ m_userTotal = j; do // sorts all names: @@ -4769,7 +4784,8 @@ void CMainDialog::UpdateSceneChap(int &chap) } } - sprintf(op, "Title.%c", RetLanguageLetter()); + /* TODO: language letters */ + sprintf(op, "Title.%c", 'E' /*GetLanguageLetter()*/); if ( Cmd(line, op) ) { OpString(line, "text", name); @@ -4787,7 +4803,7 @@ void CMainDialog::UpdateSceneChap(int &chap) { for ( j=0 ; j<9 ; j++ ) { -#if _SCHOOL +/* TODO: #if _SCHOOL if ( m_phase == PHASE_MISSION ) break; if ( m_phase == PHASE_FREE ) break; #if _CEEBOTDEMO @@ -4797,7 +4813,7 @@ void CMainDialog::UpdateSceneChap(int &chap) #if _DEMO if ( m_phase == PHASE_MISSION && j >= 4 ) break; if ( m_phase == PHASE_TRAINER && j >= 1 ) break; -#endif +#endif */ BuildSceneName(filename, m_sceneName, (j+1)*100); file = fopen(filename, "r"); if ( file == NULL ) break; @@ -4815,7 +4831,8 @@ void CMainDialog::UpdateSceneChap(int &chap) } } - sprintf(op, "Title.%c", RetLanguageLetter()); + // TODO: language letters + sprintf(op, "Title.%c", 'E'/*GetLanguageLetter()*/); if ( Cmd(line, op) ) { OpString(line, "text", name); @@ -4824,25 +4841,25 @@ void CMainDialog::UpdateSceneChap(int &chap) } fclose(file); - bPassed = RetGamerInfoPassed((j+1)*100); + bPassed = GetGamerInfoPassed((j+1)*100); sprintf(line, "%d: %s", j+1, name); pl->SetName(j, line); pl->SetCheck(j, bPassed); pl->SetEnable(j, true); - if ( m_phase == PHASE_MISSION && !m_main->RetShowAll() && !bPassed ) + if ( m_phase == PHASE_MISSION && !m_main->GetShowAll() && !bPassed ) { j ++; break; } -#if _TEEN - if ( m_phase == PHASE_TRAINER && !m_main->RetShowAll() && !bPassed ) +/* TODO: #if _TEEN + if ( m_phase == PHASE_TRAINER && !m_main->GetShowAll() && !bPassed ) { j ++; break; } -#endif +#endif*/ if ( m_phase == PHASE_FREE && j == m_accessChap ) { @@ -4865,7 +4882,7 @@ void CMainDialog::UpdateSceneList(int chap, int &sel) FILE* file = NULL; CWindow* pw; CList* pl; - char filename[_MAX_FNAME]; + char filename[MAX_FNAME]; char op[100]; char line[500]; char name[100]; @@ -4881,7 +4898,7 @@ void CMainDialog::UpdateSceneList(int chap, int &sel) for ( j=0 ; j<99 ; j++ ) { -#if _SCHOOL +/* TODO: #if _SCHOOL if ( m_phase == PHASE_MISSION ) break; if ( m_phase == PHASE_FREE ) break; #if _CEEBOTDEMO @@ -4895,7 +4912,7 @@ void CMainDialog::UpdateSceneList(int chap, int &sel) #if _DEMO if ( m_phase == PHASE_MISSION && j >= 3 ) break; if ( m_phase == PHASE_TRAINER && j >= 5 ) break; -#endif +#endif */ BuildSceneName(filename, m_sceneName, (chap+1)*100+(j+1)); file = fopen(filename, "r"); if ( file == NULL ) break; @@ -4913,7 +4930,8 @@ void CMainDialog::UpdateSceneList(int chap, int &sel) } } - sprintf(op, "Title.%c", RetLanguageLetter()); + // TODO: language letters + sprintf(op, "Title.%c", 'E' /*MAX_FNAME()*/); if ( Cmd(line, op) ) { OpString(line, "text", name); @@ -4922,25 +4940,25 @@ void CMainDialog::UpdateSceneList(int chap, int &sel) } fclose(file); - bPassed = RetGamerInfoPassed((chap+1)*100+(j+1)); + bPassed = GetGamerInfoPassed((chap+1)*100+(j+1)); sprintf(line, "%d: %s", j+1, name); pl->SetName(j, line); pl->SetCheck(j, bPassed); pl->SetEnable(j, true); - if ( m_phase == PHASE_MISSION && !m_main->RetShowAll() && !bPassed ) + if ( m_phase == PHASE_MISSION && !m_main->GetShowAll() && !bPassed ) { j ++; break; } -#if _TEEN - if ( m_phase == PHASE_TRAINER && !m_main->RetShowAll() && !bPassed ) +/* TODO: #if _TEEN + if ( m_phase == PHASE_TRAINER && !m_main->GetShowAll() && !bPassed ) { j ++; break; } -#endif +#endif*/ } BuildSceneName(filename, m_sceneName, (chap+1)*100+(j+1)); @@ -4986,7 +5004,7 @@ void CMainDialog::ShowSoluceUpdate() pc = (CCheck*)pw->SearchControl(EVENT_INTERFACE_SOLUCE); if ( pc == 0 ) return; - if ( m_main->RetShowSoluce() ) + if ( m_main->GetShowSoluce() ) { pc->SetState(STATE_VISIBLE); pc->SetState(STATE_CHECK); @@ -5009,7 +5027,7 @@ void CMainDialog::UpdateSceneResume(int rank) CWindow* pw; CEdit* pe; CCheck* pc; - char filename[_MAX_FNAME]; + char filename[MAX_FNAME]; char op[100]; char line[500]; char name[500]; @@ -5028,10 +5046,10 @@ void CMainDialog::UpdateSceneResume(int rank) } else { - numTry = RetGamerInfoTry(rank); - bPassed = RetGamerInfoPassed(rank); - bVisible = ( numTry > 2 || bPassed || m_main->RetShowSoluce() ); - if ( !RetSoluce4() ) bVisible = false; + numTry = GetGamerInfoTry(rank); + bPassed = GetGamerInfoPassed(rank); + bVisible = ( numTry > 2 || bPassed || m_main->GetShowSoluce() ); + if ( !GetSoluce4() ) bVisible = false; pc->SetState(STATE_VISIBLE, bVisible); if ( !bVisible ) { @@ -5057,7 +5075,8 @@ void CMainDialog::UpdateSceneResume(int rank) } } - sprintf(op, "Resume.%c", RetLanguageLetter()); + // TODO: language letters + sprintf(op, "Resume.%c", 'E' /*MAX_FNAME()*/); if ( Cmd(line, op) ) { OpString(line, "text", name); @@ -5085,10 +5104,12 @@ void CMainDialog::UpdateDisplayDevice() if ( pl == 0 ) return; pl->Flush(); + bufModes[0] = 0; + /* TODO: remove device choice m_engine->EnumDevices(bufDevices, 1000, bufModes, 5000, totalDevices, selectDevices, - totalModes, selectModes); + totalModes, selectModes);*/ i = 0; j = 0; @@ -5120,10 +5141,12 @@ void CMainDialog::UpdateDisplayMode() if ( pl == 0 ) return; pl->Flush(); + bufModes[0] = 0; + /* TODO: remove device choice m_engine->EnumDevices(bufDevices, 1000, bufModes, 5000, totalDevices, selectDevices, - totalModes, selectModes); + totalModes, selectModes);*/ i = 0; j = 0; @@ -5155,20 +5178,21 @@ void CMainDialog::ChangeDisplay() pl = (CList*)pw->SearchControl(EVENT_LIST1); if ( pl == 0 ) return; - m_setupSelDevice = pl->RetSelect(); - device = pl->RetName(m_setupSelDevice); + m_setupSelDevice = pl->GetSelect(); + device = pl->GetName(m_setupSelDevice); pl = (CList*)pw->SearchControl(EVENT_LIST2); if ( pl == 0 ) return; - m_setupSelMode = pl->RetSelect(); - mode = pl->RetName(m_setupSelMode); + m_setupSelMode = pl->GetSelect(); + mode = pl->GetName(m_setupSelMode); pc = (CCheck*)pw->SearchControl(EVENT_INTERFACE_FULL); if ( pc == 0 ) return; bFull = pc->TestState(STATE_CHECK); m_setupFull = bFull; - m_engine->ChangeDevice(device, mode, bFull); + // TODO: remove device choice + // m_engine->ChangeDevice(device, mode, bFull); if ( m_bSimulSetup ) { @@ -5198,11 +5222,11 @@ void CMainDialog::UpdateApply() pl = (CList*)pw->SearchControl(EVENT_LIST1); if ( pl == 0 ) return; - sel1 = pl->RetSelect(); + sel1 = pl->GetSelect(); pl = (CList*)pw->SearchControl(EVENT_LIST2); if ( pl == 0 ) return; - sel2 = pl->RetSelect(); + sel2 = pl->GetSelect(); pc = (CCheck*)pw->SearchControl(EVENT_INTERFACE_FULL); bFull = pc->TestState(STATE_CHECK); @@ -5235,7 +5259,7 @@ void CMainDialog::UpdateSetupButtons() pc = (CCheck*)pw->SearchControl(EVENT_INTERFACE_TOTO); if ( pc != 0 ) { - pc->SetState(STATE_CHECK, m_engine->RetTotoMode()); + pc->SetState(STATE_CHECK, m_engine->GetTotoMode()); } pc = (CCheck*)pw->SearchControl(EVENT_INTERFACE_TOOLTIP); @@ -5259,20 +5283,21 @@ void CMainDialog::UpdateSetupButtons() pc = (CCheck*)pw->SearchControl(EVENT_INTERFACE_MOUSE); if ( pc != 0 ) { - pc->SetState(STATE_CHECK, m_engine->RetNiceMouse()); - pc->SetState(STATE_ENABLE, m_engine->RetNiceMouseCap()); + /* TODO: nice mouse? + pc->SetState(STATE_CHECK, m_engine->GetNiceMouse()); + pc->SetState(STATE_ENABLE, m_engine->GetNiceMouseCap());*/ } pc = (CCheck*)pw->SearchControl(EVENT_INTERFACE_EDITMODE); if ( pc != 0 ) { - pc->SetState(STATE_CHECK, m_engine->RetEditIndentMode()); + pc->SetState(STATE_CHECK, m_engine->GetEditIndentMode()); } pc = (CCheck*)pw->SearchControl(EVENT_INTERFACE_EDITVALUE); if ( pc != 0 ) { - pc->SetState(STATE_CHECK, m_engine->RetEditIndentValue()>2); + pc->SetState(STATE_CHECK, m_engine->GetEditIndentValue()>2); } pc = (CCheck*)pw->SearchControl(EVENT_INTERFACE_SOLUCE4); @@ -5326,111 +5351,112 @@ void CMainDialog::UpdateSetupButtons() pc = (CCheck*)pw->SearchControl(EVENT_INTERFACE_SHADOW); if ( pc != 0 ) { - pc->SetState(STATE_CHECK, m_engine->RetShadow()); + pc->SetState(STATE_CHECK, m_engine->GetShadow()); } pc = (CCheck*)pw->SearchControl(EVENT_INTERFACE_GROUND); if ( pc != 0 ) { - pc->SetState(STATE_CHECK, m_engine->RetGroundSpot()); + pc->SetState(STATE_CHECK, m_engine->GetGroundSpot()); } pc = (CCheck*)pw->SearchControl(EVENT_INTERFACE_DIRTY); if ( pc != 0 ) { - pc->SetState(STATE_CHECK, m_engine->RetDirty()); + pc->SetState(STATE_CHECK, m_engine->GetDirty()); } pc = (CCheck*)pw->SearchControl(EVENT_INTERFACE_FOG); if ( pc != 0 ) { - pc->SetState(STATE_CHECK, m_engine->RetFog()); + pc->SetState(STATE_CHECK, m_engine->GetFog()); } pc = (CCheck*)pw->SearchControl(EVENT_INTERFACE_LENS); if ( pc != 0 ) { - pc->SetState(STATE_CHECK, m_engine->RetLensMode()); + pc->SetState(STATE_CHECK, m_engine->GetLensMode()); } pc = (CCheck*)pw->SearchControl(EVENT_INTERFACE_SKY); if ( pc != 0 ) { - pc->SetState(STATE_CHECK, m_engine->RetSkyMode()); + pc->SetState(STATE_CHECK, m_engine->GetSkyMode()); } pc = (CCheck*)pw->SearchControl(EVENT_INTERFACE_PLANET); if ( pc != 0 ) { - pc->SetState(STATE_CHECK, m_engine->RetPlanetMode()); + pc->SetState(STATE_CHECK, m_engine->GetPlanetMode()); } pc = (CCheck*)pw->SearchControl(EVENT_INTERFACE_LIGHT); if ( pc != 0 ) { - pc->SetState(STATE_CHECK, m_engine->RetLightMode()); + pc->SetState(STATE_CHECK, m_engine->GetLightMode()); } pc = (CCheck*)pw->SearchControl(EVENT_INTERFACE_JOYSTICK); if ( pc != 0 ) { - pc->SetState(STATE_CHECK, m_engine->RetJoystick()); + pc->SetState(STATE_CHECK, m_app->GetJoystickEnabled()); } pv = (CEditValue*)pw->SearchControl(EVENT_INTERFACE_PARTI); if ( pv != 0 ) { - value = m_engine->RetParticuleDensity(); + value = m_engine->GetParticleDensity(); pv->SetValue(value); } pv = (CEditValue*)pw->SearchControl(EVENT_INTERFACE_CLIP); if ( pv != 0 ) { - value = m_engine->RetClippingDistance(); + value = m_engine->GetClippingDistance(); pv->SetValue(value); } pv = (CEditValue*)pw->SearchControl(EVENT_INTERFACE_DETAIL); if ( pv != 0 ) { - value = m_engine->RetObjectDetail(); + value = m_engine->GetObjectDetail(); pv->SetValue(value); } pv = (CEditValue*)pw->SearchControl(EVENT_INTERFACE_GADGET); if ( pv != 0 ) { - value = m_engine->RetGadgetQuantity(); + value = m_engine->GetGadgetQuantity(); pv->SetValue(value); } pv = (CEditValue*)pw->SearchControl(EVENT_INTERFACE_TEXTURE); if ( pv != 0 ) { - value = (float)m_engine->RetTextureQuality(); + value = (float)m_engine->GetTextureQuality(); pv->SetValue(value); } ps = (CSlider*)pw->SearchControl(EVENT_INTERFACE_VOLSOUND); if ( ps != 0 ) { - value = (float)m_sound->RetAudioVolume(); + value = (float)m_sound->GetAudioVolume(); ps->SetVisibleValue(value); } ps = (CSlider*)pw->SearchControl(EVENT_INTERFACE_VOLMUSIC); if ( ps != 0 ) { - value = (float)m_sound->RetMidiVolume(); - ps->SetVisibleValue(value); + /* TODO: midi volume + value = (float)m_sound->GetMidiVolume(); + ps->SetVisibleValue(value);*/ } pc = (CCheck*)pw->SearchControl(EVENT_INTERFACE_SOUND3D); if ( pc != 0 ) { - pc->SetState(STATE_CHECK, m_sound->RetSound3D()); - pc->SetState(STATE_ENABLE, m_sound->RetSound3DCap()); + pc->SetState(STATE_CHECK, m_sound->GetSound3D()); + pc->SetState(STATE_ENABLE, m_sound->GetSound3DCap()); } } @@ -5449,50 +5475,52 @@ void CMainDialog::ChangeSetupButtons() pv = (CEditValue*)pw->SearchControl(EVENT_INTERFACE_PARTI); if ( pv != 0 ) { - value = pv->RetValue(); - m_engine->SetParticuleDensity(value); + value = pv->GetValue(); + m_engine->SetParticleDensity(value); } pv = (CEditValue*)pw->SearchControl(EVENT_INTERFACE_CLIP); if ( pv != 0 ) { - value = pv->RetValue(); + value = pv->GetValue(); m_engine->SetClippingDistance(value); } pv = (CEditValue*)pw->SearchControl(EVENT_INTERFACE_DETAIL); if ( pv != 0 ) { - value = pv->RetValue(); + value = pv->GetValue(); m_engine->SetObjectDetail(value); } pv = (CEditValue*)pw->SearchControl(EVENT_INTERFACE_GADGET); if ( pv != 0 ) { - value = pv->RetValue(); + value = pv->GetValue(); m_engine->SetGadgetQuantity(value); } pv = (CEditValue*)pw->SearchControl(EVENT_INTERFACE_TEXTURE); if ( pv != 0 ) { - value = pv->RetValue(); + value = pv->GetValue(); m_engine->SetTextureQuality((int)value); } ps = (CSlider*)pw->SearchControl(EVENT_INTERFACE_VOLSOUND); if ( ps != 0 ) { - value = ps->RetVisibleValue(); + value = ps->GetVisibleValue(); m_sound->SetAudioVolume((int)value); } ps = (CSlider*)pw->SearchControl(EVENT_INTERFACE_VOLMUSIC); if ( ps != 0 ) { - value = ps->RetVisibleValue(); - m_sound->SetMidiVolume((int)value); + /* + TODO: midi volume + value = ps->GetVisibleValue(); + m_sound->SetMidiVolume((int)value);*/ } } @@ -5506,13 +5534,14 @@ void CMainDialog::SetupMemorize() char key[500]; char num[10]; + /* TODO: profile SetLocalProfileString("Directory", "scene", m_sceneDir); SetLocalProfileString("Directory", "savegame", m_savegameDir); SetLocalProfileString("Directory", "public", m_publicDir); SetLocalProfileString("Directory", "user", m_userDir); SetLocalProfileString("Directory", "files", m_filesDir); - iValue = m_engine->RetTotoMode(); + iValue = m_engine->GetTotoMode(); SetLocalProfileInt("Setup", "TotoMode", iValue); iValue = m_bTooltip; @@ -5524,7 +5553,7 @@ void CMainDialog::SetupMemorize() iValue = m_bRain; SetLocalProfileInt("Setup", "InterfaceGlint", iValue); - iValue = m_engine->RetNiceMouse(); + iValue = m_engine->GetNiceMouse(); SetLocalProfileInt("Setup", "NiceMouse", iValue); iValue = m_bSoluce4; @@ -5548,78 +5577,80 @@ void CMainDialog::SetupMemorize() iValue = m_bEffect; SetLocalProfileInt("Setup", "InterfaceEffect", iValue); - iValue = m_engine->RetShadow(); + iValue = m_engine->GetShadow(); SetLocalProfileInt("Setup", "GroundShadow", iValue); - iValue = m_engine->RetGroundSpot(); + iValue = m_engine->GetGroundSpot(); SetLocalProfileInt("Setup", "GroundSpot", iValue); - iValue = m_engine->RetDirty(); + iValue = m_engine->GetDirty(); SetLocalProfileInt("Setup", "ObjectDirty", iValue); - iValue = m_engine->RetFog(); + iValue = m_engine->GetFog(); SetLocalProfileInt("Setup", "FogMode", iValue); - iValue = m_engine->RetLensMode(); + iValue = m_engine->GetLensMode(); SetLocalProfileInt("Setup", "LensMode", iValue); - iValue = m_engine->RetSkyMode(); + iValue = m_engine->GetSkyMode(); SetLocalProfileInt("Setup", "SkyMode", iValue); - iValue = m_engine->RetPlanetMode(); + iValue = m_engine->GetPlanetMode(); SetLocalProfileInt("Setup", "PlanetMode", iValue); - iValue = m_engine->RetLightMode(); + iValue = m_engine->GetLightMode(); SetLocalProfileInt("Setup", "LightMode", iValue); - iValue = m_engine->RetJoystick(); + iValue = m_engine->GetJoystick(); SetLocalProfileInt("Setup", "UseJoystick", iValue); - fValue = m_engine->RetParticuleDensity(); - SetLocalProfileFloat("Setup", "ParticuleDensity", fValue); + fValue = m_engine->GetParticleDensity(); + SetLocalProfileFloat("Setup", "ParticleDensity", fValue); - fValue = m_engine->RetClippingDistance(); + fValue = m_engine->GetClippingDistance(); SetLocalProfileFloat("Setup", "ClippingDistance", fValue); - fValue = m_engine->RetObjectDetail(); + fValue = m_engine->GetObjectDetail(); SetLocalProfileFloat("Setup", "ObjectDetail", fValue); - fValue = m_engine->RetGadgetQuantity(); + fValue = m_engine->GetGadgetQuantity(); SetLocalProfileFloat("Setup", "GadgetQuantity", fValue); - iValue = m_engine->RetTextureQuality(); + iValue = m_engine->GetTextureQuality(); SetLocalProfileInt("Setup", "TextureQuality", iValue); - iValue = m_sound->RetAudioVolume(); + iValue = m_sound->GetAudioVolume(); SetLocalProfileInt("Setup", "AudioVolume", iValue); - iValue = m_sound->RetMidiVolume(); + iValue = m_sound->GetMidiVolume(); SetLocalProfileInt("Setup", "MidiVolume", iValue); - iValue = m_sound->RetSound3D(); + iValue = m_sound->GetSound3D(); SetLocalProfileInt("Setup", "Sound3D", iValue); - iValue = m_engine->RetEditIndentMode(); + iValue = m_engine->GetEditIndentMode(); SetLocalProfileInt("Setup", "EditIndentMode", iValue); - iValue = m_engine->RetEditIndentValue(); - SetLocalProfileInt("Setup", "EditIndentValue", iValue); + iValue = m_engine->GetEditIndentValue(); + SetLocalProfileInt("Setup", "EditIndentValue", iValue);*/ - key[0] = 0; + /* key[0] = 0; for ( i=0 ; i<100 ; i++ ) { - if ( m_engine->RetKey(i, 0) == 0 ) break; + if ( m_engine->GetKey(i, 0) == 0 ) break; for ( j=0 ; j<2 ; j++ ) { - iValue = m_engine->RetKey(i, j); + iValue = m_engine->GetKey(i, j); sprintf(num, "%d%c", iValue, j==0?'+':' '); strcat(key, num); } - } - SetLocalProfileString("Setup", "KeyMap", key); + }*/ + + /* TODO: profile + SetLocalProfileString("Setup", "KeyMap", key); */ -#if _NET +/* TODO: #if _NET if ( m_accessEnable ) { iValue = m_accessMission; @@ -5628,12 +5659,14 @@ void CMainDialog::SetupMemorize() iValue = m_accessUser; SetLocalProfileInt("Setup", "AccessUser", iValue); } -#endif +#endif */ + /* TODO: profile iValue = m_bDeleteGamer; - SetLocalProfileInt("Setup", "DeleteGamer", iValue); + SetLocalProfileInt("Setup", "DeleteGamer", iValue); */ - m_engine->WriteProfile(); + // TODO: write profile + //m_engine->WriteProfile(); } // Remember all the settings. @@ -5645,27 +5678,28 @@ void CMainDialog::SetupRecall() char key[500]; char* p; - if ( GetLocalProfileString("Directory", "scene", key, _MAX_FNAME) ) + /* TODO: profile + if ( GetLocalProfileString("Directory", "scene", key, MAX_FNAME) ) { strcpy(m_sceneDir, key); } - if ( GetLocalProfileString("Directory", "savegame", key, _MAX_FNAME) ) + if ( GetLocalProfileString("Directory", "savegame", key, MAX_FNAME) ) { strcpy(m_savegameDir, key); } - if ( GetLocalProfileString("Directory", "public", key, _MAX_FNAME) ) + if ( GetLocalProfileString("Directory", "public", key, MAX_FNAME) ) { strcpy(m_publicDir, key); } - if ( GetLocalProfileString("Directory", "user", key, _MAX_FNAME) ) + if ( GetLocalProfileString("Directory", "user", key, MAX_FNAME) ) { strcpy(m_userDir, key); } - if ( GetLocalProfileString("Directory", "files", key, _MAX_FNAME) ) + if ( GetLocalProfileString("Directory", "files", key, MAX_FNAME) ) { strcpy(m_filesDir, key); } @@ -5757,7 +5791,7 @@ void CMainDialog::SetupRecall() if ( GetLocalProfileInt("Setup", "FogMode", iValue) ) { m_engine->SetFog(iValue); - m_camera->SetOverBaseColor(RetColor(RetColor(0.0f))); + m_camera->SetOverBaseColor(Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f))); // TODO: color ok? } if ( GetLocalProfileInt("Setup", "LensMode", iValue) ) @@ -5785,9 +5819,9 @@ void CMainDialog::SetupRecall() m_engine->SetJoystick(iValue); } - if ( GetLocalProfileFloat("Setup", "ParticuleDensity", fValue) ) + if ( GetLocalProfileFloat("Setup", "ParticleDensity", fValue) ) { - m_engine->SetParticuleDensity(fValue); + m_engine->SetParticleDensity(fValue); } if ( GetLocalProfileFloat("Setup", "ClippingDistance", fValue) ) @@ -5845,9 +5879,9 @@ void CMainDialog::SetupRecall() while ( *p == ' ' || *p == '+' ) p++; } } - } + } */ -#if _NET +/* TODO: #if _NET if ( m_accessEnable ) { if ( GetLocalProfileInt("Setup", "AccessMission", iValue) ) @@ -5860,12 +5894,13 @@ void CMainDialog::SetupRecall() m_accessUser = iValue; } } -#endif +#endif */ + /* TODO: profile if ( GetLocalProfileInt("Setup", "DeleteGamer", iValue) ) { m_bDeleteGamer = iValue; - } + } */ } @@ -5886,12 +5921,12 @@ void CMainDialog::ChangeSetupQuality(int quality) m_engine->SetSkyMode(bEnable); m_engine->SetPlanetMode(bEnable); m_engine->SetLightMode(bEnable); - m_camera->SetOverBaseColor(RetColor(RetColor(0.0f))); + m_camera->SetOverBaseColor(Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f)); // TODO: color ok? if ( quality < 0 ) value = 0.0f; if ( quality == 0 ) value = 1.0f; if ( quality > 0 ) value = 2.0f; - m_engine->SetParticuleDensity(value); + m_engine->SetParticleDensity(value); if ( quality < 0 ) value = 0.5f; if ( quality == 0 ) value = 1.0f; @@ -5913,7 +5948,8 @@ void CMainDialog::ChangeSetupQuality(int quality) if ( quality > 0 ) iValue = 2; m_engine->SetTextureQuality(iValue); - m_engine->FirstExecuteAdapt(false); + // TODO: first execute adapt? + //m_engine->FirstExecuteAdapt(false); } @@ -5921,7 +5957,7 @@ void CMainDialog::ChangeSetupQuality(int quality) static int key_table[KEY_TOTAL] = { -#if _SCHOOL & _TEEN +/* TODO: #if _SCHOOL & _TEEN KEYRANK_LEFT, KEYRANK_RIGHT, KEYRANK_UP, @@ -5935,7 +5971,7 @@ static int key_table[KEY_TOTAL] = KEYRANK_SPEED15, KEYRANK_SPEED20, KEYRANK_QUIT, -#else +#else */ KEYRANK_LEFT, KEYRANK_RIGHT, KEYRANK_UP, @@ -5957,12 +5993,12 @@ static int key_table[KEY_TOTAL] = KEYRANK_SPEED15, KEYRANK_SPEED20, KEYRANK_QUIT, -#endif +// #endif }; -static EventMsg key_event[KEY_TOTAL] = +static EventType key_event[KEY_TOTAL] = { -#if _SCHOOL & _TEEN +/* TODO: #if _SCHOOL & _TEEN EVENT_INTERFACE_KLEFT, EVENT_INTERFACE_KRIGHT, EVENT_INTERFACE_KUP, @@ -5976,7 +6012,7 @@ static EventMsg key_event[KEY_TOTAL] = EVENT_INTERFACE_KSPEED15, EVENT_INTERFACE_KSPEED20, EVENT_INTERFACE_KQUIT, -#else +#else */ EVENT_INTERFACE_KLEFT, EVENT_INTERFACE_KRIGHT, EVENT_INTERFACE_KUP, @@ -5998,7 +6034,7 @@ static EventMsg key_event[KEY_TOTAL] = EVENT_INTERFACE_KSPEED15, EVENT_INTERFACE_KSPEED20, EVENT_INTERFACE_KQUIT, -#endif +//#endif }; // Updates the list of keys. @@ -6017,7 +6053,7 @@ void CMainDialog::UpdateKey() ps = (CScroll*)pw->SearchControl(EVENT_INTERFACE_KSCROLL); if ( ps == 0 ) return; - first = (int)(ps->RetVisibleValue()*(KEY_TOTAL-KEY_VISIBLE)); + first = (int)(ps->GetVisibleValue()*(KEY_TOTAL-KEY_VISIBLE)); for ( i=0 ; iCreateKey(pos, dim, -1, key_event[first+i]); pk = (CKey*)pw->SearchControl(key_event[first+i]); if ( pk == 0 ) break; - pk->SetKey(0, m_engine->RetKey(key_table[first+i], 0)); - pk->SetKey(1, m_engine->RetKey(key_table[first+i], 1)); + /* TODO: set input bindings + pk->SetKey(0, m_engine->GetKey(key_table[first+i], 0)); + pk->SetKey(1, m_engine->GetKey(key_table[first+i], 1)); */ pos.y -= dim.y; } } // Change a key. -void CMainDialog::ChangeKey(EventMsg event) +void CMainDialog::ChangeKey(EventType event) { CWindow* pw; CScroll* ps; @@ -6060,8 +6097,9 @@ void CMainDialog::ChangeKey(EventMsg event) { pk = (CKey*)pw->SearchControl(key_event[i]); if ( pk == 0 ) break; - m_engine->SetKey(key_table[i], 0, pk->RetKey(0)); - m_engine->SetKey(key_table[i], 1, pk->RetKey(1)); + /* TODO: set key binding + m_engine->SetKey(key_table[i], 0, pk->GetKey(0)); + m_engine->SetKey(key_table[i], 1, pk->GetKey(1)); */ } } } @@ -6096,10 +6134,10 @@ void CMainDialog::StartAbort() pos.x = 0.40f; dim.x = 0.20f; -#if _POLISH +/* TODO: #if _POLISH pos.x -= 7.0f/640.0f; dim.x += 14.0f/640.0f; -#endif +#endif*/ dim.y = 32.0f/480.0f; pos.y = 0.74f; @@ -6130,12 +6168,13 @@ void CMainDialog::StartAbort() pb->SetState(STATE_WARNING); } - if ( m_engine->RetSetupMode() ) + /* TODO: setup mode? + if ( m_engine->GetSetupMode() ) { pos.y = 0.39f; pb = pw->CreateButton(pos, dim, -1, EVENT_INTERFACE_SETUP); pb->SetState(STATE_SHADOW); - } + }*/ pos.y = 0.25f; pb = pw->CreateButton(pos, dim, -1, EVENT_INTERFACE_AGAIN); @@ -6384,7 +6423,7 @@ void CMainDialog::FrameDialog(float rTime) if ( !m_bGlint ) return; m_dialogParti += rTime; - if ( m_dialogParti < m_engine->ParticuleAdapt(0.05f) ) return; + if ( m_dialogParti < m_engine->ParticleAdapt(0.05f) ) return; m_dialogParti = 0.0f; if ( !m_bDialogFire ) return; @@ -6404,9 +6443,9 @@ void CMainDialog::FrameDialog(float rTime) pos.y += Math::Rand()*(16.0f/480.0f)-(10.0f/480.0f); dim.x = 0.01f+Math::Rand()*0.01f; dim.y = dim.x/0.75f; - m_particule->CreateParticule(pos, speed, dim, - (ParticuleType)(PARTILENS1+rand()%3), - 1.0f, 0.0f, 0.0f, SH_INTERFACE); + m_particle->CreateParticle(pos, speed, dim, + (Gfx::ParticleType)(Gfx::PARTILENS1+rand()%3), + 1.0f, 0.0f, 0.0f, Gfx::SH_INTERFACE); // Top. pos.x = dpos.x + ddim.x*Math::Rand(); @@ -6415,9 +6454,9 @@ void CMainDialog::FrameDialog(float rTime) pos.y -= Math::Rand()*(16.0f/480.0f)-(10.0f/480.0f); dim.x = 0.01f+Math::Rand()*0.01f; dim.y = dim.x/0.75f; - m_particule->CreateParticule(pos, speed, dim, - (ParticuleType)(PARTILENS1+rand()%3), - 1.0f, 0.0f, 0.0f, SH_INTERFACE); + m_particle->CreateParticle(pos, speed, dim, + (Gfx::ParticleType)(Gfx::PARTILENS1+rand()%3), + 1.0f, 0.0f, 0.0f, Gfx::SH_INTERFACE); // Left. pos.y = dpos.y + ddim.y*Math::Rand(); @@ -6426,9 +6465,9 @@ void CMainDialog::FrameDialog(float rTime) pos.y += (Math::Rand()-0.5f)*(6.0f/480.0f); dim.x = 0.01f+Math::Rand()*0.01f; dim.y = dim.x/0.75f; - m_particule->CreateParticule(pos, speed, dim, - (ParticuleType)(PARTILENS1+rand()%3), - 1.0f, 0.0f, 0.0f, SH_INTERFACE); + m_particle->CreateParticle(pos, speed, dim, + (Gfx::ParticleType)(Gfx::PARTILENS1+rand()%3), + 1.0f, 0.0f, 0.0f, Gfx::SH_INTERFACE); // Right. pos.y = dpos.y + ddim.y*Math::Rand(); @@ -6437,9 +6476,9 @@ void CMainDialog::FrameDialog(float rTime) pos.y += (Math::Rand()-0.5f)*(6.0f/480.0f); dim.x = 0.01f+Math::Rand()*0.01f; dim.y = dim.x/0.75f; - m_particule->CreateParticule(pos, speed, dim, - (ParticuleType)(PARTILENS1+rand()%3), - 1.0f, 0.0f, 0.0f, SH_INTERFACE); + m_particle->CreateParticle(pos, speed, dim, + (Gfx::ParticleType)(Gfx::PARTILENS1+rand()%3), + 1.0f, 0.0f, 0.0f, Gfx::SH_INTERFACE); } } @@ -6494,13 +6533,13 @@ void CMainDialog::StartSuspend() { m_sound->MuteAll(true); m_main->ClearInterface(); - m_bInitPause = m_engine->RetPause(); + m_bInitPause = m_engine->GetPause(); m_engine->SetPause(true); m_engine->SetOverFront(false); // over flat behind m_main->CreateShortcuts(); m_main->StartSuspend(); - m_initCamera = m_camera->RetType(); - m_camera->SetType(CAMERA_DIALOG); + m_initCamera = m_camera->GetType(); + m_camera->SetType(Gfx::CAM_TYPE_DIALOG); } // Resume the simulation after a period of dialog. @@ -6519,7 +6558,7 @@ void CMainDialog::StopSuspend() // Whether to use tooltips. -bool CMainDialog::RetTooltip() +bool CMainDialog::GetTooltip() { return m_bTooltip; } @@ -6541,9 +6580,9 @@ void CMainDialog::SetSceneRead(char* name) strcpy(m_sceneRead, name); } -// Returns the name of the scene to read. +// Geturns the name of the scene to read. -char* CMainDialog::RetSceneRead() +char* CMainDialog::GetSceneRead() { return m_sceneRead; } @@ -6555,9 +6594,9 @@ void CMainDialog::SetStackRead(char* name) strcpy(m_stackRead, name); } -// Returns the name of the scene to read. +// Geturns the name of the scene to read. -char* CMainDialog::RetStackRead() +char* CMainDialog::GetStackRead() { return m_stackRead; } @@ -6569,9 +6608,9 @@ void CMainDialog::SetSceneName(char* name) strcpy(m_sceneName, name); } -// Returns the name of the chosen to play scene. +// Geturns the name of the chosen to play scene. -char* CMainDialog::RetSceneName() +char* CMainDialog::GetSceneName() { return m_sceneName; } @@ -6583,16 +6622,16 @@ void CMainDialog::SetSceneRank(int rank) m_sceneRank = rank; } -// Returns the rank of the chosen to play scene. +// Geturns the rank of the chosen to play scene. -int CMainDialog::RetSceneRank() +int CMainDialog::GetSceneRank() { return m_sceneRank; } -// Returns folder name of the scene that user selected to play. +// Geturns folder name of the scene that user selected to play. -char* CMainDialog::RetSceneDir() +char* CMainDialog::GetSceneDir() { int i; @@ -6604,21 +6643,21 @@ char* CMainDialog::RetSceneDir() // Whether to show the solution. -bool CMainDialog::RetSceneSoluce() +bool CMainDialog::GetSceneSoluce() { return m_bSceneSoluce; } -// Returns the name of the folder to save. +// Geturns the name of the folder to save. -char* CMainDialog::RetSavegameDir() +char* CMainDialog::GetSavegameDir() { return m_savegameDir; } -// Returns the name of public folder. +// Geturns the name of public folder. -char* CMainDialog::RetPublicDir() +char* CMainDialog::GetPublicDir() { return m_publicDir; } @@ -6626,35 +6665,35 @@ char* CMainDialog::RetPublicDir() // Indicates if there are reflections on the buttons. -bool CMainDialog::RetGlint() +bool CMainDialog::GetGlint() { return m_bGlint; } // Whether to show 4:solutions. -bool CMainDialog::RetSoluce4() +bool CMainDialog::GetSoluce4() { return m_bSoluce4; } // Whether to show the cinematics. -bool CMainDialog::RetMovies() +bool CMainDialog::GetMovies() { return m_bMovies; } // IWhether to make an animation in CTaskReset. -bool CMainDialog::RetNiceReset() +bool CMainDialog::GetNiceReset() { return m_bNiceReset; } // Indicates whether the fire causes damage to its own units. -bool CMainDialog::RetHimselfDamage() +bool CMainDialog::GetHimselfDamage() { return m_bHimselfDamage; } @@ -6693,7 +6732,7 @@ void CMainDialog::ReadGamerPerso(char *gamer) FILE* file; char filename[100]; char line[100]; - D3DCOLORVALUE color; + Gfx::Color color; m_perso.face = 0; DefPerso(); @@ -6713,7 +6752,7 @@ void CMainDialog::ReadGamerPerso(char *gamer) color.g = 0.0f; color.b = 0.0f; color.a = 0.0f; - m_perso.colorHair = OpColorValue(line, "hair", color); + m_perso.colorHair = OpColor(line, "hair", color); } if ( Cmd(line, "Body") ) @@ -6722,13 +6761,13 @@ void CMainDialog::ReadGamerPerso(char *gamer) color.g = 0.0f; color.b = 0.0f; color.a = 0.0f; - m_perso.colorCombi = OpColorValue(line, "combi", color); + m_perso.colorCombi = OpColor(line, "combi", color); color.r = 0.0f; color.g = 0.0f; color.b = 0.0f; color.a = 0.0f; - m_perso.colorBand = OpColorValue(line, "band", color); + m_perso.colorBand = OpColor(line, "band", color); } } @@ -6745,7 +6784,7 @@ void CMainDialog::SetGamerFace(char *gamer, int face) // Gives the face of the player. -int CMainDialog::RetGamerFace(char *gamer) +int CMainDialog::GetGamerFace(char *gamer) { ReadGamerPerso(gamer); return m_perso.face; @@ -6753,37 +6792,37 @@ int CMainDialog::RetGamerFace(char *gamer) // Gives the face of the player. -int CMainDialog::RetGamerFace() +int CMainDialog::GetGamerFace() { return m_perso.face; } -int CMainDialog::RetGamerGlasses() +int CMainDialog::GetGamerGlasses() { return m_perso.glasses; } -bool CMainDialog::RetGamerOnlyHead() +bool CMainDialog::GetGamerOnlyHead() { return (m_phase == PHASE_PERSO && m_persoTab == 0); } -float CMainDialog::RetPersoAngle() +float CMainDialog::GetPersoAngle() { return m_persoAngle; } -D3DCOLORVALUE CMainDialog::RetGamerColorHair() +Gfx::Color CMainDialog::GetGamerColorHair() { return m_perso.colorHair; } -D3DCOLORVALUE CMainDialog::RetGamerColorCombi() +Gfx::Color CMainDialog::GetGamerColorCombi() { return m_perso.colorCombi; } -D3DCOLORVALUE CMainDialog::RetGamerColorBand() +Gfx::Color CMainDialog::GetGamerColorBand() { return m_perso.colorBand; } @@ -6803,7 +6842,7 @@ bool CMainDialog::ReadGamerInfo() m_sceneInfo[i].bPassed = false; } - sprintf(line, "%s\\%s\\%s.gam", m_savegameDir, m_main->RetGamerName(), m_sceneName); + sprintf(line, "%s\\%s\\%s.gam", m_savegameDir, m_main->GetGamerName(), m_sceneName); file = fopen(line, "r"); if ( file == NULL ) return false; @@ -6839,7 +6878,7 @@ bool CMainDialog::WriteGamerInfo() char line[100]; int i; - sprintf(line, "%s\\%s\\%s.gam", m_savegameDir, m_main->RetGamerName(), m_sceneName); + sprintf(line, "%s\\%s\\%s.gam", m_savegameDir, m_main->GetGamerName(), m_sceneName); file = fopen(line, "w"); if ( file == NULL ) return false; @@ -6867,7 +6906,7 @@ void CMainDialog::SetGamerInfoTry(int rank, int numTry) m_sceneInfo[rank].numTry = numTry; } -int CMainDialog::RetGamerInfoTry(int rank) +int CMainDialog::GetGamerInfoTry(int rank) { if ( rank < 0 || rank >= MAXSCENE ) return 0; return m_sceneInfo[rank].numTry; @@ -6894,7 +6933,7 @@ void CMainDialog::SetGamerInfoPassed(int rank, bool bPassed) } } -bool CMainDialog::RetGamerInfoPassed(int rank) +bool CMainDialog::GetGamerInfoPassed(int rank) { if ( rank < 0 || rank >= MAXSCENE ) return false; return m_sceneInfo[rank].bPassed; @@ -6916,4 +6955,5 @@ bool CMainDialog::NextMission() return true; } +} // namespace Ui diff --git a/src/ui/maindialog.h b/src/ui/maindialog.h index 5b33f92..df36a4d 100644 --- a/src/ui/maindialog.h +++ b/src/ui/maindialog.h @@ -19,22 +19,32 @@ #pragma once +#include "graphics/core/color.h" #include "object/robotmain.h" - class CInstanceManager; -class CEvent; -class CD3DEngine; +class CEventQueue; +class CSoundInterface; + +namespace Gfx +{ +class CEngine; +class CParticle; +}; + +namespace Ui +{ + class CInterface; class CWindow; class CControl; -class CParticule; -class CSound; const int USERLISTMAX = 100; const int MAXSCENE = 1000; +const int MAX_FNAME = 255; // TODO: remove after rewrite to std::string + struct SceneInfo { char numTry; @@ -45,9 +55,9 @@ struct GamerPerso { int face; // face int glasses; // glasses - D3DCOLORVALUE colorHair; // hair color - D3DCOLORVALUE colorCombi; // spacesuit volor - D3DCOLORVALUE colorBand; // strips color + Gfx::Color colorHair; // hair color + Gfx::Color colorCombi; // spacesuit volor + Gfx::Color colorBand; // strips color }; @@ -65,26 +75,26 @@ public: void SetStackRead(char* name); void SetSceneName(char* name); void SetSceneRank(int rank); - char* RetSceneRead(); - char* RetStackRead(); - char* RetSceneName(); - int RetSceneRank(); - char* RetSceneDir(); - bool RetSceneSoluce(); - char* RetSavegameDir(); - char* RetPublicDir(); - - bool RetTooltip(); - bool RetGlint(); - bool RetSoluce4(); - bool RetMovies(); - bool RetNiceReset(); - bool RetHimselfDamage(); + char* GetSceneRead(); + char* GetStackRead(); + char* GetSceneName(); + int GetSceneRank(); + char* GetSceneDir(); + bool GetSceneSoluce(); + char* GetSavegameDir(); + char* GetPublicDir(); + + bool GetTooltip(); + bool GetGlint(); + bool GetSoluce4(); + bool GetMovies(); + bool GetNiceReset(); + bool GetHimselfDamage(); void SetUserDir(char *base, int rank); void BuildSceneName(char *filename, char *base, int rank); void BuildResumeName(char *filename, char *base, int rank); - char* RetFilesDir(); + char* GetFilesDir(); void StartAbort(); void StartDeleteObject(); @@ -104,30 +114,30 @@ public: bool ReadGamerInfo(); bool WriteGamerInfo(); void SetGamerInfoTry(int rank, int numTry); - int RetGamerInfoTry(int rank); + int GetGamerInfoTry(int rank); void SetGamerInfoPassed(int rank, bool bPassed); - bool RetGamerInfoPassed(int rank); + bool GetGamerInfoPassed(int rank); bool NextMission(); void WriteGamerPerso(char *gamer); void ReadGamerPerso(char *gamer); void SetGamerFace(char *gamer, int face); - int RetGamerFace(char *gamer); - int RetGamerFace(); - int RetGamerGlasses(); - bool RetGamerOnlyHead(); - float RetPersoAngle(); - D3DCOLORVALUE RetGamerColorHair(); - D3DCOLORVALUE RetGamerColorCombi(); - D3DCOLORVALUE RetGamerColorBand(); + int GetGamerFace(char *gamer); + int GetGamerFace(); + int GetGamerGlasses(); + bool GetGamerOnlyHead(); + float GetPersoAngle(); + Gfx::Color GetGamerColorHair(); + Gfx::Color GetGamerColorCombi(); + Gfx::Color GetGamerColorBand(); void AllMissionUpdate(); void ShowSoluceUpdate(); protected: void GlintMove(); - void FrameParticule(float rTime); - void NiceParticule(Math::Point mouse, bool bPress); + void FrameParticle(float rTime); + void NiceParticle(Math::Point mouse, bool bPress); void ReadNameList(); void UpdateNameList(); void UpdateNameEdit(); @@ -148,7 +158,7 @@ protected: void IODeleteScene(); bool IOWriteScene(); bool IOReadScene(); - int RetChapPassed(); + int GetChapPassed(); void UpdateSceneChap(int &chap); void UpdateSceneList(int chap, int &sel); void UpdateSceneResume(int rank); @@ -160,17 +170,18 @@ protected: void ChangeSetupButtons(); void ChangeSetupQuality(int quality); void UpdateKey(); - void ChangeKey(EventMsg event); + void ChangeKey(EventType event); protected: CInstanceManager* m_iMan; - CRobotMain* m_main; - CEvent* m_event; - CD3DEngine* m_engine; - CInterface* m_interface; - CParticule* m_particule; - CCamera* m_camera; - CSound* m_sound; + CApplication* m_app; + CRobotMain* m_main; + CEventQueue* m_eventQueue; + Gfx::CEngine* m_engine; + CInterface* m_interface; + Gfx::CParticle* m_particle; + Gfx::CCamera* m_camera; + CSoundInterface* m_sound; Phase m_phase; // copy of CRobotMain Phase m_phaseSetup; // tab selected @@ -182,11 +193,11 @@ protected: int m_persoTab; // perso: tab selected float m_persoAngle; // perso: angle of presentation - char m_sceneDir[_MAX_FNAME]; // scene folder - char m_savegameDir[_MAX_FNAME]; // savegame folder - char m_publicDir[_MAX_FNAME]; // program folder - char m_userDir[_MAX_FNAME]; // user folder - char m_filesDir[_MAX_FNAME]; // case files + char m_sceneDir[MAX_FNAME]; // scene folder + char m_savegameDir[MAX_FNAME]; // savegame folder + char m_publicDir[MAX_FNAME]; // program folder + char m_userDir[MAX_FNAME]; // user folder + char m_filesDir[MAX_FNAME]; // case files int m_index; // 0..4 int m_chap[10]; // selected chapter (0..8) @@ -239,7 +250,7 @@ protected: float m_dialogParti; float m_dialogTime; bool m_bInitPause; - CameraType m_initCamera; + Gfx::CameraType m_initCamera; int m_partiPhase[10]; float m_partiTime[10]; @@ -248,4 +259,4 @@ protected: SceneInfo m_sceneInfo[MAXSCENE]; }; - +} // namespace Ui -- cgit v1.2.3-1-g7c22