summaryrefslogtreecommitdiffstats
path: root/src/core/SurfaceTable.h
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-05-23 00:43:17 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-05-23 00:43:17 +0200
commitb9115b4429565f45c2391c02dd860f47166df6f8 (patch)
tree45963cc3390b1305b996e1eea2a1e953a217a82c /src/core/SurfaceTable.h
parentsome fixes (diff)
parentMerge pull request #578 from aap/miami (diff)
downloadre3-b9115b4429565f45c2391c02dd860f47166df6f8.tar
re3-b9115b4429565f45c2391c02dd860f47166df6f8.tar.gz
re3-b9115b4429565f45c2391c02dd860f47166df6f8.tar.bz2
re3-b9115b4429565f45c2391c02dd860f47166df6f8.tar.lz
re3-b9115b4429565f45c2391c02dd860f47166df6f8.tar.xz
re3-b9115b4429565f45c2391c02dd860f47166df6f8.tar.zst
re3-b9115b4429565f45c2391c02dd860f47166df6f8.zip
Diffstat (limited to 'src/core/SurfaceTable.h')
-rw-r--r--src/core/SurfaceTable.h46
1 files changed, 2 insertions, 44 deletions
diff --git a/src/core/SurfaceTable.h b/src/core/SurfaceTable.h
index 12246dce..5d8d2c4f 100644
--- a/src/core/SurfaceTable.h
+++ b/src/core/SurfaceTable.h
@@ -1,47 +1,6 @@
#pragma once
-
-enum
-{
- SURFACE_0,
- SURFACE_1,
- SURFACE_2,
- SURFACE_3,
- SURFACE_4,
- SURFACE_5,
- SURFACE_6,
- SURFACE_7,
- SURFACE_8,
- SURFACE_9,
- SURFACE_10,
- SURFACE_11,
- SURFACE_12,
- SURFACE_13,
- SURFACE_14,
- SURFACE_15,
- SURFACE_16,
- SURFACE_17,
- SURFACE_18,
- SURFACE_19,
- SURFACE_20,
- SURFACE_21,
- SURFACE_22,
- SURFACE_23,
- SURFACE_24,
- SURFACE_25,
- SURFACE_26,
- SURFACE_27,
- SURFACE_28,
- SURFACE_29,
- SURFACE_30,
- SURFACE_31,
- SURFACE_32,
-
- NUMSURFACETYPES
-};
-
-// From nick
-// TODO: check and use this
+// TODO: check this
enum eSurfaceType
{
SURFACE_DEFAULT,
@@ -77,8 +36,6 @@ enum eSurfaceType
SURFACE_LOOSE30,
SURFACE_BOLLARD,
SURFACE_GATE,
-
- // These are illegal
SURFACE_SAND33,
SURFACE_ROAD34,
};
@@ -89,6 +46,7 @@ enum
ADHESIVE_HARD,
ADHESIVE_ROAD,
ADHESIVE_LOOSE,
+ ADHESIVE_SAND,
ADHESIVE_WET,
NUMADHESIVEGROUPS