From fb00ee0996b016006759da8103594983c9e8907d Mon Sep 17 00:00:00 2001 From: Paul Date: Wed, 3 Jan 2001 15:57:20 +0000 Subject: [PATCH] --- data/DataCache.scr | 1 + makefile.gaz | 4 + makefile.gfx | 21 ++++ source/locale/textdbase.cpp | 32 +++++- source/locale/textdbase.h | 2 + source/system/dbg.cpp | 3 +- source/system/main.cpp | 6 +- .../spongebob project/spongebob project.dsp | 104 ++++++++++++------ 8 files changed, 132 insertions(+), 41 deletions(-) diff --git a/data/DataCache.scr b/data/DataCache.scr index 715fc7961..c103ec15e 100644 --- a/data/DataCache.scr +++ b/data/DataCache.scr @@ -19,6 +19,7 @@ sfx/ingame.vb sfx/ingame.vh backdrop/credits.gfx backdrop/sky.gfx +memcard/memhead.bin levels/chapter01/level01/level01.lvl levels/chapter01/level01/level01.tex diff --git a/makefile.gaz b/makefile.gaz index 90b233228..0a9f37e78 100644 --- a/makefile.gaz +++ b/makefile.gaz @@ -93,6 +93,10 @@ locale_src := textdbase mem_src := memory +memcard_src := md5 \ + memcard \ + saveload + pad_src := pads paul_src := paul diff --git a/makefile.gfx b/makefile.gfx index 53e58fb7d..20cc146ef 100644 --- a/makefile.gfx +++ b/makefile.gfx @@ -252,6 +252,27 @@ GRAF_DIRS_TO_MAKE += $(SFX_OUT_DIR) GFX_DATA_OUT += $(SFX_ALL_OUT) +#---------------------------------------------------------------------------- +# Memcard file header +#---------------------------------------------------------------------------- +MC_HEADER_IN_DIR := $(GAME_DATA_DIR)/memcard +MC_HEADER_IN := $(MC_HEADER_IN_DIR)/memhead.bin + +MC_HEADER_OUT_DIR :=$(DATA_OUT)/memcard +MC_HEADER_OUT := $(MC_HEADER_OUT_DIR)/memhead.bin + +mcheader: $(MC_HEADER_OUT) + +cleanmcheader: + @$(RM) -f $(MC_HEADER_OUT) + +$(MC_HEADER_OUT) : $(MC_HEADER_IN) + $(CP) $(MC_HEADER_IN) $(MC_HEADER_OUT) + +GRAF_DIRS_TO_MAKE += $(MC_HEADER_OUT_DIR) +GFX_DATA_OUT += $(MC_HEADER_OUT) + + #---------------------------------------------------------------------------- # Music #---------------------------------------------------------------------------- diff --git a/source/locale/textdbase.cpp b/source/locale/textdbase.cpp index 82ba59f76..b45b4ef28 100644 --- a/source/locale/textdbase.cpp +++ b/source/locale/textdbase.cpp @@ -88,6 +88,7 @@ static void dumpDatabase(void); ---- */ static TransHeader * s_database; static bool s_loaded; +static int s_langType; static TransHeader * s_idDatabase; static bool s_idShow; /*---------------------------------------------------------------------- @@ -171,7 +172,7 @@ void TranslationDatabase::loadLanguage(unsigned int langType) dumpDatabase(); loadDatabase(FileEquate(s_languageFileEquates[langType])); - + s_langType=langType; s_loaded=true; } @@ -197,6 +198,34 @@ char const * TranslationDatabase::getString(unsigned int strNum) } } + +/*---------------------------------------------------------------------- + Function: + Purpose: + Params: + Returns: + ---------------------------------------------------------------------- */ +int TranslationDatabase::isLoaded(void) +{ + return s_loaded; +} + + +/*---------------------------------------------------------------------- + Function: + Purpose: + Params: + Returns: + ---------------------------------------------------------------------- */ +int TranslationDatabase::getLanguage(void) +{ + ASSERT(s_loaded); + + return s_langType; +} + + + /*---------------------------------------------------------------------- Function: Purpose: @@ -229,5 +258,6 @@ static void dumpDatabase(void) s_loaded=false; } + /*=========================================================================== end */ diff --git a/source/locale/textdbase.h b/source/locale/textdbase.h index fa7fa60e8..2006b6e56 100644 --- a/source/locale/textdbase.h +++ b/source/locale/textdbase.h @@ -58,6 +58,8 @@ public: static void loadLanguage(unsigned int langType); static char const * getString(unsigned int strNum); static void setShowIds(bool idShowVal); + static int isLoaded(); + static int getLanguage(); }; /*---------------------------------------------------------------------- diff --git a/source/system/dbg.cpp b/source/system/dbg.cpp index c2e78536c..d8aac9d78 100644 --- a/source/system/dbg.cpp +++ b/source/system/dbg.cpp @@ -68,7 +68,8 @@ Available options are: #define DBG_LOG_LINES 8 #define DBG_SHOW_MESSAGE_ORIGIN #define DBG_FILENAME_LENGTH 12 - #define DBG_DEFAULT_CHANNEL DC_PAUL|DC_SYSTEM|DC_SOUND|DC_GUI|DC_MEMCARD + #define DBG_DEFAULT_CHANNEL DC_PAUL|DC_MEMCARD +// #define DBG_DEFAULT_CHANNEL DC_PAUL|DC_SYSTEM|DC_SOUND|DC_GUI|DC_MEMCARD #else #define DBG_OUTPUT_TO_DEBUGGER #define DBG_FILENAME_LENGTH 16 diff --git a/source/system/main.cpp b/source/system/main.cpp index ff528133c..39ed1f9f3 100644 --- a/source/system/main.cpp +++ b/source/system/main.cpp @@ -79,10 +79,10 @@ void InitSystem() // reordered to reduce black screen (hope all is well // SetDispMask(0); MemInit(); -// MemCardInit( 1 ); -// MemCardStart(); + MemCardInit( 1 ); + MemCardStart(); PadsInit(); -// MemCardStop(); + MemCardStop(); CFileIO::Init(); TranslationDatabase::initialise(false); diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp index 3b8c4a5a9..951277fb9 100644 --- a/users/paul/spongebob project/spongebob project.dsp +++ b/users/paul/spongebob project/spongebob project.dsp @@ -320,6 +320,42 @@ SOURCE=..\..\..\source\gui\gui.cpp SOURCE=..\..\..\source\gui\gui.h # End Source File # End Group +# Begin Group "level" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\..\source\level\layertile.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\level\layertile.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\level\layertile3d.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\level\layertile3d.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\level\layertilesolid.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\level\layertilesolid.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\level\level.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\level\level.h +# End Source File +# End Group # Begin Group "locale" # PROP Default_Filter "" @@ -344,6 +380,38 @@ SOURCE=..\..\..\source\mem\memory.cpp SOURCE=..\..\..\source\mem\memory.h # End Source File # End Group +# Begin Group "memcard" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\..\source\memcard\md5.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\memcard\md5.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\memcard\md5global.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\memcard\memcard.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\memcard\memcard.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\memcard\saveload.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\source\memcard\saveload.h +# End Source File +# End Group # Begin Group "pad" # PROP Default_Filter "" @@ -592,42 +660,6 @@ SOURCE=..\..\..\source\utils\utils.cpp SOURCE=..\..\..\source\utils\utils.h # End Source File # End Group -# Begin Group "level" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\..\source\level\layertile.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\level\layertile.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\level\layertile3d.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\level\layertile3d.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\level\layertilesolid.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\level\layertilesolid.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\level\level.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\source\level\level.h -# End Source File -# End Group # End Group # Begin Group "makefiles"