summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2019-10-17 01:22:39 +0200
committerSergeanur <s.anureev@yandex.ua>2019-10-17 01:39:01 +0200
commit89879341235437f057e731e1bcdab05d4e341e9b (patch)
tree5ed6ea84a3ee8b4a971b0786401f664346074a55 /src/core
parentMerge pull request #244 from Nick007J/master (diff)
downloadre3-89879341235437f057e731e1bcdab05d4e341e9b.tar
re3-89879341235437f057e731e1bcdab05d4e341e9b.tar.gz
re3-89879341235437f057e731e1bcdab05d4e341e9b.tar.bz2
re3-89879341235437f057e731e1bcdab05d4e341e9b.tar.lz
re3-89879341235437f057e731e1bcdab05d4e341e9b.tar.xz
re3-89879341235437f057e731e1bcdab05d4e341e9b.tar.zst
re3-89879341235437f057e731e1bcdab05d4e341e9b.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/FileLoader.h2
-rw-r--r--src/core/config.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/core/FileLoader.h b/src/core/FileLoader.h
index f9121ace..ea7f47d9 100644
--- a/src/core/FileLoader.h
+++ b/src/core/FileLoader.h
@@ -9,7 +9,7 @@ public:
static char *LoadLine(int fd);
static RwTexDictionary *LoadTexDictionary(const char *filename);
static void LoadCollisionFile(const char *filename);
- static void LoadCollisionModel(uint8 *buf, CColModel &model, char *name);
+ static void LoadCollisionModel(uint8 *buf, struct CColModel &model, char *name);
static void LoadModelFile(const char *filename);
static RpAtomic *FindRelatedModelInfoCB(RpAtomic *atomic, void *data);
static void LoadClumpFile(const char *filename);
diff --git a/src/core/config.h b/src/core/config.h
index 08ddd007..12cb7be8 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -67,6 +67,7 @@ enum Config {
NUMANTENNAS = 8,
NUMCORONAS = 56,
NUMPOINTLIGHTS = 32,
+ NUM3DMARKERS = 32,
NUMMONEYMESSAGES = 16,
NUMPICKUPMESSAGES = 16,