walkero
/
starfighter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replaced the struct dump "save format" with a proper save format. 

This format is actually portable, and there isn't a risk of it just
breaking any time the format is changed, since the version number
can be read independently of everything else.
This commit is contained in:
onpon4 2016-01-09 19:58:07 -05:00
parent 290d44386a
commit b66bb4bf98
1 changed files with 142 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
src/loadSave.cpp
View File

@ -94,41 +94,77 @@ Fill in later...
*/ */
bool loadGame(int slot) bool loadGame(int slot)
{ {
/* char filename[PATH_MAX];
* TODO: want to do something like this (copied from the old code that FILE *fp;
* loaded planet data):
fp = fopen(string, "rb");
int messageMission; sprintf(filename, "%ssave%.2d.sav", engine.configDirectory, slot);
int messageSlot; fp = fopen(filename, "rb");
char face[50];
char from[100];
char subject[100];
for (int i = 0 ; i < 10 ; i++) if (fp != NULL)
{ {
if ((fscanf(fp, "%d %d %s%*c", &messageMission, &messageSlot, face) < 3) || if (fscanf(fp, "%d%*c", &game.saveFormat) < 1)
(fscanf(fp, "%[^\n]%*c", from) < 1) ||
(fscanf(fp, "%[^\n]%*c", subject) < 1))
{ {
printf("Warning: Mission data for planet %i in \"%s\" is not correctly formatted\n", i, string); printf("Error: Could not determine the version of the save file.\n");
break; fclose(fp);
return false;
} }
systemPlanet[i].messageMission = messageMission; switch (game.saveFormat)
systemPlanet[i].messageSlot = messageSlot; {
systemPlanet[i].faceImage = getFace(face); case 4:
if ((fscanf(fp, "%d%*c", &game.difficulty) < 1) ||
strcpy(systemPlanet[i].from, from); (fscanf(fp, "%d %d %d %d %d %d %d %d%*c",
strcpy(systemPlanet[i].subject, subject); &game.minPlasmaRateLimit, &game.minPlasmaDamageLimit,
&game.minPlasmaOutputLimit, &game.maxPlasmaRateLimit,
&game.maxPlasmaDamageLimit, &game.maxPlasmaOutputLimit,
&game.maxPlasmaAmmoLimit, &game.maxRocketAmmoLimit) < 8) ||
(fscanf(fp, "%d %d %d%*c", &game.system, &game.area,
&game.stationedPlanet) < 3) ||
(fscanf(fp, "%d %d%*c", &game.hasWingMate1, &game.hasWingMate2) < 2) ||
(fscanf(fp, "%d %d %d %d%*c", &player.maxShield,
&player.ammo[0], &player.ammo[1], &player.weaponType[1]) < 4) ||
(fscanf(fp, "%d %d %d%*c",
&weapon[W_PLAYER_WEAPON].ammo[0],
&weapon[W_PLAYER_WEAPON].damage,
&weapon[W_PLAYER_WEAPON].reload[0]) < 3) ||
(fscanf(fp, "%d %d %d %d %d %d %d %d%*c",
&game.minPlasmaRate, &game.minPlasmaDamage,
&game.minPlasmaOutput, &game.maxPlasmaRate,
&game.maxPlasmaDamage, &game.maxPlasmaOutput,
&game.maxPlasmaAmmo, &game.maxRocketAmmo) < 8) ||
(fscanf(fp, "%d %d %d %d %d %d %d %d %d %d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d%*c",
&game.missionCompleted[0], &game.missionCompleted[1],
&game.missionCompleted[2], &game.missionCompleted[3],
&game.missionCompleted[4], &game.missionCompleted[5],
&game.missionCompleted[6], &game.missionCompleted[7],
&game.missionCompleted[8], &game.missionCompleted[9]) < 10) ||
(fscanf(fp, "%d%*c", &game.experimentalShield) < 1) ||
(fscanf(fp, "%d %d%*c", &game.cash, &game.cashEarned) < 2) ||
(fscanf(fp, "%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d%*c",
&game.shots, &game.hits, &game.accuracy, &game.totalKills,
&game.wingMate1Kills, &game.wingMate2Kills,
&game.wingMate1Ejects, &game.wingMate2Ejects,
&game.totalOtherKills, &game.shieldPickups,
&game.rocketPickups, &game.cellPickups, &game.powerups,
&game.minesKilled, &game.slavesRescued) < 15) ||
(fscanf(fp, "%ld%*c", &game.timeTaken) < 1))
{
printf("Warning: Save data is not correctly formatted. Some data may be lost.\n");
}
game.destinationPlanet = game.stationedPlanet;
break;
default:
printf("Error: Save format version not recognized.\n");
fclose(fp);
return false;
} }
fclose(fp); fclose(fp);
*/ }
char filename[PATH_MAX]; else
FILE *fp; {
sprintf(filename, "%ssave%.2d.dat", engine.configDirectory, slot); sprintf(filename, "%ssave%.2d.dat", engine.configDirectory, slot);
fp = fopen(filename, "rb"); fp = fopen(filename, "rb");
if (fp == NULL) if (fp == NULL)
@ -150,11 +186,13 @@ bool loadGame(int slot)
weapon[W_PLAYER_WEAPON].imageIndex[0] = SP_PLASMA_GREEN; weapon[W_PLAYER_WEAPON].imageIndex[0] = SP_PLASMA_GREEN;
weapon[W_PLAYER_WEAPON].imageIndex[1] = SP_PLASMA_GREEN; weapon[W_PLAYER_WEAPON].imageIndex[1] = SP_PLASMA_GREEN;
player = game.thePlayer; player = game.thePlayer;
}
// Re-init all the planets in this system... // Re-init all the planets in this system...
initPlanetMissions(game.system); initPlanetMissions(game.system);
// ... and then override with completition status // ... and then override with completition status
// XXX: Magic number
for (int i = 0 ; i < 10 ; i++) for (int i = 0 ; i < 10 ; i++)
systemPlanet[i].missionCompleted = game.missionCompleted[i]; systemPlanet[i].missionCompleted = game.missionCompleted[i];
@ -172,18 +210,72 @@ void saveGame(int slot)
return; return;
} }
sprintf(fileName, "%ssave%.2d.dat", engine.configDirectory, slot); sprintf(fileName, "%ssave%.2d.sav", engine.configDirectory, slot);
fp = fopen(fileName, "wb"); fp = fopen(fileName, "wb");
game.saveFormat = 3;
game.playerWeapon = weapon[W_PLAYER_WEAPON]; game.saveFormat = 4;
game.thePlayer = player; // XXX: Magic number
for (int i = 0 ; i < 10 ; i++) for (int i = 0 ; i < 10 ; i++)
game.missionCompleted[i] = systemPlanet[i].missionCompleted; game.missionCompleted[i] = systemPlanet[i].missionCompleted;
if (fp != NULL) if (fp != NULL)
{ {
if (fwrite(&game, sizeof(Game), 1, fp) != 1) if (fprintf(fp,
"%d\n"
"%d\n"
"%d %d %d %d %d %d %d %d\n"
"%d %d %d\n"
"%d %d\n"
"%d %d %d %d\n"
"%d %d %d\n"
"%d %d %d %d %d %d %d %d\n"
"%d %d %d %d %d %d %d %d %d %d 0 0 0 0 0 0 0 0 0 0\n"
"%d\n"
"%d %d\n"
"%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d\n"
"%ld\n",
game.saveFormat,
game.difficulty,
game.minPlasmaRateLimit, game.minPlasmaDamageLimit,
game.minPlasmaOutputLimit, game.maxPlasmaRateLimit,
game.maxPlasmaDamageLimit, game.maxPlasmaOutputLimit,
game.maxPlasmaAmmoLimit, game.maxRocketAmmoLimit,
game.system, game.area, game.stationedPlanet,
game.hasWingMate1, game.hasWingMate2,
player.maxShield, player.ammo[0], player.ammo[1],
player.weaponType[1],
weapon[W_PLAYER_WEAPON].ammo[0], weapon[W_PLAYER_WEAPON].damage,
weapon[W_PLAYER_WEAPON].reload[0],
game.minPlasmaRate, game.minPlasmaDamage, game.minPlasmaOutput,
game.maxPlasmaRate, game.maxPlasmaDamage, game.maxPlasmaOutput,
game.maxPlasmaAmmo, game.maxRocketAmmo,
game.missionCompleted[0], game.missionCompleted[1],
game.missionCompleted[2], game.missionCompleted[3],
game.missionCompleted[4], game.missionCompleted[5],
game.missionCompleted[6], game.missionCompleted[7],
game.missionCompleted[8], game.missionCompleted[9],
game.experimentalShield,
game.cash, game.cashEarned,
game.shots, game.hits, game.accuracy, game.totalKills,
game.wingMate1Kills, game.wingMate2Kills, game.wingMate1Ejects,
game.wingMate2Ejects, game.totalOtherKills, game.shieldPickups,
game.rocketPickups, game.cellPickups, game.powerups,
game.minesKilled, game.slavesRescued,
game.timeTaken) <= 0)
{ {
printf("Error Saving Game to Slot %d\n", slot); printf("Error Saving Game to Slot %d\n", slot);
} }