This commit is contained in:
Paul 2001-01-03 15:57:20 +00:00
parent 2e872af6c2
commit fb00ee0996
8 changed files with 132 additions and 41 deletions

View file

@ -19,6 +19,7 @@ sfx/ingame.vb
sfx/ingame.vh sfx/ingame.vh
backdrop/credits.gfx backdrop/credits.gfx
backdrop/sky.gfx backdrop/sky.gfx
memcard/memhead.bin
levels/chapter01/level01/level01.lvl levels/chapter01/level01/level01.lvl
levels/chapter01/level01/level01.tex levels/chapter01/level01/level01.tex

View file

@ -93,6 +93,10 @@ locale_src := textdbase
mem_src := memory mem_src := memory
memcard_src := md5 \
memcard \
saveload
pad_src := pads pad_src := pads
paul_src := paul paul_src := paul

View file

@ -252,6 +252,27 @@ GRAF_DIRS_TO_MAKE += $(SFX_OUT_DIR)
GFX_DATA_OUT += $(SFX_ALL_OUT) 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 # Music
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------

View file

@ -88,6 +88,7 @@ static void dumpDatabase(void);
---- */ ---- */
static TransHeader * s_database; static TransHeader * s_database;
static bool s_loaded; static bool s_loaded;
static int s_langType;
static TransHeader * s_idDatabase; static TransHeader * s_idDatabase;
static bool s_idShow; static bool s_idShow;
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------
@ -171,7 +172,7 @@ void TranslationDatabase::loadLanguage(unsigned int langType)
dumpDatabase(); dumpDatabase();
loadDatabase(FileEquate(s_languageFileEquates[langType])); loadDatabase(FileEquate(s_languageFileEquates[langType]));
s_langType=langType;
s_loaded=true; 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: Function:
Purpose: Purpose:
@ -229,5 +258,6 @@ static void dumpDatabase(void)
s_loaded=false; s_loaded=false;
} }
/*=========================================================================== /*===========================================================================
end */ end */

View file

@ -58,6 +58,8 @@ public:
static void loadLanguage(unsigned int langType); static void loadLanguage(unsigned int langType);
static char const * getString(unsigned int strNum); static char const * getString(unsigned int strNum);
static void setShowIds(bool idShowVal); static void setShowIds(bool idShowVal);
static int isLoaded();
static int getLanguage();
}; };
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------

View file

@ -68,7 +68,8 @@ Available options are:
#define DBG_LOG_LINES 8 #define DBG_LOG_LINES 8
#define DBG_SHOW_MESSAGE_ORIGIN #define DBG_SHOW_MESSAGE_ORIGIN
#define DBG_FILENAME_LENGTH 12 #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 #else
#define DBG_OUTPUT_TO_DEBUGGER #define DBG_OUTPUT_TO_DEBUGGER
#define DBG_FILENAME_LENGTH 16 #define DBG_FILENAME_LENGTH 16

View file

@ -79,10 +79,10 @@ void InitSystem() // reordered to reduce black screen (hope all is well
// SetDispMask(0); // SetDispMask(0);
MemInit(); MemInit();
// MemCardInit( 1 ); MemCardInit( 1 );
// MemCardStart(); MemCardStart();
PadsInit(); PadsInit();
// MemCardStop(); MemCardStop();
CFileIO::Init(); CFileIO::Init();
TranslationDatabase::initialise(false); TranslationDatabase::initialise(false);

View file

@ -320,6 +320,42 @@ SOURCE=..\..\..\source\gui\gui.cpp
SOURCE=..\..\..\source\gui\gui.h SOURCE=..\..\..\source\gui\gui.h
# End Source File # End Source File
# End Group # 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" # Begin Group "locale"
# PROP Default_Filter "" # PROP Default_Filter ""
@ -344,6 +380,38 @@ SOURCE=..\..\..\source\mem\memory.cpp
SOURCE=..\..\..\source\mem\memory.h SOURCE=..\..\..\source\mem\memory.h
# End Source File # End Source File
# End Group # 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" # Begin Group "pad"
# PROP Default_Filter "" # PROP Default_Filter ""
@ -592,42 +660,6 @@ SOURCE=..\..\..\source\utils\utils.cpp
SOURCE=..\..\..\source\utils\utils.h SOURCE=..\..\..\source\utils\utils.h
# End Source File # End Source File
# End Group # 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 # End Group
# Begin Group "makefiles" # Begin Group "makefiles"