diff options
| author | aap <aap@papnet.eu> | 2020-08-19 21:58:00 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-08-19 21:58:00 +0200 |
| commit | bb948904b69d6a4c49c0a0fadd69e867292b1d9e (patch) | |
| tree | 66e383231e7524830f39a475b40c662657e186e1 /src/core | |
| parent | update librw (diff) | |
| download | re3-bb948904b69d6a4c49c0a0fadd69e867292b1d9e.tar re3-bb948904b69d6a4c49c0a0fadd69e867292b1d9e.tar.gz re3-bb948904b69d6a4c49c0a0fadd69e867292b1d9e.tar.bz2 re3-bb948904b69d6a4c49c0a0fadd69e867292b1d9e.tar.lz re3-bb948904b69d6a4c49c0a0fadd69e867292b1d9e.tar.xz re3-bb948904b69d6a4c49c0a0fadd69e867292b1d9e.tar.zst re3-bb948904b69d6a4c49c0a0fadd69e867292b1d9e.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ColStore.cpp | 1 | ||||
| -rw-r--r-- | src/core/SurfaceTable.cpp | 8 | ||||
| -rw-r--r-- | src/core/SurfaceTable.h | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/src/core/ColStore.cpp b/src/core/ColStore.cpp index 070967e5..bca1e9b7 100644 --- a/src/core/ColStore.cpp +++ b/src/core/ColStore.cpp @@ -223,7 +223,6 @@ CColStore::EnsureCollisionIsInMemory(const CVector2D &pos) } } -//--MIAMI: done bool CColStore::HasCollisionLoaded(const CVector2D &pos) { diff --git a/src/core/SurfaceTable.cpp b/src/core/SurfaceTable.cpp index 9076a9a6..56cea203 100644 --- a/src/core/SurfaceTable.cpp +++ b/src/core/SurfaceTable.cpp @@ -6,6 +6,8 @@ #include "Collision.h" #include "SurfaceTable.h" +//--MIAMI: file done + float CSurfaceTable::ms_aAdhesiveLimitTable[NUMADHESIVEGROUPS][NUMADHESIVEGROUPS]; void @@ -148,3 +150,9 @@ CSurfaceTable::GetAdhesiveLimit(CColPoint &colpoint) { return ms_aAdhesiveLimitTable[GetAdhesionGroup(colpoint.surfaceB)][GetAdhesionGroup(colpoint.surfaceA)]; } + +bool +CSurfaceTable::IsSoftLanding(uint8 surf) +{ + return surf == SURFACE_GRASS || surf == SURFACE_SAND || surf == SURFACE_SAND_BEACH; +} diff --git a/src/core/SurfaceTable.h b/src/core/SurfaceTable.h index 359ebd5c..cd08c843 100644 --- a/src/core/SurfaceTable.h +++ b/src/core/SurfaceTable.h @@ -96,4 +96,5 @@ public: static int GetAdhesionGroup(uint8 surfaceType); static float GetWetMultiplier(uint8 surfaceType); static float GetAdhesiveLimit(CColPoint &colpoint); + static bool IsSoftLanding(uint8 surf); }; |