From a11d21673ec30b5055ab7b665b172fef079b8025 Mon Sep 17 00:00:00 2001 From: Firleju Date: Wed, 15 Apr 2015 23:49:51 +0200 Subject: [PATCH 1/3] Cleaning up after __fastcall remove. Cleaning up project after remove _fastcall. Project now buildable. --- .gitignore | 5 +++++ AdvSound.cpp | 4 ++-- AirCoupler.cpp | 4 ++-- AnimModel.cpp | 16 +++++++++------- Button.cpp | 4 ++-- Console.cpp | 6 +++--- Console/LPT.cpp | 2 +- Console/PoKeys55.cpp | 4 ++-- Driver.cpp | 14 +++++++------- DynObj.cpp | 8 ++++---- EU07.cpp | 3 +++ EvLaunch.cpp | 4 ++-- Event.cpp | 4 ++-- FadeSound.cpp | 4 ++-- Float3d.h | 10 ++++++++-- Gauge.cpp | 4 ++-- Globals.cpp | 4 ++-- Ground.cpp | 24 +++++++++++++++--------- Logs.cpp | 5 ++++- MemCell.cpp | 9 ++++++--- Model3d.cpp | 8 ++++---- Mover.cpp | 6 +++--- Names.cpp | 2 +- RealSound.cpp | 4 ++-- Segment.cpp | 4 ++-- Sound.cpp | 6 +++--- Spring.cpp | 4 ++-- Timer.cpp | 12 +++++++++--- Track.cpp | 23 +++++++++++++++-------- TractionPower.cpp | 4 ++-- Train.cpp | 8 ++++---- TrkFoll.cpp | 4 ++-- VBO.cpp | 4 ++-- World.cpp | 4 ++-- sky.cpp | 4 ++-- 35 files changed, 138 insertions(+), 97 deletions(-) diff --git a/.gitignore b/.gitignore index fb2cdb296..ec4a4f77e 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,8 @@ install_manifest.txt *.out *.app +*.dcu +*.~cpp +*.~h +*.~bpr +*.~pas diff --git a/AdvSound.cpp b/AdvSound.cpp index c59376c30..26e62ce6f 100644 --- a/AdvSound.cpp +++ b/AdvSound.cpp @@ -9,7 +9,7 @@ //--------------------------------------------------------------------------- #pragma package(smart_init) -__fastcall TAdvancedSound::TAdvancedSound() +TAdvancedSound::TAdvancedSound() { // SoundStart=SoundCommencing=SoundShut= NULL; State = ss_Off; @@ -18,7 +18,7 @@ __fastcall TAdvancedSound::TAdvancedSound() fShutLength = 0; } -__fastcall TAdvancedSound::~TAdvancedSound() +TAdvancedSound::~TAdvancedSound() { // Ra: stopowanie się sypie // SoundStart.Stop(); // SoundCommencing.Stop(); diff --git a/AirCoupler.cpp b/AirCoupler.cpp index e7fcdfa5b..ebc6839b4 100644 --- a/AirCoupler.cpp +++ b/AirCoupler.cpp @@ -7,9 +7,9 @@ #include "AirCoupler.h" #include "Timer.h" -__fastcall TAirCoupler::TAirCoupler() { Clear(); } +TAirCoupler::TAirCoupler() { Clear(); } -__fastcall TAirCoupler::~TAirCoupler() {} +TAirCoupler::~TAirCoupler() {} int TAirCoupler::GetStatus() { // zwraca 1, jeśli istnieje model prosty, 2 gdy skośny diff --git a/AnimModel.cpp b/AnimModel.cpp index c0ea0f7f0..a27342150 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -20,8 +20,8 @@ #pragma package(smart_init) //--------------------------------------------------------------------------- -__fastcall TAnimAdvanced::TAnimAdvanced(){}; -__fastcall TAnimAdvanced::~TAnimAdvanced(){ +TAnimAdvanced::TAnimAdvanced(){}; +TAnimAdvanced::~TAnimAdvanced(){ // delete[] pVocaloidMotionData; //plik został zmodyfikowany }; @@ -64,7 +64,7 @@ int TAnimAdvanced::SortByBone() return swaps; }; -__fastcall TAnimContainer::TAnimContainer() +TAnimContainer::TAnimContainer() { pNext = NULL; vRotateAngles = vector3(0.0f, 0.0f, 0.0f); // aktualne kąty obrotu @@ -82,7 +82,7 @@ __fastcall TAnimContainer::TAnimContainer() acAnimNext = NULL; // na razie jest poza listą } -__fastcall TAnimContainer::~TAnimContainer() +TAnimContainer::~TAnimContainer() { SafeDelete(pNext); delete mAnim; // AnimContainer jest właścicielem takich macierzy @@ -390,13 +390,15 @@ bool TAnimContainer::InMovement() } void TAnimContainer::EventAssign(TEvent *ev) -{ // przypisanie eventu wykonywanego po zakończeniu animacji evDone = ev; }; +{ // przypisanie eventu wykonywanego po zakończeniu animacji + evDone = ev; +}; //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -__fastcall TAnimModel::TAnimModel() +TAnimModel::TAnimModel() { pRoot = NULL; pModel = NULL; @@ -419,7 +421,7 @@ __fastcall TAnimModel::TAnimModel() fOffTime = fOnTime + 0.66; } -__fastcall TAnimModel::~TAnimModel() +TAnimModel::~TAnimModel() { delete pAdvanced; // nie ma zaawansowanej animacji SafeDelete(pRoot); diff --git a/Button.cpp b/Button.cpp index b94bb110e..bcc71bc1d 100644 --- a/Button.cpp +++ b/Button.cpp @@ -11,13 +11,13 @@ #pragma package(smart_init) -__fastcall TButton::TButton() +TButton::TButton() { iFeedbackBit = 0; Clear(); }; -__fastcall TButton::~TButton(){}; +TButton::~TButton(){}; void TButton::Clear(int i) { diff --git a/Console.cpp b/Console.cpp index 69a9c268b..0d4081023 100644 --- a/Console.cpp +++ b/Console.cpp @@ -104,7 +104,7 @@ TLPT *Console::LPT = NULL; int Console::iSwitch[8]; // bistabilne w kabinie, załączane z [Shift], wyłączane bez int Console::iButton[8]; // monostabilne w kabinie, załączane podczas trzymania klawisza -__fastcall Console::Console() +Console::Console() { PoKeys55[0] = PoKeys55[1] = NULL; for (int i = 0; i < 8; ++i) @@ -114,7 +114,7 @@ __fastcall Console::Console() } }; -__fastcall Console::~Console() +Console::~Console() { delete PoKeys55[0]; delete PoKeys55[1]; @@ -267,7 +267,7 @@ void Console::BitsUpdate(int mask) } }; -bool Console::Pressed(int x) { // na razie tak - czyta się tylko klawiatura return Global::bActive && (GetKeyState(x) < 0); }; +bool Console::Pressed(int x) { return Global::bActive && (GetKeyState(x) < 0); }; // na razie tak - czyta się tylko klawiatura void Console::ValueSet(int x, double y) { // ustawienie wartości (y) na kanale analogowym (x) diff --git a/Console/LPT.cpp b/Console/LPT.cpp index b4d7a4846..0716e8b70 100644 --- a/Console/LPT.cpp +++ b/Console/LPT.cpp @@ -41,4 +41,4 @@ bool TLPT::Connect(int port) return bool(OutPort); }; -void TLPT::Out(int x) { // wysłanie bajtu do portu OutPort(address, x); }; +void TLPT::Out(int x) { OutPort(address, x); }; // wysłanie bajtu do portu diff --git a/Console/PoKeys55.cpp b/Console/PoKeys55.cpp index 693f009eb..c59b9f9e3 100644 --- a/Console/PoKeys55.cpp +++ b/Console/PoKeys55.cpp @@ -17,7 +17,7 @@ HANDLE ReadHandle = INVALID_HANDLE_VALUE; // GUID InterfaceClassGuid={0x4d1e55b2,0xf16f,0x11cf,0x88,0xcb,0x00,0x11,0x11,0x00,0x00,0x30}; //{4d1e55b2-f16f-11cf-88cb-001111000030} -__fastcall TPoKeys55::TPoKeys55() +TPoKeys55::TPoKeys55() { cRequest = 0; iPWMbits = 1; @@ -31,7 +31,7 @@ __fastcall TPoKeys55::TPoKeys55() bNoError = true; }; //--------------------------------------------------------------------------- -__fastcall TPoKeys55::~TPoKeys55() { Close(); }; +TPoKeys55::~TPoKeys55() { Close(); }; //--------------------------------------------------------------------------- bool TPoKeys55::Close() { // rozłączenie komunikacji diff --git a/Driver.cpp b/Driver.cpp index 6974d8cba..4ef5777dd 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1128,7 +1128,7 @@ void TController::TablePurger() //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- -__fastcall TController::TController(bool AI, TDynamicObject *NewControll, bool InitPsyche, +TController::TController(bool AI, TDynamicObject *NewControll, bool InitPsyche, bool primary // czy ma aktywnie prowadzić? ) { @@ -1290,7 +1290,7 @@ void TController::CloseLog() } }; -__fastcall TController::~TController() +TController::~TController() { // wykopanie mechanika z roboty delete tsGuardSignal; delete TrainParams; @@ -5047,15 +5047,15 @@ void TController::DirectionForward(bool forward) mvControlling->IncMainCtrl(1); //żeby nie zgasł }; -AnsiString TController::Relation() { // zwraca relację pociągu return TrainParams->ShowRelation(); }; +AnsiString TController::Relation() { return TrainParams->ShowRelation(); }; // zwraca relację pociągu -AnsiString TController::TrainName() { // zwraca relację pociągu return TrainParams->TrainName; }; +AnsiString TController::TrainName() { return TrainParams->TrainName; }; // zwraca relację pociągu -int TController::StationCount() { // zwraca ilość stacji (miejsc zatrzymania) return TrainParams->StationCount; }; +int TController::StationCount() { return TrainParams->StationCount; }; // zwraca ilość stacji (miejsc zatrzymania) -int TController::StationIndex() { // zwraca indeks aktualnej stacji (miejsca zatrzymania) return TrainParams->StationIndex; }; +int TController::StationIndex() { return TrainParams->StationIndex; }; // zwraca indeks aktualnej stacji (miejsca zatrzymania) -bool TController::IsStop() { // informuje, czy jest zatrzymanie na najbliższej stacji return TrainParams->IsStop(); }; +bool TController::IsStop() { return TrainParams->IsStop(); }; // informuje, czy jest zatrzymanie na najbliższej stacji void TController::MoveTo(TDynamicObject *to) { // przesunięcie AI do innego pojazdu (przy zmianie kabiny) diff --git a/DynObj.cpp b/DynObj.cpp index d3faaed1e..a8e365914 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -106,11 +106,11 @@ int TAnim::TypeSet(int i, int fl) yUpdate = NULL; return iFlags & 15; // ile wskaźników rezerwować dla danego typu animacji }; -__fastcall TAnim::TAnim() +TAnim::TAnim() { // potrzebne to w ogóle? iFlags = -1; // nieznany typ - destruktor nic nie usuwa }; -__fastcall TAnim::~TAnim() +TAnim::~TAnim() { // usuwanie animacji switch (iFlags & 0xF0) { // usuwanie struktur, zależnie ile zostało stworzonych @@ -1432,7 +1432,7 @@ void TDynamicObject::ABuScanObjects(int ScanDir, double ScanDist) } //----------ABu: koniec skanowania pojazdow -__fastcall TDynamicObject::TDynamicObject() +TDynamicObject::TDynamicObject() { modelShake = vector3(0, 0, 0); fTrackBlock = 10000.0; // brak przeszkody na drodze @@ -1535,7 +1535,7 @@ __fastcall TDynamicObject::TDynamicObject() fAdjustment = 0.0; // korekcja odległości pomiędzy wózkami (np. na łukach) } -__fastcall TDynamicObject::~TDynamicObject() +TDynamicObject::~TDynamicObject() { // McZapkie-250302 - zamykanie logowania parametrow fizycznych SafeDelete(Mechanik); SafeDelete(MoverParameters); diff --git a/EU07.cpp b/EU07.cpp index 5fa0bffdf..e69a82bdb 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -747,3 +747,6 @@ int WINAPI WinMain(HINSTANCE hInstance, // instance KillGLWindow(); // kill the window return (msg.wParam); // exit the program } + + + diff --git a/EvLaunch.cpp b/EvLaunch.cpp index 35dcca555..a7b7c9108 100644 --- a/EvLaunch.cpp +++ b/EvLaunch.cpp @@ -22,7 +22,7 @@ //--------------------------------------------------------------------------- -__fastcall TEventLauncher::TEventLauncher() +TEventLauncher::TEventLauncher() { // ustawienie początkowych wartości dla wszystkich zmiennych iKey = 0; DeltaTime = -1; @@ -36,7 +36,7 @@ __fastcall TEventLauncher::TEventLauncher() iCheckMask = 0; } -__fastcall TEventLauncher::~TEventLauncher() { SafeDeleteArray(szText); } +TEventLauncher::~TEventLauncher() { SafeDeleteArray(szText); } void TEventLauncher::Init() {} diff --git a/Event.cpp b/Event.cpp index 76315d5d3..1c0f8189c 100644 --- a/Event.cpp +++ b/Event.cpp @@ -19,7 +19,7 @@ #include "Ground.h" #pragma package(smart_init) -__fastcall TEvent::TEvent(AnsiString m) +TEvent::TEvent(AnsiString m) { // asName=""; //czy nazwa eventu jest niezbędna w tym przypadku? chyba nie evNext = evNext2 = NULL; @@ -44,7 +44,7 @@ __fastcall TEvent::TEvent(AnsiString m) fRandomDelay = 0.0; // standardowo nie będzie dodatkowego losowego opóźnienia }; -__fastcall TEvent::~TEvent() +TEvent::~TEvent() { switch (Type) { // sprzątanie diff --git a/FadeSound.cpp b/FadeSound.cpp index 3486a3ff3..d30d3ae0f 100644 --- a/FadeSound.cpp +++ b/FadeSound.cpp @@ -12,7 +12,7 @@ #include "Timer.h" #include "FadeSound.h" -__fastcall TFadeSound::TFadeSound() +TFadeSound::TFadeSound() { Sound = NULL; fFade = 0; @@ -20,7 +20,7 @@ __fastcall TFadeSound::TFadeSound() fTime = 0; } -__fastcall TFadeSound::~TFadeSound() { Free(); } +TFadeSound::~TFadeSound() { Free(); } void TFadeSound::Free() {} diff --git a/Float3d.h b/Float3d.h index 70673ee45..559c35db9 100644 --- a/Float3d.h +++ b/Float3d.h @@ -82,7 +82,10 @@ inline float4 operator*(const float4 &q1, const float4 &q2) q1.w * q2.z + q1.z * q2.w + q1.x * q2.y - q1.y * q2.x, q1.w * q2.w - q1.x * q2.x - q1.y * q2.y - q1.z * q2.z); } -inline float4 operator-(const float4 &q) { // sprzężony; odwrotny tylko dla znormalizowanych! return float4(-q.x, -q.y, -q.z, q.w); }; +inline float4 operator-(const float4 &q) +{ // sprzężony; odwrotny tylko dla znormalizowanych! + return float4(-q.x, -q.y, -q.z, q.w); +}; inline float4 operator-(const float4 &q1, const float4 &q2) { // z odejmowaniem nie ma lekko return (-q1) * q2; // inwersja tylko dla znormalizowanych! @@ -256,7 +259,10 @@ inline float4x4 operator*(const float4x4 &m1, const float4x4 &m2) }; // From code in Graphics Gems; p. 766 -inline float Det2x2(float a, float b, float c, float d) { // obliczenie wyznacznika macierzy 2×2 return a * d - b * c; }; +inline float Det2x2(float a, float b, float c, float d) +{ // obliczenie wyznacznika macierzy 2×2 + return a * d - b * c; +}; inline float Det3x3(float a1, float a2, float a3, float b1, float b2, float b3, float c1, float c2, float c3) diff --git a/Gauge.cpp b/Gauge.cpp index f0ac9c420..03a8dcf93 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -16,7 +16,7 @@ #include "Gauge.h" #include "Console.h" -__fastcall TGauge::TGauge() +TGauge::TGauge() { eType = gt_Unknown; fFriction = 0.0; @@ -29,7 +29,7 @@ __fastcall TGauge::TGauge() SubModel = NULL; }; -__fastcall TGauge::~TGauge(){}; +TGauge::~TGauge(){}; void TGauge::Clear() { diff --git a/Globals.cpp b/Globals.cpp index a6082ef00..b47d346c1 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -692,7 +692,7 @@ bool Global::DoEvents() } //--------------------------------------------------------------------------- -__fastcall TTranscripts::TTranscripts() +TTranscripts::TTranscripts() { iCount = 0; // brak linijek do wyświetlenia iStart = 0; // wypełniać od linijki 0 @@ -703,7 +703,7 @@ __fastcall TTranscripts::TTranscripts() } fRefreshTime = 360.0; // wartośc zaporowa }; -__fastcall TTranscripts::~TTranscripts(){}; +TTranscripts::~TTranscripts(){}; void TTranscripts::AddLine(char *txt, float show, float hide, bool it) { // dodanie linii do tabeli, (show) i (hide) w [s] od aktualnego czasu if (show == hide) diff --git a/Ground.cpp b/Ground.cpp index 19821f3fd..266a3492a 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -53,7 +53,7 @@ AnsiString LogComment; // tory są zdublowane jako TP_TRACK oraz TP_DUMMYTRACK. Jeśli tekstura jest // tylko jedna (np. zwrotnice), nie jest używany TP_DUMMYTRACK. //--------------------------------------------------------------------------- -__fastcall TGroundNode::TGroundNode() +TGroundNode::TGroundNode() { // nowy obiekt terenu - pusty iType = GL_POINTS; Vertices = NULL; @@ -83,7 +83,7 @@ __fastcall TGroundNode::TGroundNode() iVersion = 0; // wersja siatki } -__fastcall TGroundNode::~TGroundNode() +TGroundNode::~TGroundNode() { // if (iFlags&0x200) //czy obiekt został utworzony? switch (iType) @@ -140,7 +140,7 @@ void TGroundNode::Init(int n) Vertices = new TGroundVertex[iNumVerts]; } -__fastcall TGroundNode::TGroundNode(TGroundNodeType t, int n) +TGroundNode::TGroundNode(TGroundNodeType t, int n) { // utworzenie obiektu TGroundNode(); // domyślne ustawienia iNumVerts = n; @@ -675,7 +675,7 @@ void TGroundNode::RenderAlphaDL() //------------------------------------------------------------------------------ //------------------ Podstawowy pojemnik terenu - sektor ----------------------- //------------------------------------------------------------------------------ -__fastcall TSubRect::TSubRect() +TSubRect::TSubRect() { nRootNode = NULL; // lista wszystkich obiektów jest pusta nRenderHidden = nRenderRect = nRenderRectAlpha = nRender = nRenderMixed = nRenderAlpha = @@ -686,7 +686,7 @@ __fastcall TSubRect::TSubRect() iNodeCount = 0; // licznik obiektów iTracks = 0; // licznik torów } -__fastcall TSubRect::~TSubRect() +TSubRect::~TSubRect() { if (Global::bManageNodes) // Ra: tu się coś sypie ResourceManager::Unregister(this); // wyrejestrowanie ze sprzątacza @@ -1203,13 +1203,16 @@ void TSubRect::RenderSounds() //--------------------------------------------------------------------------- int TGroundRect::iFrameNumber = 0; // licznik wyświetlanych klatek -__fastcall TGroundRect::TGroundRect() +TGroundRect::TGroundRect() { pSubRects = NULL; nTerrain = NULL; }; -__fastcall TGroundRect::~TGroundRect() { SafeDeleteArray(pSubRects); }; +TGroundRect::~TGroundRect() +{ + SafeDeleteArray(pSubRects); +}; void TGroundRect::RenderDL() { // renderowanie kwadratu kilometrowego (DL), jeśli jeszcze nie zrobione @@ -1294,7 +1297,7 @@ void TGround::MoveGroundNode(vector3 pPosition) */ } -__fastcall TGround::TGround() +TGround::TGround() { // RootNode=NULL; nRootDynamic = NULL; @@ -1313,7 +1316,10 @@ __fastcall TGround::TGround() sTracks = new TNames(); // nazwy torów - na razie tak } -__fastcall TGround::~TGround() { Free(); } +TGround::~TGround() +{ + Free(); +} void TGround::Free() { diff --git a/Logs.cpp b/Logs.cpp index 6694fe76b..0ef36bbb2 100644 --- a/Logs.cpp +++ b/Logs.cpp @@ -89,7 +89,10 @@ void ErrorLog(const AnsiString &asMessage) WriteLog(asMessage.c_str()); // do "log.txt" ewentualnie też } -void WriteLog(const AnsiString &str) { // Ra: wersja z AnsiString jest zamienna z Error() WriteLog(str.c_str()); }; +void WriteLog(const AnsiString &str) +{ // Ra: wersja z AnsiString jest zamienna z Error() + WriteLog(str.c_str()); +}; //--------------------------------------------------------------------------- #pragma package(smart_init) diff --git a/MemCell.cpp b/MemCell.cpp index 78c4ab139..524869533 100644 --- a/MemCell.cpp +++ b/MemCell.cpp @@ -23,7 +23,7 @@ #pragma package(smart_init) //--------------------------------------------------------------------------- -__fastcall TMemCell::TMemCell(vector3 *p) +TMemCell::TMemCell(vector3 *p) { fValue1 = fValue2 = 0; szText = new char[256]; // musi być dla automatycznie tworzonych komórek dla odcinków @@ -34,7 +34,7 @@ __fastcall TMemCell::TMemCell(vector3 *p) OnSent = NULL; } -__fastcall TMemCell::~TMemCell() { SafeDeleteArray(szText); } +TMemCell::~TMemCell() { SafeDeleteArray(szText); } void TMemCell::Init() {} @@ -174,4 +174,7 @@ void TMemCell::StopCommandSent() Global::AddToQuery(OnSent, NULL); }; -void TMemCell::AssignEvents(TEvent *e) { // powiązanie eventu OnSent = e; }; +void TMemCell::AssignEvents(TEvent *e) +{ // powiązanie eventu + OnSent = e; +}; diff --git a/Model3d.cpp b/Model3d.cpp index 6d5075f50..05af1a788 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -58,7 +58,7 @@ char *TStringPack::String(int n) return ptr; }; -__fastcall TSubModel::TSubModel() +TSubModel::TSubModel() { ZeroMemory(this, sizeof(TSubModel)); // istotne przy zapisywaniu wersji binarnej FirstInit(); @@ -115,7 +115,7 @@ void TSubModel::FirstInit() smLetter = NULL; // używany tylko roboczo dla TP_TEXT, do przyspieszenia wyświetlania }; -__fastcall TSubModel::~TSubModel() +TSubModel::~TSubModel() { if (uiDisplayList) glDeleteLists(uiDisplayList, 1); @@ -1631,7 +1631,7 @@ float TSubModel::MaxY(const float4x4 &m) }; //--------------------------------------------------------------------------- -__fastcall TModel3d::TModel3d() +TModel3d::TModel3d() { // Materials=NULL; // MaterialsCount=0; @@ -1653,7 +1653,7 @@ __fastcall TModel3d::TModel3d(char *FileName) LoadFromFile(FileName); }; */ -__fastcall TModel3d::~TModel3d() +TModel3d::~TModel3d() { // SafeDeleteArray(Materials); if (iFlags & 0x0200) diff --git a/Mover.cpp b/Mover.cpp index 8b94422b6..9ae979d60 100644 --- a/Mover.cpp +++ b/Mover.cpp @@ -9,7 +9,7 @@ const dEpsilon = 0.01; // 1cm (zależy od typu sprzęgu...) -__fastcall TMoverParameters::TMoverParameters(double VelInitial, AnsiString TypeNameInit, +TMoverParameters::TMoverParameters(double VelInitial, AnsiString TypeNameInit, AnsiString NameInit, int LoadInitial, AnsiString LoadTypeInitial, int Cab) : T_MoverParameters(VelInitial, TypeNameInit, NameInit, LoadInitial, LoadTypeInitial, Cab) @@ -229,8 +229,8 @@ bool TMoverParameters::IncBrakeLevel() { // nowa wersja na użytek AI, false gdy osiągnięto pozycję BrakeCtrlPosNo return BrakeLevelAdd(1.0); }; -bool TMoverParameters::DecBrakeLevel() -{ // nowa wersja na użytek AI, false gdy osiągnięto pozycję -1 return BrakeLevelAdd(-1.0); }; +bool TMoverParameters::DecBrakeLevel() +{ return BrakeLevelAdd(-1.0); }; // nowa wersja na użytek AI, false gdy osiągnięto pozycję -1 bool TMoverParameters::ChangeCab(int direction) { // zmiana kabiny i resetowanie ustawien diff --git a/Names.cpp b/Names.cpp index cfa49f69c..eb8b7688f 100644 --- a/Names.cpp +++ b/Names.cpp @@ -93,7 +93,7 @@ ItemRecord *__fastcall ItemRecord::TreeFindRecord(const char *n) return NULL; }; -__fastcall TNames::TNames() +TNames::TNames() { // tworzenie bufora iSize = 16 * 1024 * 1024; // rozmiar bufora w bajtach cBuffer = new char[iSize]; diff --git a/RealSound.cpp b/RealSound.cpp index dbe9714ab..cf5a06b14 100644 --- a/RealSound.cpp +++ b/RealSound.cpp @@ -16,7 +16,7 @@ #include "Logs.h" #include "McZapkie\mctools.hpp" -__fastcall TRealSound::TRealSound() +TRealSound::TRealSound() { pSound = NULL; dSoundAtt = -1; @@ -33,7 +33,7 @@ __fastcall TRealSound::TRealSound() bLoopPlay = false; // dźwięk wyłączony } -__fastcall TRealSound::~TRealSound() +TRealSound::~TRealSound() { // if (this) if (pSound) pSound->Stop(); } diff --git a/Segment.cpp b/Segment.cpp index a66646da5..1981942d6 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -23,7 +23,7 @@ AnsiString Where(vector3 p) return AnsiString(p.x) + " " + AnsiString(p.y) + " " + AnsiString(p.z); }; -__fastcall TSegment::TSegment(TTrack *owner) +TSegment::TSegment(TTrack *owner) { Point1 = CPointOut = CPointIn = Point2 = vector3(0.0f, 0.0f, 0.0f); fLength = 0; @@ -34,7 +34,7 @@ __fastcall TSegment::TSegment(TTrack *owner) pOwner = owner; }; -__fastcall TSegment::~TSegment() { SafeDeleteArray(fTsBuffer); }; +TSegment::~TSegment() { SafeDeleteArray(fTsBuffer); }; bool TSegment::Init(vector3 NewPoint1, vector3 NewPoint2, double fNewStep, double fNewRoll1, double fNewRoll2) diff --git a/Sound.cpp b/Sound.cpp index d98e3f67b..f0016bd6f 100644 --- a/Sound.cpp +++ b/Sound.cpp @@ -26,7 +26,7 @@ LPDIRECTSOUNDNOTIFY TSoundsManager::pDSNotify; int TSoundsManager::Count = 0; TSoundContainer *TSoundsManager::First = NULL; -__fastcall TSoundContainer::TSoundContainer(LPDIRECTSOUND pDS, char *Directory, char *strFileName, +TSoundContainer::TSoundContainer(LPDIRECTSOUND pDS, char *Directory, char *strFileName, int NConcurrent) { // wczytanie pliku dźwiękowego int hr = 111; @@ -139,7 +139,7 @@ __fastcall TSoundContainer::TSoundContainer(LPDIRECTSOUND pDS, char *Directory, };*/ }; -__fastcall TSoundContainer::~TSoundContainer() +TSoundContainer::~TSoundContainer() { // for (int i=Concurrent-1; i>=0; i--) // SAFE_RELEASE( pDSBuffer[i] ); @@ -164,7 +164,7 @@ LPDIRECTSOUNDBUFFER TSoundContainer::GetUnique(LPDIRECTSOUND pDS) return DSBuffers.top(); }; -__fastcall TSoundsManager::~TSoundsManager() { Free(); }; +TSoundsManager::~TSoundsManager() { Free(); }; void TSoundsManager::Free() { diff --git a/Spring.cpp b/Spring.cpp index dc95b1dbd..14d1acc7a 100644 --- a/Spring.cpp +++ b/Spring.cpp @@ -9,7 +9,7 @@ #include "Spring.h" #include "Usefull.h" -__fastcall TSpring::TSpring() +TSpring::TSpring() { vForce1 = vForce2 = vector3(0, 0, 0); Ks = 0; @@ -17,7 +17,7 @@ __fastcall TSpring::TSpring() restLen = 0; } -__fastcall TSpring::~TSpring() {} +TSpring::~TSpring() {} void TSpring::Init(double nrestLen, double nKs, double nKd) { diff --git a/Timer.cpp b/Timer.cpp index ac6783e08..c6f3f011d 100644 --- a/Timer.cpp +++ b/Timer.cpp @@ -20,9 +20,15 @@ double fSinceStart = 0; double GetTime() { return fSimulationTime; } -double GetDeltaTime() { // czas symulacji (stoi gdy pauza) return DeltaTime; } - -double GetDeltaRenderTime() { // czas renderowania (do poruszania się) return DeltaRenderTime; } +double GetDeltaTime() +{ // czas symulacji (stoi gdy pauza) + return DeltaTime; +} + +double GetDeltaRenderTime() +{ // czas renderowania (do poruszania się) + return DeltaRenderTime; +} double GetfSinceStart() { return fSinceStart; } diff --git a/Track.cpp b/Track.cpp index b4b3a01e3..76a6b1cce 100644 --- a/Track.cpp +++ b/Track.cpp @@ -41,7 +41,7 @@ const int iEnds3[13] = {3, 0, 2, 1, 2, 0, -1, 1, 0, 2, 0, 3, 1}; // numer sąsiedniego toru na końcu segmentu "-1" TIsolated *TIsolated::pRoot = NULL; -__fastcall TSwitchExtension::TSwitchExtension(TTrack *owner, int what) +TSwitchExtension::TSwitchExtension(TTrack *owner, int what) { // na początku wszystko puste CurrentIndex = 0; pNexts[0] = NULL; // wskaźniki do kolejnych odcinków ruchu @@ -71,7 +71,7 @@ __fastcall TSwitchExtension::TSwitchExtension(TTrack *owner, int what) fVelocity = -1.0; // maksymalne ograniczenie prędkości (ustawianej eventem) vTrans = vector3(0, 0, 0); // docelowa translacja przesuwnicy } -__fastcall TSwitchExtension::~TSwitchExtension() +TSwitchExtension::~TSwitchExtension() { // nie ma nic do usuwania // delete Segments[0]; // delete Segments[1]; @@ -81,8 +81,12 @@ __fastcall TSwitchExtension::~TSwitchExtension() delete Segments[5]; } -__fastcall TIsolated::TIsolated() { // utworznie pustego TIsolated("none", NULL); }; -__fastcall TIsolated::TIsolated(const AnsiString &n, TIsolated *i) +TIsolated::TIsolated() +{ // utworznie pustego + TIsolated("none", NULL); +}; + +TIsolated::TIsolated(const AnsiString &n, TIsolated *i) { // utworznie obwodu izolowanego asName = n; pNext = i; @@ -91,7 +95,7 @@ __fastcall TIsolated::TIsolated(const AnsiString &n, TIsolated *i) pMemCell = NULL; // podpiąć istniejącą albo utworzyć pustą }; -__fastcall TIsolated::~TIsolated(){// usuwanie +TIsolated::~TIsolated(){// usuwanie /* TIsolated *p=pRoot; while (pRoot) @@ -148,7 +152,7 @@ void TIsolated::Modify(int i, TDynamicObject *o) } }; -__fastcall TTrack::TTrack(TGroundNode *g) +TTrack::TTrack(TGroundNode *g) { // tworzenie nowego odcinka ruchu trNext = trPrev = NULL; // sąsiednie Segment = NULL; // dane odcinka @@ -200,7 +204,7 @@ __fastcall TTrack::TTrack(TGroundNode *g) trColides = NULL; // tor kolizyjny, na którym trzeba sprawdzać pojazdy pod kątem zderzenia } -__fastcall TTrack::~TTrack() +TTrack::~TTrack() { // likwidacja odcinka if (eType == tt_Normal) delete Segment; // dla zwrotnic nie usuwać tego (kopiowany) @@ -3087,7 +3091,10 @@ int TTrack::TestPoint(vector3 *Point) return -1; }; -void TTrack::MovedUp1(double dh) { // poprawienie przechyłki wymaga wydłużenia podsypki fTexHeight1 += dh; }; +void TTrack::MovedUp1(double dh) +{ // poprawienie przechyłki wymaga wydłużenia podsypki + fTexHeight1 += dh; +}; AnsiString TTrack::NameGet() { // ustalenie nazwy toru diff --git a/TractionPower.cpp b/TractionPower.cpp index f952317df..8c87d7be5 100644 --- a/TractionPower.cpp +++ b/TractionPower.cpp @@ -21,7 +21,7 @@ //--------------------------------------------------------------------------- -__fastcall TTractionPowerSource::TTractionPowerSource() +TTractionPowerSource::TTractionPowerSource() { NominalVoltage = 0; VoltageFrequency = 0; @@ -44,7 +44,7 @@ __fastcall TTractionPowerSource::TTractionPowerSource() bSection = false; // sekcja nie jest źródłem zasilania, tylko grupuje przęsła }; -__fastcall TTractionPowerSource::~TTractionPowerSource(){}; +TTractionPowerSource::~TTractionPowerSource(){}; void TTractionPowerSource::Init(double u, double i) { // ustawianie zasilacza przy braku w scenerii diff --git a/Train.cpp b/Train.cpp index 8bab46e93..af374da28 100644 --- a/Train.cpp +++ b/Train.cpp @@ -21,7 +21,7 @@ using namespace Timer; -__fastcall TCab::TCab() +TCab::TCab() { CabPos1.x = -1.0; CabPos1.y = 1.0; @@ -82,7 +82,7 @@ void TCab::Load(TQueryParserComp *Parser) bOccupied = True; } -__fastcall TCab::~TCab() +TCab::~TCab() { delete[] ggList; delete[] btList; @@ -124,7 +124,7 @@ void TCab::Update() } }; -__fastcall TTrain::TTrain() +TTrain::TTrain() { ActiveUniversal4 = false; ShowNextCurrent = false; @@ -175,7 +175,7 @@ __fastcall TTrain::TTrain() fTachoTimer = 0.0; // włączenie skoków wskazań prędkościomierza } -__fastcall TTrain::~TTrain() +TTrain::~TTrain() { if (DynamicObject) if (DynamicObject->Mechanik) diff --git a/TrkFoll.cpp b/TrkFoll.cpp index 4c53d1794..1e0d56664 100644 --- a/TrkFoll.cpp +++ b/TrkFoll.cpp @@ -20,7 +20,7 @@ #include "Ground.h" #include "Event.h" -__fastcall TTrackFollower::TTrackFollower() +TTrackFollower::TTrackFollower() { pCurrentTrack = NULL; pCurrentSegment = NULL; @@ -30,7 +30,7 @@ __fastcall TTrackFollower::TTrackFollower() fOffsetH = 0.0; // na starcie stoi na środku } -__fastcall TTrackFollower::~TTrackFollower() {} +TTrackFollower::~TTrackFollower() {} bool TTrackFollower::Init(TTrack *pTrack, TDynamicObject *NewOwner, double fDir) { diff --git a/VBO.cpp b/VBO.cpp index 3c574c8bf..fbe1dc3f1 100644 --- a/VBO.cpp +++ b/VBO.cpp @@ -10,14 +10,14 @@ #pragma package(smart_init) -__fastcall CMesh::CMesh() +CMesh::CMesh() { // utworzenie pustego obiektu m_pVNT = NULL; m_nVertexCount = -1; m_nVBOVertices = 0; // nie zarezerwowane }; -__fastcall CMesh::~CMesh() +CMesh::~CMesh() { // usuwanie obiektu Clear(); // zwolnienie zasobów }; diff --git a/World.cpp b/World.cpp index 836bd7dc1..ba115c498 100644 --- a/World.cpp +++ b/World.cpp @@ -40,7 +40,7 @@ using namespace Timer; const double fTimeMax = 1.00; //[s] maksymalny czas aktualizacji w jednek klatce -__fastcall TWorld::TWorld() +TWorld::TWorld() { // randomize(); // Randomize(); @@ -60,7 +60,7 @@ __fastcall TWorld::TWorld() fTime50Hz = 0.0; // bufor czasu dla komunikacji z PoKeys } -__fastcall TWorld::~TWorld() +TWorld::~TWorld() { Global::bManageNodes = false; // Ra: wyłączenie wyrejestrowania, bo się sypie TrainDelete(); diff --git a/sky.cpp b/sky.cpp index 52472a850..fd86910f1 100644 --- a/sky.cpp +++ b/sky.cpp @@ -10,9 +10,9 @@ //--------------------------------------------------------------------------- GLfloat lightPos[4] = {0.0f, 0.0f, 0.0f, 1.0f}; -__fastcall TSky::~TSky(){}; +TSky::~TSky(){}; -__fastcall TSky::TSky(){}; +TSky::TSky(){}; void TSky::Init() { From 4873d8431cb0ac82b07aae10efdeeaac4b4fc389 Mon Sep 17 00:00:00 2001 From: Firleju Date: Thu, 16 Apr 2015 11:50:14 +0200 Subject: [PATCH 2/3] Added license notes to all source code files. --- AdvSound.cpp | 9 ++++++++- AdvSound.h | 10 +++++++++- AirCoupler.cpp | 9 ++++++++- AirCoupler.h | 9 ++++++++- AnimModel.cpp | 9 ++++++++- AnimModel.h | 14 +++++++++++++- Button.cpp | 9 ++++++++- Button.h | 9 ++++++++- Camera.cpp | 10 +++++++++- Camera.h | 10 +++++++++- Classes.cpp | 9 ++++++++- Classes.h | 9 ++++++++- Console.cpp | 9 ++++++++- Console.h | 9 ++++++++- Console/LPT.cpp | 9 ++++++++- Console/LPT.h | 9 ++++++++- Console/PoKeys55.cpp | 10 +++++++++- Console/PoKeys55.h | 10 +++++++++- Curve.cpp | 9 ++++++++- Curve.h | 9 ++++++++- Data.h | 9 ++++++++- Driver.cpp | 9 ++++++++- Driver.h | 9 ++++++++- DynObj.cpp | 9 ++++++++- DynObj.h | 9 ++++++++- EU07.cpp | 9 ++++++++- EvLaunch.cpp | 9 ++++++++- EvLaunch.h | 9 ++++++++- Event.cpp | 9 ++++++++- Event.h | 9 ++++++++- FadeSound.cpp | 9 ++++++++- FadeSound.h | 9 ++++++++- Float3d.cpp | 9 ++++++++- Float3d.h | 9 ++++++++- Forth.cpp | 9 ++++++++- Forth.h | 9 ++++++++- Gauge.cpp | 9 ++++++++- Gauge.h | 9 ++++++++- Geom.cpp | 9 ++++++++- Geom.h | 9 ++++++++- Globals.cpp | 9 ++++++++- Globals.h | 9 ++++++++- Ground.cpp | 9 ++++++++- Ground.h | 9 ++++++++- Logs.cpp | 9 ++++++++- Logs.h | 9 ++++++++- Machajka.cpp | 9 ++++++++- Machajka.h | 9 ++++++++- McZapkie/Oerlikon_ESt.pas | 8 ++++++++ McZapkie/Unit1.pas | 9 +++++++++ McZapkie/_mover.pas | 8 ++++++++ McZapkie/friction.pas | 8 ++++++++ McZapkie/hamulce.pas | 8 ++++++++ McZapkie/klasy_ham.pas | 8 ++++++++ McZapkie/mctools.pas | 10 ++++++++++ McZapkie/mtable.pas | 9 +++++++++ McZapkie/unit2.pas | 9 +++++++++ MdlMngr.cpp | 9 ++++++++- MdlMngr.h | 9 ++++++++- MemCell.cpp | 9 ++++++++- MemCell.h | 9 ++++++++- Model3d.cpp | 9 ++++++++- Model3d.h | 10 +++++++++- Mover.cpp | 9 ++++++++- Mover.h | 9 ++++++++- Names.cpp | 9 ++++++++- Names.h | 9 ++++++++- QueryParserComp.pas | 9 +++++++++ RealSound.cpp | 9 ++++++++- RealSound.h | 10 +++++++++- ResourceManager.cpp | 9 +++++++++ ResourceManager.h | 9 +++++++++ Segment.cpp | 9 ++++++++- Segment.h | 9 ++++++++- Sound.cpp | 9 ++++++++- Sound.h | 10 +++++++++- Spline.cpp | 9 ++++++++- Spline.h | 10 +++++++++- Spring.cpp | 9 ++++++++- Spring.h | 9 ++++++++- Texture.cpp | 9 ++++++++- Texture.h | 9 ++++++++- TextureDDS.cpp | 9 +++++++++ TextureDDS.h | 9 +++++++++ Timer.cpp | 9 ++++++++- Timer.h | 9 ++++++++- Track.cpp | 9 ++++++++- Track.h | 9 ++++++++- Traction.cpp | 9 ++++++++- Traction.h | 9 ++++++++- TractionPower.cpp | 9 ++++++++- TractionPower.h | 9 ++++++++- Train.cpp | 9 ++++++++- Train.h | 15 +++++++++++---- TrkFoll.cpp | 9 ++++++++- TrkFoll.h | 9 ++++++++- VBO.cpp | 9 ++++++++- VBO.h | 9 ++++++++- World.cpp | 9 ++++++++- World.h | 9 ++++++++- dumb3d.cpp | 9 +++++++++ dumb3d.h | 9 +++++++++ geometry.cpp | 9 ++++++++- geometry.h | 9 ++++++++- parser.cpp | 8 ++++++++ parser.h | 8 ++++++++ sky.cpp | 9 ++++++++- sky.h | 8 ++++++++ usefull.h | 10 +++++++++- wavread.cpp | 9 +++++++++ wavread.h | 9 +++++++++ 111 files changed, 920 insertions(+), 93 deletions(-) diff --git a/AdvSound.cpp b/AdvSound.cpp index 26e62ce6f..af5c63743 100644 --- a/AdvSound.cpp +++ b/AdvSound.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #include "system.hpp" #include "classes.hpp" diff --git a/AdvSound.h b/AdvSound.h index 3f741f4bc..41d168bbb 100644 --- a/AdvSound.h +++ b/AdvSound.h @@ -1,4 +1,12 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + #ifndef AdvSoundH #define AdvSoundH diff --git a/AirCoupler.cpp b/AirCoupler.cpp index ebc6839b4..76100d20a 100644 --- a/AirCoupler.cpp +++ b/AirCoupler.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #include "system.hpp" #include "classes.hpp" diff --git a/AirCoupler.h b/AirCoupler.h index 196cf4c56..12131049e 100644 --- a/AirCoupler.h +++ b/AirCoupler.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef AirCouplerH #define AirCouplerH diff --git a/AnimModel.cpp b/AnimModel.cpp index a27342150..c14327f5d 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ /* MaSzyna EU07 locomotive simulator Copyright (C) 2001-2004 Marcin Wozniak and others diff --git a/AnimModel.h b/AnimModel.h index 87f4d5c16..8f539e9f4 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -1,4 +1,16 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ +/* + MaSzyna EU07 locomotive simulator + Copyright (C) 2001-2004 Marcin Wozniak and others + +*/ #ifndef AnimModelH #define AnimModelH diff --git a/Button.cpp b/Button.cpp index bcc71bc1d..7b5f90c28 100644 --- a/Button.cpp +++ b/Button.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #include "system.hpp" #include "classes.hpp" diff --git a/Button.h b/Button.h index 61d3fc387..cc54588d1 100644 --- a/Button.h +++ b/Button.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef ButtonH #define ButtonH diff --git a/Camera.cpp b/Camera.cpp index b4a00f4e7..596c2f82d 100644 --- a/Camera.cpp +++ b/Camera.cpp @@ -1,4 +1,12 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + #include "system.hpp" #include "classes.hpp" diff --git a/Camera.h b/Camera.h index 17fc544a0..c74c7ac87 100644 --- a/Camera.h +++ b/Camera.h @@ -1,4 +1,12 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + #ifndef CameraH #define CameraH diff --git a/Classes.cpp b/Classes.cpp index 3260cea84..ccb7c9d6d 100644 --- a/Classes.cpp +++ b/Classes.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #include #pragma hdrstop diff --git a/Classes.h b/Classes.h index dc553b797..0de7a712c 100644 --- a/Classes.h +++ b/Classes.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef ClassesH #define ClassesH diff --git a/Console.cpp b/Console.cpp index 0d4081023..d2dc8fa2d 100644 --- a/Console.cpp +++ b/Console.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #include #pragma hdrstop diff --git a/Console.h b/Console.h index 3d3fdd125..8fad4719f 100644 --- a/Console.h +++ b/Console.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef ConsoleH #define ConsoleH diff --git a/Console/LPT.cpp b/Console/LPT.cpp index 0716e8b70..95f59f8e3 100644 --- a/Console/LPT.cpp +++ b/Console/LPT.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #include "LPT.h" #include diff --git a/Console/LPT.h b/Console/LPT.h index 48d920935..96be5bb5f 100644 --- a/Console/LPT.h +++ b/Console/LPT.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef LPTH #define LPTH diff --git a/Console/PoKeys55.cpp b/Console/PoKeys55.cpp index c59b9f9e3..70c8214f4 100644 --- a/Console/PoKeys55.cpp +++ b/Console/PoKeys55.cpp @@ -1,4 +1,12 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + #include #pragma hdrstop diff --git a/Console/PoKeys55.h b/Console/PoKeys55.h index 2ccef31fd..905e425ca 100644 --- a/Console/PoKeys55.h +++ b/Console/PoKeys55.h @@ -1,4 +1,12 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + #ifndef PoKeys55H #define PoKeys55H //--------------------------------------------------------------------------- diff --git a/Curve.cpp b/Curve.cpp index 05d75c86f..4d5f05762 100644 --- a/Curve.cpp +++ b/Curve.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #include "system.hpp" #include "classes.hpp" diff --git a/Curve.h b/Curve.h index 0df39695b..44ae77459 100644 --- a/Curve.h +++ b/Curve.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef CurveH #define CurveH diff --git a/Data.h b/Data.h index ac6ac974a..969d41fa7 100644 --- a/Data.h +++ b/Data.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef DataH #define DataH diff --git a/Driver.cpp b/Driver.cpp index 4ef5777dd..ee9a62753 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ /* MaSzyna EU07 locomotive simulator Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others diff --git a/Driver.h b/Driver.h index 64bc8a5b9..bc4e053d1 100644 --- a/Driver.h +++ b/Driver.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef DriverH #define DriverH diff --git a/DynObj.cpp b/DynObj.cpp index a8e365914..ecf78094e 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ /* MaSzyna EU07 locomotive simulator Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others diff --git a/DynObj.h b/DynObj.h index 9192255b5..6680302ad 100644 --- a/DynObj.h +++ b/DynObj.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef DynObjH #define DynObjH diff --git a/EU07.cpp b/EU07.cpp index e69a82bdb..1c4879e1c 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ /* MaSzyna EU07 locomotive simulator Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others diff --git a/EvLaunch.cpp b/EvLaunch.cpp index a7b7c9108..523e8b0c8 100644 --- a/EvLaunch.cpp +++ b/EvLaunch.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ /* MaSzyna EU07 locomotive simulator diff --git a/EvLaunch.h b/EvLaunch.h index 26c7c751b..3f2b7f3d5 100644 --- a/EvLaunch.h +++ b/EvLaunch.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef EvLaunchH #define EvLaunchH diff --git a/Event.cpp b/Event.cpp index 1c0f8189c..e4f584b41 100644 --- a/Event.cpp +++ b/Event.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ /* MaSzyna EU07 locomotive simulator diff --git a/Event.h b/Event.h index cc10ed655..d04fcc49a 100644 --- a/Event.h +++ b/Event.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef EventH #define EventH diff --git a/FadeSound.cpp b/FadeSound.cpp index d30d3ae0f..5213c69ec 100644 --- a/FadeSound.cpp +++ b/FadeSound.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ /* MaSzyna EU07 locomotive simulator Copyright (C) 2001-2004 Marcin Wozniak and others diff --git a/FadeSound.h b/FadeSound.h index 4e33211c3..85f58dbdc 100644 --- a/FadeSound.h +++ b/FadeSound.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef FadeSoundH #define FadeSoundH diff --git a/Float3d.cpp b/Float3d.cpp index 152ec8292..f449390ca 100644 --- a/Float3d.cpp +++ b/Float3d.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #include #pragma hdrstop diff --git a/Float3d.h b/Float3d.h index 559c35db9..d1122c7f7 100644 --- a/Float3d.h +++ b/Float3d.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef float3dH #define float3dH diff --git a/Forth.cpp b/Forth.cpp index 30faf4ea0..2fd4d0808 100644 --- a/Forth.cpp +++ b/Forth.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #include #pragma hdrstop diff --git a/Forth.h b/Forth.h index da579e72e..3ba62078b 100644 --- a/Forth.h +++ b/Forth.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef ForthH #define ForthH diff --git a/Gauge.cpp b/Gauge.cpp index 03a8dcf93..0421eef7a 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ /* MaSzyna EU07 locomotive simulator diff --git a/Gauge.h b/Gauge.h index 2ae417733..228d0ab2d 100644 --- a/Gauge.h +++ b/Gauge.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef GaugeH #define GaugeH diff --git a/Geom.cpp b/Geom.cpp index bf699471c..4ea477c8b 100644 --- a/Geom.cpp +++ b/Geom.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #include "system.hpp" #include "classes.hpp" diff --git a/Geom.h b/Geom.h index 9355b70df..de17b2d45 100644 --- a/Geom.h +++ b/Geom.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef GeomH #define GeomH diff --git a/Globals.cpp b/Globals.cpp index b47d346c1..a4746193c 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ /* MaSzyna EU07 locomotive simulator Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others diff --git a/Globals.h b/Globals.h index c0fa63b4a..b0bdb96d6 100644 --- a/Globals.h +++ b/Globals.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef GlobalsH #define GlobalsH diff --git a/Ground.cpp b/Ground.cpp index 266a3492a..e780a2543 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ /* MaSzyna EU07 locomotive simulator diff --git a/Ground.h b/Ground.h index 12b854881..316de17ad 100644 --- a/Ground.h +++ b/Ground.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef groundH #define groundH diff --git a/Logs.cpp b/Logs.cpp index 0ef36bbb2..50a8a3b94 100644 --- a/Logs.cpp +++ b/Logs.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #include "system.hpp" #include "classes.hpp" diff --git a/Logs.h b/Logs.h index 09acd3429..69c36c5f0 100644 --- a/Logs.h +++ b/Logs.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef LogsH #define LogsH diff --git a/Machajka.cpp b/Machajka.cpp index c5bf17178..d7e672d3b 100644 --- a/Machajka.cpp +++ b/Machajka.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #include "system.hpp" #include "classes.hpp" diff --git a/Machajka.h b/Machajka.h index 49b7e8700..70b335f67 100644 --- a/Machajka.h +++ b/Machajka.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef MachajkaH #define MachajkaH diff --git a/McZapkie/Oerlikon_ESt.pas b/McZapkie/Oerlikon_ESt.pas index 5c5a8fa9b..af94f1bcf 100644 --- a/McZapkie/Oerlikon_ESt.pas +++ b/McZapkie/Oerlikon_ESt.pas @@ -1,5 +1,13 @@ unit Oerlikon_ESt; {fizyka hamulcow Oerlikon ESt dla symulatora} +(* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*) (* MaSzyna EU07 - SPKS Brakes. Oerlikon ESt. diff --git a/McZapkie/Unit1.pas b/McZapkie/Unit1.pas index 1435dc929..1ff4a41de 100644 --- a/McZapkie/Unit1.pas +++ b/McZapkie/Unit1.pas @@ -1,5 +1,14 @@ unit Unit1; +(* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*) + interface uses diff --git a/McZapkie/_mover.pas b/McZapkie/_mover.pas index 870db3985..b61cc7fa3 100644 --- a/McZapkie/_mover.pas +++ b/McZapkie/_mover.pas @@ -1,5 +1,13 @@ unit _mover; {fizyka ruchu dla symulatora lokomotywy} +(* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*) (* MaSzyna EU07 locomotive simulator Copyright (C) 2001-2004 Maciej Czapkiewicz and others diff --git a/McZapkie/friction.pas b/McZapkie/friction.pas index 032042369..9390feb10 100644 --- a/McZapkie/friction.pas +++ b/McZapkie/friction.pas @@ -1,5 +1,13 @@ unit friction; {wspolczynnik tarcia roznych materialow} +(* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*) (* MaSzyna EU07 - SPKS Friction coefficient. diff --git a/McZapkie/hamulce.pas b/McZapkie/hamulce.pas index 79d552f14..18872658c 100644 --- a/McZapkie/hamulce.pas +++ b/McZapkie/hamulce.pas @@ -1,5 +1,13 @@ unit hamulce; {fizyka hamulcow dla symulatora} +(* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*) (* MaSzyna EU07 - SPKS Brakes. diff --git a/McZapkie/klasy_ham.pas b/McZapkie/klasy_ham.pas index 2daa146d1..01aeab1cf 100644 --- a/McZapkie/klasy_ham.pas +++ b/McZapkie/klasy_ham.pas @@ -1,5 +1,13 @@ unit klasy_ham; {fizyka hamulcow dla symulatora} +(* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*) (* MaSzyna EU07 - SPKS Brakes. Basic classes. diff --git a/McZapkie/mctools.pas b/McZapkie/mctools.pas index f0e9ab064..c50cbf206 100644 --- a/McZapkie/mctools.pas +++ b/McZapkie/mctools.pas @@ -1,4 +1,14 @@ unit mctools; + +(* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*) + {rozne takie duperele do operacji na stringach w paszczalu, pewnie w delfi sa lepsze} {konwersja zmiennych na stringi, funkcje matematyczne, logiczne, lancuchowe, I/O etc} diff --git a/McZapkie/mtable.pas b/McZapkie/mtable.pas index 5d86419ee..a91726d5a 100644 --- a/McZapkie/mtable.pas +++ b/McZapkie/mtable.pas @@ -1,5 +1,14 @@ unit mtable; +(* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*) + interface uses mctools,sysutils; const MaxTTableSize=100; //można by to robić dynamicznie diff --git a/McZapkie/unit2.pas b/McZapkie/unit2.pas index 6c430de4c..c561dacbd 100644 --- a/McZapkie/unit2.pas +++ b/McZapkie/unit2.pas @@ -1,5 +1,14 @@ unit Unit1; +(* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*) + interface uses diff --git a/MdlMngr.cpp b/MdlMngr.cpp index e345e4b7f..3900f0c25 100644 --- a/MdlMngr.cpp +++ b/MdlMngr.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ /* MaSzyna EU07 locomotive simulator diff --git a/MdlMngr.h b/MdlMngr.h index e393416b1..25665aca1 100644 --- a/MdlMngr.h +++ b/MdlMngr.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef MdlMngrH #define MdlMngrH diff --git a/MemCell.cpp b/MemCell.cpp index 524869533..d7126ad02 100644 --- a/MemCell.cpp +++ b/MemCell.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ /* MaSzyna EU07 locomotive simulator diff --git a/MemCell.h b/MemCell.h index 1e0800786..271a79c83 100644 --- a/MemCell.h +++ b/MemCell.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef MemCellH #define MemCellH diff --git a/Model3d.cpp b/Model3d.cpp index 05af1a788..deb28c07b 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ /* MaSzyna EU07 locomotive simulator Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others diff --git a/Model3d.h b/Model3d.h index 62f795eb4..ce5a5e3e8 100644 --- a/Model3d.h +++ b/Model3d.h @@ -1,4 +1,12 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + #ifndef Model3dH #define Model3dH diff --git a/Mover.cpp b/Mover.cpp index 9ae979d60..47c4f07d7 100644 --- a/Mover.cpp +++ b/Mover.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #include "Mover.h" //--------------------------------------------------------------------------- diff --git a/Mover.h b/Mover.h index 1674fae6f..2db455f55 100644 --- a/Mover.h +++ b/Mover.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef MoverH #define MoverH diff --git a/Names.cpp b/Names.cpp index eb8b7688f..331da6f9d 100644 --- a/Names.cpp +++ b/Names.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #include #pragma hdrstop diff --git a/Names.h b/Names.h index 7ee1e28e8..76f162d23 100644 --- a/Names.h +++ b/Names.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef NamesH #define NamesH diff --git a/QueryParserComp.pas b/QueryParserComp.pas index 8c0101d73..e6e863078 100644 --- a/QueryParserComp.pas +++ b/QueryParserComp.pas @@ -1,5 +1,14 @@ unit QueryParserComp; +(* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*) + interface uses diff --git a/RealSound.cpp b/RealSound.cpp index cf5a06b14..c1709f0b9 100644 --- a/RealSound.cpp +++ b/RealSound.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ /* MaSzyna EU07 locomotive simulator Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others diff --git a/RealSound.h b/RealSound.h index 11901e9f0..5a1fbcdb8 100644 --- a/RealSound.h +++ b/RealSound.h @@ -1,4 +1,12 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + #ifndef RealSoundH #define RealSoundH diff --git a/ResourceManager.cpp b/ResourceManager.cpp index c044617f4..ed4706817 100644 --- a/ResourceManager.cpp +++ b/ResourceManager.cpp @@ -1,3 +1,12 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + #include "ResourceManager.h" #include "Logs.h" diff --git a/ResourceManager.h b/ResourceManager.h index bbfc389d7..26efdf733 100644 --- a/ResourceManager.h +++ b/ResourceManager.h @@ -1,3 +1,12 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + #ifndef RESOURCEMANAGER_H #define RESOURCEMANAGER_H 1 diff --git a/Segment.cpp b/Segment.cpp index 1981942d6..30fcbf216 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #include "system.hpp" #pragma hdrstop diff --git a/Segment.h b/Segment.h index fac76eddf..390c8eb67 100644 --- a/Segment.h +++ b/Segment.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef SegmentH #define SegmentH diff --git a/Sound.cpp b/Sound.cpp index f0016bd6f..0580d810f 100644 --- a/Sound.cpp +++ b/Sound.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #include "system.hpp" #include "classes.hpp" diff --git a/Sound.h b/Sound.h index 8e350104e..1d90aa80e 100644 --- a/Sound.h +++ b/Sound.h @@ -1,4 +1,12 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + #ifndef SoundH #define SoundH diff --git a/Spline.cpp b/Spline.cpp index 2cb1c5e2b..a693bed45 100644 --- a/Spline.cpp +++ b/Spline.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #include "system.hpp" #include "classes.hpp" diff --git a/Spline.h b/Spline.h index be20450b4..d60d2cf08 100644 --- a/Spline.h +++ b/Spline.h @@ -1,4 +1,12 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + #ifndef SplineH #define SplineH diff --git a/Spring.cpp b/Spring.cpp index 14d1acc7a..b615902b4 100644 --- a/Spring.cpp +++ b/Spring.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #include "system.hpp" #include "classes.hpp" diff --git a/Spring.h b/Spring.h index 12d052315..050df3dc7 100644 --- a/Spring.h +++ b/Spring.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef ParticlesH #define ParticlesH diff --git a/Texture.cpp b/Texture.cpp index 2b28011ef..f99209077 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ /* MaSzyna EU07 locomotive simulator diff --git a/Texture.h b/Texture.h index a9ed6b9c7..e4a195a02 100644 --- a/Texture.h +++ b/Texture.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef TextureH #define TextureH diff --git a/TextureDDS.cpp b/TextureDDS.cpp index 662fcfd53..6849e1126 100644 --- a/TextureDDS.cpp +++ b/TextureDDS.cpp @@ -1,3 +1,12 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + #include "TextureDDS.h" void DxtcReadColors(const GLubyte *Data, Color8888 *result) diff --git a/TextureDDS.h b/TextureDDS.h index 7ec67625b..543e67d85 100644 --- a/TextureDDS.h +++ b/TextureDDS.h @@ -1,3 +1,12 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + #ifndef TEXTURE_DDS_H #define TEXTURE_DDS_H 1 diff --git a/Timer.cpp b/Timer.cpp index c6f3f011d..10135b7a7 100644 --- a/Timer.cpp +++ b/Timer.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #include "system.hpp" #include "classes.hpp" diff --git a/Timer.h b/Timer.h index cf2ec18bd..b16d0d560 100644 --- a/Timer.h +++ b/Timer.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef TimerH #define TimerH diff --git a/Track.cpp b/Track.cpp index 76a6b1cce..2817a04bb 100644 --- a/Track.cpp +++ b/Track.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ /* MaSzyna EU07 locomotive simulator Copyright (C) 2001-2004 Marcin Wozniak and others diff --git a/Track.h b/Track.h index b7139b51a..d8a6ed3c8 100644 --- a/Track.h +++ b/Track.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef TrackH #define TrackH diff --git a/Traction.cpp b/Traction.cpp index d52377f07..e6a1c5f85 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ /* MaSzyna EU07 locomotive simulator Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others diff --git a/Traction.h b/Traction.h index a1b19c6f5..6fc9a67f5 100644 --- a/Traction.h +++ b/Traction.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef TractionH #define TractionH diff --git a/TractionPower.cpp b/TractionPower.cpp index 8c87d7be5..c7e49b7a0 100644 --- a/TractionPower.cpp +++ b/TractionPower.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ /* MaSzyna EU07 locomotive simulator component diff --git a/TractionPower.h b/TractionPower.h index dcdf1fa94..31d594424 100644 --- a/TractionPower.h +++ b/TractionPower.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef TractionPowerH #define TractionPowerH diff --git a/Train.cpp b/Train.cpp index af374da28..05e5aa28a 100644 --- a/Train.cpp +++ b/Train.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ /* MaSzyna EU07 locomotive simulator Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others diff --git a/Train.h b/Train.h index 07269d36a..5189c5aa0 100644 --- a/Train.h +++ b/Train.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef TrainH #define TrainH @@ -92,7 +99,7 @@ class TTrain TMoverParameters *mvOccupied; // człon, w którym sterujemy hamulcem TMoverParameters *mvSecond; // drugi człon (ET40, ET41, ET42, ukrotnienia) TMoverParameters *mvThird; // trzeci człon (SN61) - public: // reszta może być publiczna + public: // reszta może by?publiczna // AnsiString asMessage; // McZapkie: definicje wskaźników @@ -247,7 +254,7 @@ class TTrain TButton btLampkaDepartureSignal; TButton btLampkaBlokadaDrzwi; TButton btLampkaHamulecReczny; - TButton btLampkaForward; // Ra: lampki w przód i w tył dla komputerowych kabin + TButton btLampkaForward; // Ra: lampki w przód i w ty?dla komputerowych kabin TButton btLampkaBackward; TButton btCabLight; // hunter-171012: lampa oswietlajaca kabine @@ -359,7 +366,7 @@ class TTrain float fTachoCount; float fHVoltage; // napięcie dla dynamicznych gałek float fHCurrent[4]; // prądy: suma i amperomierze 1,2,3 - float fEngine[4]; // obroty też trzeba pobrać + float fEngine[4]; // obroty te?trzeba pobra? // McZapkie: do syczenia float fPPress, fNPress; float fSPPress, fSNPress; diff --git a/TrkFoll.cpp b/TrkFoll.cpp index 1e0d56664..2ae47e4a1 100644 --- a/TrkFoll.cpp +++ b/TrkFoll.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ /* MaSzyna EU07 locomotive simulator diff --git a/TrkFoll.h b/TrkFoll.h index fa418e64a..6d825c335 100644 --- a/TrkFoll.h +++ b/TrkFoll.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef TrkFollH #define TrkFollH diff --git a/VBO.cpp b/VBO.cpp index fbe1dc3f1..cf69d660d 100644 --- a/VBO.cpp +++ b/VBO.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #include #pragma hdrstop diff --git a/VBO.h b/VBO.h index e2a45f3e5..f930df5c1 100644 --- a/VBO.h +++ b/VBO.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef VBOH #define VBOH diff --git a/World.cpp b/World.cpp index ba115c498..caa0e5fd0 100644 --- a/World.cpp +++ b/World.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ /* MaSzyna EU07 locomotive simulator Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others diff --git a/World.h b/World.h index d82bebd82..c35ffeca2 100644 --- a/World.h +++ b/World.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef WorldH #define WorldH diff --git a/dumb3d.cpp b/dumb3d.cpp index 87b4dfe32..ace4b50af 100644 --- a/dumb3d.cpp +++ b/dumb3d.cpp @@ -1,3 +1,12 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + #include "dumb3d.h" #include "fastmath.h" #include diff --git a/dumb3d.h b/dumb3d.h index 59e771e16..a2ed36d51 100644 --- a/dumb3d.h +++ b/dumb3d.h @@ -1,3 +1,12 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + #ifndef MATH3D_H #define MATH3D_H diff --git a/geometry.cpp b/geometry.cpp index 97068c054..f2082d43f 100644 --- a/geometry.cpp +++ b/geometry.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #include #pragma hdrstop diff --git a/geometry.h b/geometry.h index 301165e7f..5cdd2ec3d 100644 --- a/geometry.h +++ b/geometry.h @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #ifndef GeometryH #define GeometryH diff --git a/parser.cpp b/parser.cpp index f9ad070e7..bf9cb6c4c 100644 --- a/parser.cpp +++ b/parser.cpp @@ -1,3 +1,11 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #define _USE_OLD_RW_STL diff --git a/parser.h b/parser.h index e4d0e524e..369972ff3 100644 --- a/parser.h +++ b/parser.h @@ -1,3 +1,11 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #if !defined(rainKERNELTEXTPARSER_H_INCLUDED) #define rainKERNELTEXTPARSER_H_INCLUDED diff --git a/sky.cpp b/sky.cpp index fd86910f1..c26b87220 100644 --- a/sky.cpp +++ b/sky.cpp @@ -1,4 +1,11 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #include "system.hpp" #include "classes.hpp" diff --git a/sky.h b/sky.h index 6363c11b2..409f06c5c 100644 --- a/sky.h +++ b/sky.h @@ -19,3 +19,11 @@ class TSky //--------------------------------------------------------------------------- #endif +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ \ No newline at end of file diff --git a/usefull.h b/usefull.h index 15a10c627..87c2d87f8 100644 --- a/usefull.h +++ b/usefull.h @@ -1,4 +1,12 @@ -//--------------------------------------------------------------------------- +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + #ifndef UsefullH #define UsefullH diff --git a/wavread.cpp b/wavread.cpp index 0258ffada..92d86f46d 100644 --- a/wavread.cpp +++ b/wavread.cpp @@ -1,3 +1,12 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + //----------------------------------------------------------------------------- // File: WavRead.cpp // diff --git a/wavread.h b/wavread.h index 60c5e1c51..01c3759e5 100644 --- a/wavread.h +++ b/wavread.h @@ -1,3 +1,12 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + //----------------------------------------------------------------------------- // File: WavRead.h // From 049455a5e7c95ad6c651e8456f50b95df2fd453b Mon Sep 17 00:00:00 2001 From: Firleju Date: Thu, 16 Apr 2015 14:33:13 +0200 Subject: [PATCH 3/3] event0 now works again, event0 and all eventall can be assign to track by : vehicle can have only emergency brake, steering by Num1 and Num7 (by yB) --- DynObj.cpp | 7 +++++-- EU07.bpr | 13 ++++--------- Globals.cpp | 4 ++-- Ground.cpp | 18 ++++++++++++++++-- McZapkie/_mover.pas | 2 +- 5 files changed, 28 insertions(+), 16 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index ecf78094e..7c72b4025 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -2009,8 +2009,11 @@ void TDynamicObject::Move(double fDistance) bEnabled &= Axle1.Move(fDistance, iAxleFirst); // oś z tyłu pojazdu prusza się pierwsza bEnabled &= Axle0.Move(fDistance /*-fAdjustment*/, !iAxleFirst); // oś z przodu pojazdu } - // Axle2.Move(fDistance,false); //te nigdy pierwsze nie są - // Axle3.Move(fDistance,false); + else //gf: bez wywolania Move na postoju nie ma event0 + { + bEnabled&=Axle1.Move(fDistance,iAxleFirst); //oś z tyłu pojazdu prusza się pierwsza + bEnabled&=Axle0.Move(fDistance,!iAxleFirst); //oś z przodu pojazdu + } if (fDistance != 0.0) // nie liczyć ponownie, jeśli stoi { // liczenie pozycji pojazdu tutaj, bo jest używane w wielu miejscach vPosition = 0.5 * (Axle1.pPosition + Axle0.pPosition); //środek między skrajnymi osiami diff --git a/EU07.bpr b/EU07.bpr index 2be34889e..61f494f1d 100644 --- a/EU07.bpr +++ b/EU07.bpr @@ -58,8 +58,8 @@ IncludeVerInfo=1 AutoIncBuild=0 MajorVer=15 MinorVer=3 -Release=1166 -Build=469 +Release=1167 +Build=470 Debug=1 PreRelease=0 Special=0 @@ -71,8 +71,8 @@ CodePage=1250 [Version Info Keys] CompanyName=EU07 Team FileDescription=MaSzyna EU07-424 -FileVersion=15.3.1166.469 -InternalName=9th by Ra + SPKS + MP +FileVersion=15.3.1167.470 +InternalName=9th by firleju + SPKS + MP LegalCopyright= LegalTrademarks= OriginalFilename=eu07.exe @@ -124,11 +124,6 @@ ShowInfoMsgs=0 LinkDebugVcl=0 LinkCGLIB=0 -[CORBA] -AddServerUnit=1 -AddClientUnit=1 -PrecompiledHeaders=1 - [Language] ActiveLang= ProjectLang= diff --git a/Globals.cpp b/Globals.cpp index a4746193c..1a6be1a6b 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -49,9 +49,9 @@ AnsiString Global::asSky = "1"; int Global::iReCompile = 0; // zwiększany, gdy trzeba odświeżyć siatki HWND Global::hWnd = NULL; // uchwyt okna int Global::iCameraLast = -1; -AnsiString Global::asRelease = "15.3.1166.469"; +AnsiString Global::asRelease = "15.3.1167.470"; AnsiString Global::asVersion = - "Compilation 2015-03-25, release " + Global::asRelease + "."; // tutaj, bo wysyłany + "Compilation 2015-04-14, release " + Global::asRelease + "."; // tutaj, bo wysyłany int Global::iViewMode = 0; // co aktualnie widać: 0-kabina, 1-latanie, 2-sprzęgi, 3-dokumenty int Global::iTextMode = 0; // tryb pracy wyświetlacza tekstowego int Global::iScreenMode[12] = {0, 0, 0, 0, 0, 0, diff --git a/Ground.cpp b/Ground.cpp index e780a2543..85e62ffed 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -3191,13 +3191,27 @@ void TGround::InitTracks() if (Global::iHiddenEvents & 1) if (!Current->asName.IsEmpty()) { // jeśli podana jest nazwa torów, można szukać eventów skojarzonych przez nazwę - if (Track->asEvent1Name.IsEmpty()) + if (Track->asEvent0Name.IsEmpty()) + if (FindEvent(Current->asName + ":event0")) + Track->asEvent0Name = Current->asName + ":event0"; + if (Track->asEvent1Name.IsEmpty()) if (FindEvent(Current->asName + ":event1")) Track->asEvent1Name = Current->asName + ":event1"; if (Track->asEvent2Name.IsEmpty()) if (FindEvent(Current->asName + ":event2")) Track->asEvent2Name = Current->asName + ":event2"; - } + + if (Track->asEventall0Name.IsEmpty()) + if (FindEvent(Current->asName+":eventall0")) + Track->asEventall0Name=Current->asName+":eventall0"; + if (Track->asEventall1Name.IsEmpty()) + if (FindEvent(Current->asName+":eventall1")) + Track->asEventall1Name=Current->asName+":eventall1"; + if (Track->asEventall2Name.IsEmpty()) + if (FindEvent(Current->asName+":eventall2")) + Track->asEventall2Name=Current->asName+":eventall2"; + + } Track->AssignEvents( Track->asEvent0Name.IsEmpty() ? NULL : FindEvent(Track->asEvent0Name), Track->asEvent1Name.IsEmpty() ? NULL : FindEventScan(Track->asEvent1Name), diff --git a/McZapkie/_mover.pas b/McZapkie/_mover.pas index b61cc7fa3..c35523fe8 100644 --- a/McZapkie/_mover.pas +++ b/McZapkie/_mover.pas @@ -4451,7 +4451,7 @@ function T_MoverParameters.BrakeForce(Track:TTrackParam):real; // if (LocalBrake=ManualBrake)or(MBrake=true)) and (BrakePress<0.3) then // Fb:=UnitBrakeForce*NBpA {ham. reczny dziala na jedna os} // else //yB: to nie do konca ma sens, ponieważ ręczny w wagonie działa na jeden cylinder hamulcowy/wózek, dlatego potrzebne są oddzielnie liczone osie - Fb:=UnitBrakeForce*NBrakeAxles*NBpA; + Fb:=UnitBrakeForce*NBrakeAxles*Max0R(1,NBpA); // u:=((BrakePress*P2FTrans)-BrakeCylSpring*BrakeCylMult[BCMFlag]/BrakeCylNo-0.83*BrakeSlckAdj/(BrakeCylNo))*BrakeCylNo; { end; }