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

merge (with bugs)

Browse Source
This commit is contained in:
VB
2017-04-24 19:08:08 +02:00
parent 73e1c1dc98 96b01c6205
commit 401d95fc57
53 changed files with 2340 additions and 2233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
EvLaunch.cpp
View File

@@ -36,21 +36,13 @@ TEventLauncher::TEventLauncher()
DeltaTime = -1;
UpdatedTime = 0;
fVal1 = fVal2 = 0;
#ifdef EU07_USE_OLD_TEVENTLAUNCHER_TEXT_ARRAY
szText = NULL;
#endif
iHour = iMinute = -1; // takiego czasu nigdy nie będzie
dRadius = 0;
Event1 = Event2 = NULL;
MemCell = NULL;
iCheckMask = 0;
}
#ifdef EU07_USE_OLD_TEVENTLAUNCHER_TEXT_ARRAY
TEventLauncher::~TEventLauncher()
{
SafeDeleteArray(szText);
}
#endif
void TEventLauncher::Init()
{
}
@@ -126,13 +118,7 @@ bool TEventLauncher::Load(cParser *parser)
asMemCellName = token;
parser->getTokens();
*parser >> token;
#ifdef EU07_USE_OLD_TEVENTLAUNCHER_TEXT_ARRAY
SafeDeleteArray(szText);
szText = new char[256];
strcpy(szText, token.c_str());
#else
szText = token;
#endif
if (token != "*") //*=nie brać command pod uwagę
iCheckMask |= conditional_memstring;
parser->getTokens();
@@ -189,9 +175,9 @@ bool TEventLauncher::Render()
}
else
{ // jeśli nie cykliczny, to sprawdzić czas
if (GlobalTime->hh == iHour)
if (Simulation::Time.data().wHour == iHour)
{
if (GlobalTime->mm == iMinute)
if (Simulation::Time.data().wMinute == iMinute)
{ // zgodność czasu uruchomienia
if (UpdatedTime < 10)
{