diff options
| author | aap <aap@papnet.eu> | 2020-05-05 18:06:38 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-05 18:06:38 +0200 |
| commit | e81652c2fc2787fc8aab3937be62127e7a3354ee (patch) | |
| tree | c36897c90f4f37796ec955c49e70e99944de7dda /src/core/FileLoader.h | |
| parent | Merge pull request #514 from Nick007J/miami (diff) | |
| download | re3-e81652c2fc2787fc8aab3937be62127e7a3354ee.tar re3-e81652c2fc2787fc8aab3937be62127e7a3354ee.tar.gz re3-e81652c2fc2787fc8aab3937be62127e7a3354ee.tar.bz2 re3-e81652c2fc2787fc8aab3937be62127e7a3354ee.tar.lz re3-e81652c2fc2787fc8aab3937be62127e7a3354ee.tar.xz re3-e81652c2fc2787fc8aab3937be62127e7a3354ee.tar.zst re3-e81652c2fc2787fc8aab3937be62127e7a3354ee.zip | |
Diffstat (limited to 'src/core/FileLoader.h')
| -rw-r--r-- | src/core/FileLoader.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/core/FileLoader.h b/src/core/FileLoader.h index aa8dcdb8..6abac9d8 100644 --- a/src/core/FileLoader.h +++ b/src/core/FileLoader.h @@ -5,16 +5,11 @@ class CFileLoader static char ms_line[256]; public: static void LoadLevel(const char *filename); - static void LoadCollisionFromDatFile(int currlevel); static char *LoadLine(int fd); static RwTexDictionary *LoadTexDictionary(const char *filename); -#ifndef MIAMI - static void LoadCollisionFile(const char *filename); -#else - static void LoadCollisionFile(const char *filename, uint8 colSlot = 0); + static void LoadCollisionFile(const char *filename, uint8 colSlot); static bool LoadCollisionFileFirstTime(uint8 *buffer, uint32 size, uint8 colSlot); static bool LoadCollisionFile(uint8 *buffer, uint32 size, uint8 colSlot); -#endif static void LoadCollisionModel(uint8 *buf, struct CColModel &model, char *name); static void LoadModelFile(const char *filename); static RpAtomic *FindRelatedModelInfoCB(RpAtomic *atomic, void *data); @@ -29,8 +24,6 @@ public: static void LoadObjectTypes(const char *filename); static void LoadObject(const char *line); - static int LoadMLO(const char *line); - static void LoadMLOInstance(int id, const char *line); static void LoadTimeObject(const char *line); static void LoadClumpObject(const char *line); static void LoadVehicleObject(const char *line); |