Attachment #29128 for bug #47591

View | Details | Raw Unified | Return to bug 47591
Collapse All | Expand All




void deleteSavedGame() {
  char path[300];
  // version 2
  sprintf(path, "%s%s%s%ssave%d.dat", getenv("HOME"), PATH_SEP, SAVEGAME_DIR, PATH_SEP, (int)GAME_VERSION);
  remove(path);
  sprintf(path, "%s%s%s%ssavedmap%d.dat", getenv("HOME"), PATH_SEP, SAVEGAME_DIR, PATH_SEP, (int)GAME_VERSION);
  remove(path);
  // version 1
  sprintf(path, "%s%s%s%ssave.dat", getenv("HOME"), PATH_SEP, SAVEGAME_DIR, PATH_SEP);
  remove(path);
  sprintf(path, "%s%s%s%ssavedmap.dat", getenv("HOME"), PATH_SEP, SAVEGAME_DIR, PATH_SEP);
  remove(path);
}


  char *err;
  SDL_RWops *rwop;

  sprintf(path, "%s%s%s%ssave%d.dat", getenv("HOME"), PATH_SEP, SAVEGAME_DIR, PATH_SEP, (int)GAME_VERSION);
  
  if(!(fp = fopen(path, "wb"))) {
	err = strerror(errno);

  SDL_RWclose(rwop);

  // save the map in savegame/savedmap.dat
  sprintf(path, "%s%s%s%ssavedmap%d.dat", getenv("HOME"), PATH_SEP, SAVEGAME_DIR, PATH_SEP, (int)GAME_VERSION);
  saveMapPath(path);  
}


  version = (int)GAME_VERSION;

  // load the map from savegame/savedmap.dat
  sprintf(path, "%s%s%s%ssavedmap%d.dat", getenv("HOME"), PATH_SEP, SAVEGAME_DIR, PATH_SEP, version);
  if(!loadMapPath(path, 0)) {
	// if can't find saved map load static map
	fprintf(stderr, "Can't find current saved map. Will try to use static map.\n");

  // try to find a saved game of any version
  while(version > 0) {
	if(version > 1) {
	  sprintf(path, "%s%s%s%ssave%d.dat", getenv("HOME"), PATH_SEP, SAVEGAME_DIR, PATH_SEP, version);  
	} else {
	  sprintf(path, "%s%s%s%ssave.dat", getenv("HOME"), PATH_SEP, SAVEGAME_DIR, PATH_SEP);  
	}
	fprintf(stderr, "Trying to load saved game: %s\n", path);
	fflush(stderr);

Lines 19-25 Link Here

(-)../../abe-1.0/src/Game.h (-1 / +1 lines)
19		19
20	#define SPRING_JUMP 30	20	#define SPRING_JUMP 30
21		21
22	#define SAVEGAME_DIR "savegame"	22	#define SAVEGAME_DIR ".abe"
23		23
24	#define MAX_HEALTH 100	24	#define MAX_HEALTH 100
25		25

Lines 305-311 Link Here

(-)../../abe-1.0/src/Image.c (-1 / +3 lines)
305	int block = 0;	305	int block = 0;
306		306
307	image_count = 0;	307	image_count = 0;
308	sprintf(tmp_path, "%s%s%s", IMAGES_DIR, PATH_SEP, "tmp.bmp");	308	sprintf(tmp_path, "%s%s%s", getenv("HOME"), PATH_SEP, ".abe");
		309	mkdir(tmp_path, 0755);
		310	sprintf(tmp_path, "%s%s%s%s%s", getenv("HOME"), PATH_SEP, ".abe", PATH_SEP, "tmp.bmp");
309		311
310	sprintf(path, "%s%s%s", IMAGES_DIR, PATH_SEP, "images.tar");	312	sprintf(path, "%s%s%s", IMAGES_DIR, PATH_SEP, "images.tar");
311	fprintf(stderr, "Opening %s for reading.\n", path);	313	fprintf(stderr, "Opening %s for reading.\n", path);

Return to bug 47591

Lines 6-19 Link Here

(-)../../abe-1.0/src/Game.c (-9 / +9 lines)
6	void deleteSavedGame() {	6	void deleteSavedGame() {
7	char path[300];	7	char path[300];
8	// version 2	8	// version 2
9	sprintf(path, "%s%ssave%d.dat", SAVEGAME_DIR, PATH_SEP, (int)GAME_VERSION);	9	sprintf(path, "%s%s%s%ssave%d.dat", getenv("HOME"), PATH_SEP, SAVEGAME_DIR, PATH_SEP, (int)GAME_VERSION);
10	remove(path);	10	remove(path);
11	sprintf(path, "%s%ssavedmap%d.dat", SAVEGAME_DIR, PATH_SEP, (int)GAME_VERSION);	11	sprintf(path, "%s%s%s%ssavedmap%d.dat", getenv("HOME"), PATH_SEP, SAVEGAME_DIR, PATH_SEP, (int)GAME_VERSION);
12	remove(path);	12	remove(path);
13	// version 1	13	// version 1
14	sprintf(path, "%s%ssave.dat", SAVEGAME_DIR, PATH_SEP);	14	sprintf(path, "%s%s%s%ssave.dat", getenv("HOME"), PATH_SEP, SAVEGAME_DIR, PATH_SEP);
15	remove(path);	15	remove(path);
16	sprintf(path, "%s%ssavedmap.dat", SAVEGAME_DIR, PATH_SEP);	16	sprintf(path, "%s%s%s%ssavedmap.dat", getenv("HOME"), PATH_SEP, SAVEGAME_DIR, PATH_SEP);
17	remove(path);	17	remove(path);
18	}	18	}
19		19
Lines 23-29 Link Here
23	char *err;	23	char *err;
24	SDL_RWops *rwop;	24	SDL_RWops *rwop;
25		25
26	sprintf(path, "%s%ssave%d.dat", SAVEGAME_DIR, PATH_SEP, (int)GAME_VERSION);	26	sprintf(path, "%s%s%s%ssave%d.dat", getenv("HOME"), PATH_SEP, SAVEGAME_DIR, PATH_SEP, (int)GAME_VERSION);
27		27
28	if(!(fp = fopen(path, "wb"))) {	28	if(!(fp = fopen(path, "wb"))) {
29	err = strerror(errno);	29	err = strerror(errno);
Lines 51-57 Link Here
51	SDL_RWclose(rwop);	51	SDL_RWclose(rwop);
52		52
53	// save the map in savegame/savedmap.dat	53	// save the map in savegame/savedmap.dat
54	sprintf(path, "%s%ssavedmap%d.dat", SAVEGAME_DIR, PATH_SEP, (int)GAME_VERSION);	54	sprintf(path, "%s%s%s%ssavedmap%d.dat", getenv("HOME"), PATH_SEP, SAVEGAME_DIR, PATH_SEP, (int)GAME_VERSION);
55	saveMapPath(path);	55	saveMapPath(path);
56	}	56	}
57		57
Lines 66-72 Link Here
66	version = (int)GAME_VERSION;	66	version = (int)GAME_VERSION;
67		67
68	// load the map from savegame/savedmap.dat	68	// load the map from savegame/savedmap.dat
69	sprintf(path, "%s%ssavedmap%d.dat", SAVEGAME_DIR, PATH_SEP, version);	69	sprintf(path, "%s%s%s%ssavedmap%d.dat", getenv("HOME"), PATH_SEP, SAVEGAME_DIR, PATH_SEP, version);
70	if(!loadMapPath(path, 0)) {	70	if(!loadMapPath(path, 0)) {
71	// if can't find saved map load static map	71	// if can't find saved map load static map
72	fprintf(stderr, "Can't find current saved map. Will try to use static map.\n");	72	fprintf(stderr, "Can't find current saved map. Will try to use static map.\n");
Lines 82-90 Link Here
82	// try to find a saved game of any version	82	// try to find a saved game of any version
83	while(version > 0) {	83	while(version > 0) {
84	if(version > 1) {	84	if(version > 1) {
85	sprintf(path, "%s%ssave%d.dat", SAVEGAME_DIR, PATH_SEP, version);	85	sprintf(path, "%s%s%s%ssave%d.dat", getenv("HOME"), PATH_SEP, SAVEGAME_DIR, PATH_SEP, version);
86	} else {	86	} else {
87	sprintf(path, "%s%ssave.dat", SAVEGAME_DIR, PATH_SEP);	87	sprintf(path, "%s%s%s%ssave.dat", getenv("HOME"), PATH_SEP, SAVEGAME_DIR, PATH_SEP);
88	}	88	}
89	fprintf(stderr, "Trying to load saved game: %s\n", path);	89	fprintf(stderr, "Trying to load saved game: %s\n", path);
90	fflush(stderr);	90	fflush(stderr);