From e81652c2fc2787fc8aab3937be62127e7a3354ee Mon Sep 17 00:00:00 2001 From: aap Date: Tue, 5 May 2020 18:06:38 +0200 Subject: cleaned up MIAMI ifdefs --- src/core/FileLoader.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/core/FileLoader.h') 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); -- cgit v1.2.3