duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make DoConfig check Config.dat's magic number

Browse source 
Fixes #88

The issue was caused by Config.dat reading a CSE2E Config.dat, and
preserving its altered magic number, which Cave Story would reject,
causing it to fallback on default settings.
This commit is contained in:
Clownacy 2020-01-06 16:38:47 +00:00
parent df534bb612
commit 5d12071f17
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
DoConfig/DoConfig.cpp
View file

@ -19,9 +19,6 @@
#include <cstring> #include <cstring>
#include <fstream> #include <fstream>
#define MAGIC "DOUKUTSU20041206"
#define FONT "Courier New"
struct data struct data
{ {
char magic[32]; char magic[32];
@ -46,9 +43,12 @@ private:
Fl_Radio_Round_Button *buttons[6]; Fl_Radio_Round_Button *buttons[6];
}; };
static const char MAGIC[32] = "DOUKUTSU20041206";
static const char FONT[64] = "Courier New";
static char config_path[FILENAME_MAX]; static char config_path[FILENAME_MAX];
static data config = {MAGIC, FONT}; static data config;
static unsigned long CharsToLong(unsigned char *chars) static unsigned long CharsToLong(unsigned char *chars)
{ {
@ -123,6 +123,15 @@ void read_Config()
fd.open(config_path, std::ios::in | std::ios::binary); fd.open(config_path, std::ios::in | std::ios::binary);
fd.read((char *)&config, sizeof(config)); fd.read((char *)&config, sizeof(config));
fd.close(); fd.close();
// If Config.dat's magic value doesn't match, create a blank default Config.dat instead
if (memcmp(config.magic, MAGIC, sizeof(config.magic)))
{
memset(&config, 0, sizeof(config));
strcpy(config.magic, MAGIC);
strcpy(config.font, FONT);
}
CharsToLong(config.move) ? movegt->setonly() : movear->setonly(); CharsToLong(config.move) ? movegt->setonly() : movear->setonly();
CharsToLong(config.attack) ? buttonzx->setonly() : buttonxz->setonly(); CharsToLong(config.attack) ? buttonzx->setonly() : buttonxz->setonly();
CharsToLong(config.okay) ? okayattack->setonly() : okayjump->setonly(); CharsToLong(config.okay) ? okayattack->setonly() : okayjump->setonly();