projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added wrapper function for loading and saving all setup files
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index d6c9b5733668fe966c88d957568c9c9516720ad0..4efaa553b090521489388493b5cf1a8b9e06bdd9 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-10908,7
+10908,7
@@
static void setSetupInfoFromTokenInfo(SetupFileHash *setup_file_hash,
token_info[token_nr].text);
}
token_info[token_nr].text);
}
-static void decodeSetupFileHash(SetupFileHash *setup_file_hash)
+static void decodeSetupFileHash
_Default
(SetupFileHash *setup_file_hash)
{
int i, pnr;
{
int i, pnr;
@@
-11064,7
+11064,7
@@
void LoadSetupFromFilename(char *filename)
if (setup_file_hash)
{
if (setup_file_hash)
{
- decodeSetupFileHash(setup_file_hash);
+ decodeSetupFileHash
_Default
(setup_file_hash);
freeSetupFileHash(setup_file_hash);
}
freeSetupFileHash(setup_file_hash);
}
@@
-11103,7
+11103,7
@@
static void LoadSetup_SpecialPostProcessing(void)
}
}
}
}
-void LoadSetup(void)
+void LoadSetup
_Default
(void)
{
char *filename;
{
char *filename;
@@
-11164,6
+11164,13
@@
void LoadSetup_EditorCascade(void)
free(filename);
}
free(filename);
}
+void LoadSetup(void)
+{
+ LoadSetup_Default();
+ LoadSetup_AutoSetup();
+ LoadSetup_EditorCascade();
+}
+
static void addGameControllerMappingToHash(SetupFileHash *mappings_hash,
char *mapping_line)
{
static void addGameControllerMappingToHash(SetupFileHash *mappings_hash,
char *mapping_line)
{
@@
-11213,7
+11220,7
@@
static void LoadSetup_ReadGameControllerMappings(SetupFileHash *mappings_hash,
fclose(file);
}
fclose(file);
}
-void SaveSetup(void)
+void SaveSetup
_Default
(void)
{
char *filename = getSetupFilename();
FILE *file;
{
char *filename = getSetupFilename();
FILE *file;
@@
-11374,6
+11381,13
@@
void SaveSetup_EditorCascade(void)
free(filename);
}
free(filename);
}
+void SaveSetup(void)
+{
+ SaveSetup_Default();
+ SaveSetup_AutoSetup();
+ SaveSetup_EditorCascade();
+}
+
static void SaveSetup_WriteGameControllerMappings(SetupFileHash *mappings_hash,
char *filename)
{
static void SaveSetup_WriteGameControllerMappings(SetupFileHash *mappings_hash,
char *filename)
{