16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 21:49:19 +02:00

Poprawione pliki. Kompiluje się, ale nie buduje. Problem z linkerem.

This commit is contained in:
firleju
2016-10-02 14:14:38 +02:00
parent 5f7d4cc34b
commit 5ecf7915d2
10 changed files with 719 additions and 664 deletions

View File

@@ -22,6 +22,8 @@ http://mozilla.org/MPL/2.0/.
#include "Timer.h"
#include "Driver.h"
#include "Console.h"
#include "McZapkie\hamulce.h"
#include <typeinfo>
//---------------------------------------------------------------------------
#pragma package(smart_init)
@@ -321,7 +323,7 @@ PyObject *TTrain::GetTrainState()
bool bEP, bPN;
bEP = (mvControlled->LocHandle->GetCP()>0.2) || (fEIMParams[0][2]>0.01);
PyDict_SetItemString(dict, "dir_brake", PyGetBool(bEP));
if (mvControlled->Hamulec->ClassNameIs("TLSt") || mvControlled->Hamulec->ClassNameIs("TEStED"))
if (typeid(mvControlled->Hamulec) == typeid(TLSt) || typeid(mvControlled->Hamulec) == typeid(TEStED))
{
TBrake* temp_ham = mvControlled->Hamulec;
// TLSt* temp_ham2 = temp_ham;