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

Fixed includes and GCC syntax errors

dev-ui
Piotr Dziwinski 2012-03-23 22:08:59 +01:00
parent f3a6e6c313
commit ea046a32ee
24 changed files with 38 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/displayinfo.cpp
View File

@ -24,8 +24,8 @@
#include <d3d.h> #include <d3d.h>
#include "struct.h" #include "struct.h"
#include "D3DEngine.h" #include "d3dengine.h"
#include "D3DMath.h" #include "d3dmath.h"
#include "language.h" #include "language.h"
#include "event.h" #include "event.h"
#include "misc.h" #include "misc.h"

4
src/displayinfo.h
View File

@ -20,6 +20,10 @@
#define _DISPLAYINFO_H_ #define _DISPLAYINFO_H_
#include "struct.h"
#include "camera.h"
class CInstanceManager; class CInstanceManager;
class CD3DEngine; class CD3DEngine;
class CEvent; class CEvent;

2
src/displaytext.cpp
View File

@ -24,7 +24,7 @@
#include <d3d.h> #include <d3d.h>
#include "struct.h" #include "struct.h"
#include "D3DEngine.h" #include "d3dengine.h"
#include "event.h" #include "event.h"
#include "misc.h" #include "misc.h"
#include "restext.h" #include "restext.h"

3
src/displaytext.h
View File

@ -20,6 +20,9 @@
#define _DISPLAYTEXT_H_ #define _DISPLAYTEXT_H_
#include "d3dengine.h"
class CInstanceManager; class CInstanceManager;
class CD3DEngine; class CD3DEngine;
class CInterface; class CInterface;

5
src/edit.cpp
View File

@ -24,7 +24,7 @@
#include <d3d.h> #include <d3d.h>
#include "struct.h" #include "struct.h"
#include "D3DEngine.h" #include "d3dengine.h"
#include "language.h" #include "language.h"
#include "math3d.h" #include "math3d.h"
#include "event.h" #include "event.h"
@ -86,8 +86,6 @@ CEdit::CEdit(CInstanceManager* iMan) : CControl(iMan)
FPOINT pos; FPOINT pos;
int i; int i;
CControl::CControl(iMan);
m_maxChar = 100; m_maxChar = 100;
m_text = (char*)malloc(sizeof(char)*(m_maxChar+1)); m_text = (char*)malloc(sizeof(char)*(m_maxChar+1));
m_format = 0; m_format = 0;
@ -134,7 +132,6 @@ CEdit::~CEdit()
delete m_text; delete m_text;
delete m_format; delete m_format;
delete m_scroll; delete m_scroll;
CControl::~CControl();
} }

3
src/edit.h
View File

@ -20,6 +20,7 @@
#define _EDIT_H_ #define _EDIT_H_
#include "struct.h"
#include "control.h" #include "control.h"
@ -91,7 +92,7 @@ class CEdit : public CControl
{ {
public: public:
CEdit(CInstanceManager* iMan); CEdit(CInstanceManager* iMan);
~CEdit(); virtual ~CEdit();
BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg); BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);

6
src/editvalue.cpp
View File

@ -24,7 +24,7 @@
#include <d3d.h> #include <d3d.h>
#include "struct.h" #include "struct.h"
#include "D3DEngine.h" #include "d3dengine.h"
#include "math3d.h" #include "math3d.h"
#include "event.h" #include "event.h"
#include "misc.h" #include "misc.h"
@ -40,8 +40,6 @@
CEditValue::CEditValue(CInstanceManager* iMan) : CControl(iMan) CEditValue::CEditValue(CInstanceManager* iMan) : CControl(iMan)
{ {
CControl::CControl(iMan);
m_edit = 0; m_edit = 0;
m_buttonUp = 0; m_buttonUp = 0;
m_buttonDown = 0; m_buttonDown = 0;
@ -59,8 +57,6 @@ CEditValue::~CEditValue()
delete m_edit; delete m_edit;
delete m_buttonUp; delete m_buttonUp;
delete m_buttonDown; delete m_buttonDown;
CControl::~CControl();
} }

2
src/editvalue.h
View File

@ -41,7 +41,7 @@ class CEditValue : public CControl
{ {
public: public:
CEditValue(CInstanceManager* iMan); CEditValue(CInstanceManager* iMan);
~CEditValue(); virtual ~CEditValue();
BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg); BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);

7
src/event.h
View File

@ -12,12 +12,17 @@
// * GNU General Public License for more details. // * GNU General Public License for more details.
// * // *
// * You should have received a copy of the GNU General Public License // * You should have received a copy of the GNU General Public License
// * along with this program. If not, see http://www.gnu.org/licenses/.// event.h // * along with this program. If not, see http://www.gnu.org/licenses/.
// event.h
#ifndef _EVENT_H_ #ifndef _EVENT_H_
#define _EVENT_H_ #define _EVENT_H_
#include "struct.h"
#if !defined (WM_XBUTTONDOWN) #if !defined (WM_XBUTTONDOWN)
#define WM_XBUTTONDOWN 0x020B #define WM_XBUTTONDOWN 0x020B
#define WM_XBUTTONUP 0x020C #define WM_XBUTTONUP 0x020C

5
src/gauge.cpp
View File

@ -24,7 +24,7 @@
#include <d3d.h> #include <d3d.h>
#include "struct.h" #include "struct.h"
#include "D3DEngine.h" #include "d3dengine.h"
#include "math3d.h" #include "math3d.h"
#include "event.h" #include "event.h"
#include "misc.h" #include "misc.h"
@ -38,8 +38,6 @@
CGauge::CGauge(CInstanceManager* iMan) : CControl(iMan) CGauge::CGauge(CInstanceManager* iMan) : CControl(iMan)
{ {
CControl::CControl(iMan);
m_level = 0.0f; m_level = 0.0f;
} }
@ -47,7 +45,6 @@ CGauge::CGauge(CInstanceManager* iMan) : CControl(iMan)
CGauge::~CGauge() CGauge::~CGauge()
{ {
CControl::~CControl();
} }

2
src/gauge.h
View File

@ -31,7 +31,7 @@ class CGauge : public CControl
{ {
public: public:
CGauge(CInstanceManager* iMan); CGauge(CInstanceManager* iMan);
~CGauge(); virtual ~CGauge();
BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg); BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);

4
src/group.cpp
View File

@ -24,7 +24,7 @@
#include <d3d.h> #include <d3d.h>
#include "struct.h" #include "struct.h"
#include "D3DEngine.h" #include "d3dengine.h"
#include "math3d.h" #include "math3d.h"
#include "event.h" #include "event.h"
#include "misc.h" #include "misc.h"
@ -39,14 +39,12 @@
CGroup::CGroup(CInstanceManager* iMan) : CControl(iMan) CGroup::CGroup(CInstanceManager* iMan) : CControl(iMan)
{ {
CControl::CControl(iMan);
} }
// Object's destructor. // Object's destructor.
CGroup::~CGroup() CGroup::~CGroup()
{ {
CControl::~CControl();
} }

2
src/group.h
View File

@ -31,7 +31,7 @@ class CGroup : public CControl
{ {
public: public:
CGroup(CInstanceManager* iMan); CGroup(CInstanceManager* iMan);
~CGroup(); virtual ~CGroup();
BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg); BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);

6
src/image.cpp
View File

@ -24,7 +24,7 @@
#include <d3d.h> #include <d3d.h>
#include "struct.h" #include "struct.h"
#include "D3DEngine.h" #include "d3dengine.h"
#include "math3d.h" #include "math3d.h"
#include "event.h" #include "event.h"
#include "misc.h" #include "misc.h"
@ -39,8 +39,6 @@
CImage::CImage(CInstanceManager* iMan) : CControl(iMan) CImage::CImage(CInstanceManager* iMan) : CControl(iMan)
{ {
CControl::CControl(iMan);
m_filename[0] = 0; m_filename[0] = 0;
} }
@ -52,8 +50,6 @@ CImage::~CImage()
{ {
m_engine->FreeTexture(m_filename); m_engine->FreeTexture(m_filename);
} }
CControl::~CControl();
} }

2
src/image.h
View File

@ -31,7 +31,7 @@ class CImage : public CControl
{ {
public: public:
CImage(CInstanceManager* iMan); CImage(CInstanceManager* iMan);
~CImage(); virtual ~CImage();
BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg); BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);

2
src/interface.cpp
View File

@ -24,7 +24,7 @@
#include <d3d.h> #include <d3d.h>
#include "struct.h" #include "struct.h"
#include "D3DEngine.h" #include "d3dengine.h"
#include "math3d.h" #include "math3d.h"
#include "event.h" #include "event.h"
#include "misc.h" #include "misc.h"

5
src/key.cpp
View File

@ -24,7 +24,7 @@
#include <d3d.h> #include <d3d.h>
#include "struct.h" #include "struct.h"
#include "D3DEngine.h" #include "d3dengine.h"
#include "math3d.h" #include "math3d.h"
#include "event.h" #include "event.h"
#include "misc.h" #include "misc.h"
@ -64,8 +64,6 @@ void GetKeyName(char *name, int key)
CKey::CKey(CInstanceManager* iMan) : CControl(iMan) CKey::CKey(CInstanceManager* iMan) : CControl(iMan)
{ {
CControl::CControl(iMan);
m_key[0] = 0; m_key[0] = 0;
m_key[1] = 0; m_key[1] = 0;
m_bCatch = FALSE; m_bCatch = FALSE;
@ -75,7 +73,6 @@ CKey::CKey(CInstanceManager* iMan) : CControl(iMan)
CKey::~CKey() CKey::~CKey()
{ {
CControl::~CControl();
} }

2
src/key.h
View File

@ -31,7 +31,7 @@ class CKey : public CControl
{ {
public: public:
CKey(CInstanceManager* iMan); CKey(CInstanceManager* iMan);
~CKey(); virtual ~CKey();
BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg); BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);

4
src/label.cpp
View File

@ -24,7 +24,7 @@
#include <d3d.h> #include <d3d.h>
#include "struct.h" #include "struct.h"
#include "D3DEngine.h" #include "d3dengine.h"
#include "math3d.h" #include "math3d.h"
#include "event.h" #include "event.h"
#include "misc.h" #include "misc.h"
@ -39,14 +39,12 @@
CLabel::CLabel(CInstanceManager* iMan) : CControl(iMan) CLabel::CLabel(CInstanceManager* iMan) : CControl(iMan)
{ {
CControl::CControl(iMan);
} }
// Object's destructor. // Object's destructor.
CLabel::~CLabel() CLabel::~CLabel()
{ {
CControl::~CControl();
} }

2
src/label.h
View File

@ -31,7 +31,7 @@ class CLabel : public CControl
{ {
public: public:
CLabel(CInstanceManager* iMan); CLabel(CInstanceManager* iMan);
~CLabel(); virtual ~CLabel();
BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg); BOOL Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);

2
src/light.cpp
View File

@ -24,7 +24,7 @@
#include <d3d.h> #include <d3d.h>
#include "struct.h" #include "struct.h"
#include "D3DEngine.h" #include "d3dengine.h"
#include "event.h" #include "event.h"
#include "misc.h" #include "misc.h"
#include "iman.h" #include "iman.h"

4
src/light.h
View File

@ -20,6 +20,8 @@
#define _LIGHT_H_ #define _LIGHT_H_
#include "d3dengine.h"
class CInstanceManager; class CInstanceManager;
class CD3DEngine; class CD3DEngine;
@ -62,7 +64,7 @@ class CLight
{ {
public: public:
CLight(CInstanceManager *iMan, CD3DEngine* engine); CLight(CInstanceManager *iMan, CD3DEngine* engine);
~CLight(); virtual ~CLight();
void SetD3DDevice(LPDIRECT3DDEVICE7 device); void SetD3DDevice(LPDIRECT3DDEVICE7 device);

6
src/list.cpp
View File

@ -24,7 +24,7 @@
#include <d3d.h> #include <d3d.h>
#include "struct.h" #include "struct.h"
#include "D3DEngine.h" #include "d3dengine.h"
#include "math3d.h" #include "math3d.h"
#include "event.h" #include "event.h"
#include "misc.h" #include "misc.h"
@ -46,8 +46,6 @@ CList::CList(CInstanceManager* iMan) : CControl(iMan)
{ {
int i; int i;
CControl::CControl(iMan);
for ( i=0 ; i<LISTMAXDISPLAY ; i++ ) for ( i=0 ; i<LISTMAXDISPLAY ; i++ )
{ {
m_button[i] = 0; m_button[i] = 0;
@ -87,8 +85,6 @@ CList::~CList()
delete m_button[i]; delete m_button[i];
} }
delete m_scroll; delete m_scroll;
CControl::~CControl();
} }

1
src/list.h
View File

@ -21,6 +21,7 @@
#include "control.h" #include "control.h"
#include "event.h"
class CD3DEngine; class CD3DEngine;