|
Jerry James |
9a8375a |
--- ./src/Game.c.orig 2005-03-05 09:20:04.000000000 -0700
|
|
Jerry James |
9a8375a |
+++ ./src/Game.c 2013-11-20 12:30:00.000000000 -0700
|
|
Jerry James |
9a8375a |
@@ -6,21 +6,14 @@ Game game;
|
|
Jerry James |
9a8375a |
|
|
Jerry James |
9a8375a |
// path_sprintf should not be used by other .c files, as it does not fit for them.
|
|
Jerry James |
9a8375a |
static void
|
|
Jerry James |
9a8375a |
-path_sprintf(char *path, char *formatted_name, int version)
|
|
Jerry James |
9a8375a |
+path_sprintf(char *path, const char *name, int version)
|
|
Jerry James |
9a8375a |
{
|
|
Jerry James |
9a8375a |
-
|
|
Jerry James |
9a8375a |
- int len;
|
|
Jerry James |
9a8375a |
-
|
|
Jerry James |
9a8375a |
- printf("path_sprintf (%p, %s, %d)\n", path, formatted_name, version);
|
|
Jerry James |
9a8375a |
-
|
|
Jerry James |
9a8375a |
- strcpy(path, getSaveGameDir());
|
|
Jerry James |
9a8375a |
-
|
|
Jerry James |
9a8375a |
- len = strlen(path);
|
|
Jerry James |
9a8375a |
-
|
|
Jerry James |
9a8375a |
if(1 == version) {
|
|
Jerry James |
9a8375a |
- sprintf(path + len, formatted_name);
|
|
Jerry James |
9a8375a |
+ printf("path_sprintf (%p, %s.dat, %d)\n", path, name, version);
|
|
Jerry James |
9a8375a |
+ sprintf(path, "%s%s.dat", getSaveGameDir(), name);
|
|
Jerry James |
9a8375a |
} else {
|
|
Jerry James |
9a8375a |
- sprintf(path + len, formatted_name, version);
|
|
Jerry James |
9a8375a |
+ printf("path_sprintf (%p, %s%d.dat, %d)\n", path, name, version, version);
|
|
Jerry James |
9a8375a |
+ sprintf(path, "%s%s%d.dat", getSaveGameDir(), name, version);
|
|
Jerry James |
9a8375a |
}
|
|
Jerry James |
9a8375a |
|
|
Jerry James |
9a8375a |
}
|
|
Jerry James |
9a8375a |
@@ -30,14 +23,14 @@ deleteSavedGame()
|
|
Jerry James |
9a8375a |
{
|
|
Jerry James |
9a8375a |
char path[PATH_SIZE];
|
|
Jerry James |
9a8375a |
// version 2
|
|
Jerry James |
9a8375a |
- path_sprintf(path, "save%d.dat", GAME_VERSION);
|
|
Jerry James |
9a8375a |
+ path_sprintf(path, "save", GAME_VERSION);
|
|
Jerry James |
9a8375a |
remove(path);
|
|
Jerry James |
9a8375a |
- path_sprintf(path, "savedmap%d.dat", GAME_VERSION);
|
|
Jerry James |
9a8375a |
+ path_sprintf(path, "savedmap", GAME_VERSION);
|
|
Jerry James |
9a8375a |
remove(path);
|
|
Jerry James |
9a8375a |
// version 1
|
|
Jerry James |
9a8375a |
- path_sprintf(path, "save.dat", 1);
|
|
Jerry James |
9a8375a |
+ path_sprintf(path, "save", 1);
|
|
Jerry James |
9a8375a |
remove(path);
|
|
Jerry James |
9a8375a |
- path_sprintf(path, "savedmap.dat", 1);
|
|
Jerry James |
9a8375a |
+ path_sprintf(path, "savedmap", 1);
|
|
Jerry James |
9a8375a |
remove(path);
|
|
Jerry James |
9a8375a |
}
|
|
Jerry James |
9a8375a |
|
|
Jerry James |
9a8375a |
@@ -51,7 +44,7 @@ saveGame()
|
|
Jerry James |
9a8375a |
|
|
Jerry James |
9a8375a |
mkshuae();
|
|
Jerry James |
9a8375a |
|
|
Jerry James |
9a8375a |
- path_sprintf(path, "save%d.dat", GAME_VERSION);
|
|
Jerry James |
9a8375a |
+ path_sprintf(path, "save", GAME_VERSION);
|
|
Jerry James |
9a8375a |
|
|
Jerry James |
9a8375a |
if(!(fp = fopen(path, "wb"))) {
|
|
Jerry James |
9a8375a |
err = strerror(errno);
|
|
Jerry James |
9a8375a |
@@ -79,7 +72,7 @@ saveGame()
|
|
Jerry James |
9a8375a |
SDL_RWclose(rwop);
|
|
Jerry James |
9a8375a |
|
|
Jerry James |
9a8375a |
// save the map
|
|
Jerry James |
9a8375a |
- path_sprintf(path, "savedmap%d.dat", GAME_VERSION);
|
|
Jerry James |
9a8375a |
+ path_sprintf(path, "savedmap", GAME_VERSION);
|
|
Jerry James |
9a8375a |
saveMapPath(path);
|
|
Jerry James |
9a8375a |
}
|
|
Jerry James |
9a8375a |
|
|
Jerry James |
9a8375a |
@@ -96,7 +89,7 @@ loadGame()
|
|
Jerry James |
9a8375a |
version = (int) GAME_VERSION;
|
|
Jerry James |
9a8375a |
|
|
Jerry James |
9a8375a |
// load the map
|
|
Jerry James |
9a8375a |
- path_sprintf(path, "savedmap%d.dat", GAME_VERSION);
|
|
Jerry James |
9a8375a |
+ path_sprintf(path, "savedmap", GAME_VERSION);
|
|
Jerry James |
9a8375a |
if(!loadMapPath(path, 0)) {
|
|
Jerry James |
9a8375a |
// if can't find saved map load static map
|
|
Jerry James |
9a8375a |
fprintf(stderr,
|
|
Jerry James |
9a8375a |
@@ -112,9 +105,9 @@ loadGame()
|
|
Jerry James |
9a8375a |
// try to find a saved game of any version
|
|
Jerry James |
9a8375a |
while(version > 0) {
|
|
Jerry James |
9a8375a |
if(version > 1) {
|
|
Jerry James |
9a8375a |
- path_sprintf(path, "save%d.dat", version);
|
|
Jerry James |
9a8375a |
+ path_sprintf(path, "save", version);
|
|
Jerry James |
9a8375a |
} else { // By Pedro: version==1
|
|
Jerry James |
9a8375a |
- path_sprintf(path, "save.dat", version);
|
|
Jerry James |
9a8375a |
+ path_sprintf(path, "save", version);
|
|
Jerry James |
9a8375a |
}
|
|
Jerry James |
9a8375a |
fprintf(stderr, "Trying to load saved game: %s\n", path);
|
|
Jerry James |
9a8375a |
fflush(stderr);
|