From b2805409566af00bc15639494f5a186fbd2f16e6 Mon Sep 17 00:00:00 2001 From: "FWoltermann@gmail.com" Date: Fri, 9 Dec 2011 20:15:42 +0000 Subject: More indenting changes --- nGenEx/DataLoader.h | 94 ++++++++++++++++++++++++++--------------------------- 1 file changed, 47 insertions(+), 47 deletions(-) (limited to 'nGenEx/DataLoader.h') diff --git a/nGenEx/DataLoader.h b/nGenEx/DataLoader.h index 87dbdbb..d886a2e 100644 --- a/nGenEx/DataLoader.h +++ b/nGenEx/DataLoader.h @@ -1,10 +1,10 @@ /* Project nGenEx - Destroyer Studios LLC - Copyright © 1997-2004. All Rights Reserved. + Destroyer Studios LLC + Copyright © 1997-2004. All Rights Reserved. - SUBSYSTEM: nGenEx.lib - FILE: DataLoader.h - AUTHOR: John DiCamillo + SUBSYSTEM: nGenEx.lib + FILE: DataLoader.h + AUTHOR: John DiCamillo */ @@ -26,58 +26,58 @@ class Video; class DataLoader { public: - static const char* TYPENAME() { return "DataLoader"; } + static const char* TYPENAME() { return "DataLoader"; } - enum { DATAFILE_OK, DATAFILE_INVALID, DATAFILE_NOTEXIST }; + enum { DATAFILE_OK, DATAFILE_INVALID, DATAFILE_NOTEXIST }; - DataLoader(); - - static DataLoader* GetLoader() { return loader; } - static void Initialize(); - static void Close(); + DataLoader(); - void Reset(); - void UseFileSystem(bool use=true); - void UseVideo(Video* v); - void EnableMedia(bool enable=true); + static DataLoader* GetLoader() { return loader; } + static void Initialize(); + static void Close(); - int EnableDatafile(const char* name); - int DisableDatafile(const char* name); + void Reset(); + void UseFileSystem(bool use=true); + void UseVideo(Video* v); + void EnableMedia(bool enable=true); - void SetDataPath(const char* path); - const char* GetDataPath() const { return datapath; } + int EnableDatafile(const char* name); + int DisableDatafile(const char* name); - bool IsFileSystemEnabled() const { return use_file_system; } - bool IsMediaLoadEnabled() const { return enable_media; } + void SetDataPath(const char* path); + const char* GetDataPath() const { return datapath; } - bool FindFile(const char* fname); - int ListFiles(const char* filter, List& list, bool recurse=false); - int ListArchiveFiles(const char* archive, const char* filter, List& list); - int LoadBuffer(const char* name, BYTE*& buf, bool null_terminate=false, bool optional=false); - int LoadBitmap(const char* name, Bitmap& bmp, int type=0, bool optional=false); - int CacheBitmap(const char* name, Bitmap*& bmp, int type=0, bool optional=false); - int LoadTexture(const char* name, Bitmap*& bmp, int type=0, bool preload_cache=false, bool optional=false); - int LoadSound(const char* fname, Sound*& snd, DWORD flags=0, bool optional=false); - int LoadStream(const char* fname, Sound*& snd, bool optional=false); + bool IsFileSystemEnabled() const { return use_file_system; } + bool IsMediaLoadEnabled() const { return enable_media; } - void ReleaseBuffer(BYTE*& buf); - int fread(void* buffer, size_t size, size_t count, BYTE*& stream); + bool FindFile(const char* fname); + int ListFiles(const char* filter, List& list, bool recurse=false); + int ListArchiveFiles(const char* archive, const char* filter, List& list); + int LoadBuffer(const char* name, BYTE*& buf, bool null_terminate=false, bool optional=false); + int LoadBitmap(const char* name, Bitmap& bmp, int type=0, bool optional=false); + int CacheBitmap(const char* name, Bitmap*& bmp, int type=0, bool optional=false); + int LoadTexture(const char* name, Bitmap*& bmp, int type=0, bool preload_cache=false, bool optional=false); + int LoadSound(const char* fname, Sound*& snd, DWORD flags=0, bool optional=false); + int LoadStream(const char* fname, Sound*& snd, bool optional=false); + + void ReleaseBuffer(BYTE*& buf); + int fread(void* buffer, size_t size, size_t count, BYTE*& stream); private: - int LoadIndexed(const char* name, Bitmap& bmp, int type); - int LoadHiColor(const char* name, Bitmap& bmp, int type); - int LoadAlpha( const char* name, Bitmap& bmp, int type); - - void ListFileSystem(const char* filter, List& list, Text base_path, bool recurse); - int LoadPartialFile(const char* fname, BYTE*& buf, int max_load, bool optional=false); - int LoadOggStream(const char* fname, Sound*& snd); - - Text datapath; - Video* video; - bool use_file_system; - bool enable_media; - - static DataLoader* loader; + int LoadIndexed(const char* name, Bitmap& bmp, int type); + int LoadHiColor(const char* name, Bitmap& bmp, int type); + int LoadAlpha( const char* name, Bitmap& bmp, int type); + + void ListFileSystem(const char* filter, List& list, Text base_path, bool recurse); + int LoadPartialFile(const char* fname, BYTE*& buf, int max_load, bool optional=false); + int LoadOggStream(const char* fname, Sound*& snd); + + Text datapath; + Video* video; + bool use_file_system; + bool enable_media; + + static DataLoader* loader; }; // +--------------------------------------------------------------------+ -- cgit v1.1