diff options
author | Sergeanur <s.anureev@yandex.ua> | 2020-04-26 22:03:15 +0300 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2020-04-26 22:03:15 +0300 |
commit | f0890b11122291a22d6a65f349281cf1aed49bd0 (patch) | |
tree | 3b418b522c5fd097abac916693e59808ea4f5b4f /src/core/SurfaceTable.h | |
parent | 3e460d94acd6e08301b0be2d4de58fe8f65aff57 (diff) | |
parent | 4dc2f307910c6d5dcf3c910b3da2e2d943ac1003 (diff) |
Merge branch 'master' into MoreLanguages
# Conflicts:
# src/core/Frontend.cpp
# src/core/MenuScreens.h
# src/render/Font.cpp
# src/render/Font.h
# src/text/Messages.cpp
# src/text/Text.cpp
Diffstat (limited to 'src/core/SurfaceTable.h')
-rw-r--r-- | src/core/SurfaceTable.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/SurfaceTable.h b/src/core/SurfaceTable.h index 27f4ecca..4af6a265 100644 --- a/src/core/SurfaceTable.h +++ b/src/core/SurfaceTable.h @@ -98,8 +98,7 @@ struct CColPoint; class CSurfaceTable { -// static float ms_aAdhesiveLimitTable[NUMADHESIVEGROUPS][NUMADHESIVEGROUPS]; - static float (*ms_aAdhesiveLimitTable)[NUMADHESIVEGROUPS]; + static float ms_aAdhesiveLimitTable[NUMADHESIVEGROUPS][NUMADHESIVEGROUPS]; public: static void Initialise(char *filename); static int GetAdhesionGroup(uint8 surfaceType); |