eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

removed dependencies on the old parser. The code can now be compiled outside of Borland C++

Browse Source
This commit is contained in:
tmj-fstate
2017-01-15 15:04:17 +01:00
parent 7df7c8b76e
commit 15cf3d73a8
87 changed files with 3395 additions and 3232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
PyInt.cpp
View File

@@ -1,9 +1,10 @@
#include "stdafx.h"
#include "PyInt.h"
#include "Train.h"
#include "Logs.h"
#include <process.h>
#include <windows.h>
#include <stdlib.h>
//#include <process.h>
//#include <windows.h>
//#include <stdlib.h>
TPythonInterpreter *TPythonInterpreter::_instance = NULL;
@@ -400,15 +401,18 @@ void TPythonScreens::reset(void *train)
_train = train;
}
void TPythonScreens::init(TQueryParserComp *parser, TModel3d *model, string name, int cab)
void TPythonScreens::init(cParser &parser, TModel3d *model, std::string const &name, int const cab)
{
char buff[255];
AnsiString asSubModelName = parser->GetNextSymbol();
AnsiString asPyClassName = parser->GetNextSymbol();
char *subModelName = (char *)calloc(asSubModelName.Length() + 1, sizeof(char));
strcpy(subModelName, asSubModelName.LowerCase().c_str());
char *pyClassName = (char *)calloc(asPyClassName.Length() + 1, sizeof(char));
strcpy(pyClassName, asPyClassName.LowerCase().c_str());
std::string asSubModelName, asPyClassName;
parser.getTokens( 2, false );
parser
>> asSubModelName
>> asPyClassName;
char *subModelName = (char *)calloc(asSubModelName.length() + 1, sizeof(char));
strcpy(subModelName, ToLower( asSubModelName).c_str());
char *pyClassName = (char *)calloc(asPyClassName.length() + 1, sizeof(char));
strcpy(pyClassName, ToLower( asPyClassName ).c_str());
TSubModel *subModel = model->GetFromName(subModelName);
if (subModel == NULL)
{
@@ -471,7 +475,7 @@ void TPythonScreens::update()
_cleanupReadyFlag = true;
}
void TPythonScreens::setLookupPath(string path)
void TPythonScreens::setLookupPath(std::string const &path)
{
if (_lookupPath != NULL)
{
@@ -566,7 +570,7 @@ void TPythonScreens::start()
if (_screens.size() > 0)
{
_thread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)ScreenRendererThread, this,
CREATE_SUSPENDED, &_threadId);
CREATE_SUSPENDED, reinterpret_cast<LPDWORD>(&_threadId));
if (_thread != NULL)
{
SetThreadPriority(_thread,