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

Merge branch 'milek-dev' into gfx-work

Browse Source
This commit is contained in:
milek7
2018-09-20 22:07:56 +02:00
parent 7c6501bb07 d9020b5881
commit f5d7b1bfa9
39 changed files with 2994 additions and 2168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
DynObj.h
View File

@@ -461,7 +461,7 @@ private:
public:
void ABuScanObjects(int ScanDir, double ScanDist);
protected:
private:
TDynamicObject *ABuFindObject( int &Foundcoupler, double &Distance, TTrack const *Track, int const Direction, int const Mycoupler );
void ABuCheckMyTrack();
@@ -583,7 +583,8 @@ private:
Axle0.GetTrack()); };
// McZapkie-260202
void LoadMMediaFile(std::string BaseDir, std::string TypeName, std::string ReplacableSkin);
void LoadMMediaFile(std::string const &TypeName, std::string const &ReplacableSkin);
TModel3d *LoadMMediaFile_mdload( std::string const &Name ) const;
inline double ABuGetDirection() const { // ABu.
return (Axle1.GetTrack() == MyTrack ? Axle1.GetDirection() : Axle0.GetDirection()); };