mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-09-01 04:01:56 +02:00
Code Issues Projects Releases Wiki Activity

Fix command line save opening (save was being cleared immediately after loading)

Browse Source
This commit is contained in:
jacksonmj
2012-06-01 19:28:06 +01:00
parent a36d79c701
commit 8dcccbc4fc
1 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/main.c
View File

@@ -823,30 +823,6 @@ int main(int argc, char *argv[])
chdir(argv[i+1]);
i++;
}
else if (!strncmp(argv[i], "open", 5) && i+1<argc)
{
int size;
void *file_data;
file_data = file_load(argv[i+1], &size);
if (file_data)
{
svf_last = file_data;
svf_lsize = size;
if(!parse_save(file_data, size, 1, 0, 0, bmap, fvx, fvy, vx, vy, pv, signs, parts, pmap))
{
it=0;
svf_filename[0] = 0;
svf_fileopen = 1;
} else {
saveOpenError = 1;
svf_last = NULL;
svf_lsize = 0;
free(file_data);
file_data = NULL;
}
}
i++;
}
else if (!strncmp(argv[i], "ptsave", 7) && i+1<argc)
{
//Prevent reading of any arguments after ptsave for security
@@ -899,6 +875,26 @@ int main(int argc, char *argv[])
}
else if (!strncmp(argv[i], "open", 5) && i+1<argc)
{
int size;
void *file_data;
file_data = file_load(argv[i+1], &size);
if (file_data)
{
svf_last = file_data;
svf_lsize = size;
if(!parse_save(file_data, size, 1, 0, 0, bmap, fvx, fvy, vx, vy, pv, signs, parts, pmap))
{
it=0;
svf_filename[0] = 0;
svf_fileopen = 1;
} else {
saveOpenError = 1;
svf_last = NULL;
svf_lsize = 0;
free(file_data);
file_data = NULL;
}
}
i++;
}
else if (!strncmp(argv[i], "ddir", 5) && i+1<argc)