From 02dc368a385fb493a87486aa929d9460ce40c31b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Konopacki?= Date: Mon, 20 Aug 2012 21:31:16 +0200 Subject: added ui/target.* --- src/ui/target.cpp | 68 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 36 insertions(+), 32 deletions(-) (limited to 'src/ui/target.cpp') diff --git a/src/ui/target.cpp b/src/ui/target.cpp index f94ae02..db478fe 100644 --- a/src/ui/target.cpp +++ b/src/ui/target.cpp @@ -17,13 +17,14 @@ // target.cpp -#include -#include -#include - -#include "common/struct.h" -#include "old/d3dengine.h" -#include "old/math3d.h" +//#include +//#include +//#include + +//#include "common/struct.h" +//#include "old/d3dengine.h" +//#include "old/math3d.h" +#include "graphics/engine/engine.h" #include "common/event.h" #include "common/misc.h" #include "common/iman.h" @@ -34,10 +35,10 @@ - +namespace Ui { // Object's constructor. -CTarget::CTarget(CInstanceManager* iMan) : CControl(iMan) +CTarget::CTarget() : CControl() { } @@ -50,11 +51,11 @@ CTarget::~CTarget() // Creates a new button. -bool CTarget::Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg) +bool CTarget::Create(Math::Point pos, Math::Point dim, int icon, EventType eventType) { - if ( eventMsg == EVENT_NULL ) eventMsg = GetUniqueEventMsg(); + if ( eventType == EVENT_NULL ) eventType = GetUniqueEventType(); - CControl::Create(pos, dim, icon, eventMsg); + CControl::Create(pos, dim, icon, eventType); return true; } @@ -70,26 +71,27 @@ bool CTarget::EventProcess(const Event &event) CControl::EventProcess(event); - if ( event.event == EVENT_MOUSEMOVE ) + if ( event.type == EVENT_MOUSE_MOVE ) { if ( CControl::Detect(event.pos) ) { - m_engine->SetMouseType(D3DMOUSETARGET); + m_engine->SetMouseType(Gfx::ENG_MOUSE_TARGET); Event newEvent = event; - newEvent.event = m_eventMsg; + newEvent.type = m_eventType; m_event->AddEvent(newEvent); return false; } } - if ( event.event == EVENT_LBUTTONDOWN && + if ( event.type == EVENT_MOUSE_BUTTON_DOWN && + event.mouseButton.button == 1 && (m_state & STATE_VISIBLE) && (m_state & STATE_ENABLE) ) { if ( CControl::Detect(event.pos) ) { Event newEvent = event; - newEvent.event = EVENT_OBJECT_FIRE; + newEvent.type = EVENT_OBJECT_FIRE; m_event->AddEvent(newEvent); return false; } @@ -104,7 +106,7 @@ bool CTarget::EventProcess(const Event &event) CControl::EventProcess(event); - if ( event.event == EVENT_MOUSEMOVE ) + if ( event.type == EVENT_MOUSE_MOVE ) { m_main->SetFriendAim(false); @@ -113,22 +115,23 @@ bool CTarget::EventProcess(const Event &event) pObj = DetectFriendObject(event.pos); if ( pObj == 0 ) { - m_engine->SetMouseType(D3DMOUSETARGET); + m_engine->SetMouseType(Gfx::ENG_MOUSE_TARGET); Event newEvent = event; - newEvent.event = m_eventMsg; + newEvent.type = m_eventType; m_event->AddEvent(newEvent); return false; } else { m_main->SetFriendAim(true); - m_engine->SetMouseType(D3DMOUSENORM); + m_engine->SetMouseType(Gfx::ENG_MOUSE_NORM); } } } - if ( event.event == EVENT_LBUTTONDOWN && + if ( event.type == EVENT_MOUSE_BUTTON_DOWN && + event.mouseButton.button == 1 && (m_state & STATE_VISIBLE) && (m_state & STATE_ENABLE) ) { @@ -137,7 +140,7 @@ bool CTarget::EventProcess(const Event &event) if ( !m_main->RetFriendAim() ) { Event newEvent = event; - newEvent.event = EVENT_OBJECT_FIRE; + newEvent.type = EVENT_OBJECT_FIRE; m_event->AddEvent(newEvent); return false; } @@ -202,15 +205,15 @@ CObject* CTarget::DetectFriendObject(Math::Point pos) for ( i=0 ; i<1000000 ; i++ ) { - pObj = (CObject*)m_iMan->SearchInstance(CLASS_OBJECT, i); + pObj = static_cast(m_iMan->SearchInstance(CLASS_OBJECT, i)); if ( pObj == 0 ) break; - if ( !pObj->RetActif() ) continue; - if ( pObj->RetProxyActivate() ) continue; - if ( pObj->RetSelect() ) continue; + if ( !pObj->GetActif() ) continue; + if ( pObj->GetProxyActivate() ) continue; + if ( pObj->GetSelect() ) continue; pTarget = 0; - type = pObj->RetType(); + type = pObj->GetType(); if ( type == OBJECT_DERRICK || type == OBJECT_FACTORY || type == OBJECT_REPAIR || @@ -261,10 +264,10 @@ CObject* CTarget::DetectFriendObject(Math::Point pos) } else if ( (type == OBJECT_POWER || type == OBJECT_ATOMIC ) && - pObj->RetTruck() != 0 ) // battery used? + pObj->GetTruck() != 0 ) // battery used? { - pTarget = pObj->RetTruck(); - if ( pTarget->RetType() == OBJECT_MOBILEtg ) + pTarget = pObj->GetTruck(); + if ( pTarget->GetType() == OBJECT_MOBILEtg ) { pTarget = 0; } @@ -272,7 +275,7 @@ CObject* CTarget::DetectFriendObject(Math::Point pos) for ( j=0 ; jRetObjectRank(j); + rank = pObj->GetObjectRank(j); if ( rank == -1 ) continue; if ( rank != objRank ) continue; return pTarget; @@ -281,3 +284,4 @@ CObject* CTarget::DetectFriendObject(Math::Point pos) return 0; } +} -- cgit v1.2.3-1-g7c22 From 6ba0f42f22a170625f15879e01b4653a4ac153a1 Mon Sep 17 00:00:00 2001 From: erihel Date: Fri, 31 Aug 2012 22:28:07 +0200 Subject: latest changes; few more classes should compile now --- src/ui/target.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ui/target.cpp') diff --git a/src/ui/target.cpp b/src/ui/target.cpp index db478fe..9ffcfb9 100644 --- a/src/ui/target.cpp +++ b/src/ui/target.cpp @@ -137,7 +137,7 @@ bool CTarget::EventProcess(const Event &event) { if ( CControl::Detect(event.pos) ) { - if ( !m_main->RetFriendAim() ) + if ( !m_main->GetFriendAim() ) { Event newEvent = event; newEvent.type = EVENT_OBJECT_FIRE; @@ -181,7 +181,7 @@ bool CTarget::GetTooltip(Math::Point pos, char* name) { //? pObj = DetectFriendObject(pos); //? if ( pObj == 0 ) - if ( !m_main->RetFriendAim() ) + if ( !m_main->GetFriendAim() ) { strcpy(name, m_tooltip); return true; // does not detect objects below! -- cgit v1.2.3-1-g7c22 From 01cc0fbc49696a19a56dfdd8359d4bb77e868925 Mon Sep 17 00:00:00 2001 From: erihel Date: Tue, 11 Sep 2012 12:49:41 +0200 Subject: * latest changes * all files except studio, map and maindialog should compile * did some code cleanup --- src/ui/target.cpp | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'src/ui/target.cpp') diff --git a/src/ui/target.cpp b/src/ui/target.cpp index 9ffcfb9..f0ae70e 100644 --- a/src/ui/target.cpp +++ b/src/ui/target.cpp @@ -17,21 +17,7 @@ // target.cpp -//#include -//#include -//#include - -//#include "common/struct.h" -//#include "old/d3dengine.h" -//#include "old/math3d.h" -#include "graphics/engine/engine.h" -#include "common/event.h" -#include "common/misc.h" -#include "common/iman.h" -#include "object/robotmain.h" -#include "object/object.h" -#include "common/restext.h" -#include "ui/target.h" +#include @@ -162,7 +148,7 @@ void CTarget::Draw() // Returns the tooltip. -bool CTarget::GetTooltip(Math::Point pos, char* name) +bool CTarget::GetTooltip(Math::Point pos, std::string &name) { #if 0 if ( (m_state&STATE_VISIBLE) && Detect(pos) ) // in the window? @@ -183,7 +169,7 @@ bool CTarget::GetTooltip(Math::Point pos, char* name) //? if ( pObj == 0 ) if ( !m_main->GetFriendAim() ) { - strcpy(name, m_tooltip); + m_tooltip = name; return true; // does not detect objects below! } } -- cgit v1.2.3-1-g7c22