eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 15:59:18 +02:00
Code Issues 124 Wiki Activity

maintenance: removed deprecated code from memcells, tracks, events

Browse Source
This commit is contained in:
tmj-fstate
2017-03-23 16:47:29 +01:00
parent 2c76a4418e
commit 89a9a18428
18 changed files with 96 additions and 934 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
MemCell.h
View File

@@ -7,56 +7,31 @@ obtain one at
http://mozilla.org/MPL/2.0/.
*/
#ifndef MemCellH
#define MemCellH
#pragma once
#include "Classes.h"
#include "dumb3d.h"
using namespace Math3D;
using namespace std;
class TMemCell
{
private:
vector3 vPosition;
#ifdef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY
char *szText;
#else
Math3D::vector3 vPosition;
std::string szText;
#endif
double fValue1;
double fValue2;
TCommandType eCommand;
bool bCommand; // czy zawiera komendę dla zatrzymanego AI
TEvent *OnSent; // event dodawany do kolejki po wysłaniu komendy zatrzymującej skład
public:
string
asTrackName; // McZapkie-100302 - zeby nazwe toru na ktory jest Putcommand wysylane pamietac
TMemCell(vector3 *p);
#ifdef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY
~TMemCell();
#endif
std::string asTrackName; // McZapkie-100302 - zeby nazwe toru na ktory jest Putcommand wysylane pamietac
TMemCell( Math3D::vector3 *p );
void Init();
#ifdef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY
void UpdateValues( char const *szNewText, double const fNewValue1, double const fNewValue2, int const CheckMask );
#else
void UpdateValues( std::string const &szNewText, double const fNewValue1, double const fNewValue2, int const CheckMask );
#endif
bool Load(cParser *parser);
void PutCommand(TController *Mech, vector3 *Loc);
bool Compare( char const *szTestText, double const fTestValue1, double const fTestValue2, int const CheckMask );
#ifndef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY
void PutCommand( TController *Mech, Math3D::vector3 *Loc );
bool Compare( std::string const &szTestText, double const fTestValue1, double const fTestValue2, int const CheckMask );
#endif
bool Render();
#ifdef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY
inline char * Text()
{
return szText;
};
#else
inline std::string const &Text() { return szText; }
#endif
inline double Value1()
{
return fValue1;
@@ -65,7 +40,7 @@ class TMemCell
{
return fValue2;
};
inline vector3 Position()
inline Math3D::vector3 Position()
{
return vPosition;
};
@@ -84,4 +59,3 @@ class TMemCell
};
//---------------------------------------------------------------------------
#endif