blendo/thirtyflightsofloving
0
0
Fork 0
mirror of https://github.com/blendogames/thirtyflightsofloving.git synced 2025-01-18 06:22:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Abstracted "save" folder name for 64-bit portability.

Browse source
This commit is contained in:
Knightmare66 2020-07-31 17:11:31 -04:00
parent 9622f2d370
commit a523e11915
4 changed files with 86 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
qcommon/qcommon.h
View file

@ -30,6 +30,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define BASEDIRNAME "baseq2"
#if defined (_M_X64) || defined (_M_AMD64) || defined (__x86_64__)
#define SAVEDIRNAME "save_x64"
#else
#define SAVEDIRNAME "save"
#endif
#define DEFAULTPAK "pak"
#define DEFAULTMODEL "male"
#define DEFAULTSKIN "grunt"

96
server/sv_ccmds.c
View file

@ -167,15 +167,19 @@ void SV_WipeSavegame (char *savename)
Com_DPrintf("SV_WipeSaveGame(%s)\n", savename);
Com_sprintf (name, sizeof(name), "%s/save/%s/server.ssv", FS_Savegamedir (), savename); // was FS_Gamedir()
// Com_sprintf (name, sizeof(name), "%s/save/%s/server.ssv", FS_Savegamedir (), savename); // was FS_Gamedir()
Com_sprintf (name, sizeof(name), "%s/"SAVEDIRNAME"/%s/server.ssv", FS_Savegamedir (), savename); // was FS_Gamedir()
remove (name);
Com_sprintf (name, sizeof(name), "%s/save/%s/game.ssv", FS_Savegamedir (), savename); // was FS_Gamedir()
// Com_sprintf (name, sizeof(name), "%s/save/%s/game.ssv", FS_Savegamedir (), savename); // was FS_Gamedir()
Com_sprintf (name, sizeof(name), "%s/"SAVEDIRNAME"/%s/game.ssv", FS_Savegamedir (), savename); // was FS_Gamedir()
remove (name);
// Knightmare- delete screenshot
Com_sprintf (name, sizeof(name), "%s/save/%s/shot.jpg", FS_Savegamedir (), savename); // was FS_Gamedir()
// Com_sprintf (name, sizeof(name), "%s/save/%s/shot.jpg", FS_Savegamedir (), savename); // was FS_Gamedir()
Com_sprintf (name, sizeof(name), "%s/"SAVEDIRNAME"/%s/shot.jpg", FS_Savegamedir (), savename); // was FS_Gamedir()
remove (name);
Com_sprintf (name, sizeof(name), "%s/save/%s/*.sav", FS_Savegamedir (), savename); // was FS_Gamedir()
// Com_sprintf (name, sizeof(name), "%s/save/%s/*.sav", FS_Savegamedir (), savename); // was FS_Gamedir()
Com_sprintf (name, sizeof(name), "%s/"SAVEDIRNAME"/%s/*.sav", FS_Savegamedir (), savename); // was FS_Gamedir()
s = Sys_FindFirst( name, 0, 0 );
while (s)
{
@ -183,7 +187,8 @@ void SV_WipeSavegame (char *savename)
s = Sys_FindNext( 0, 0 );
}
Sys_FindClose ();
Com_sprintf (name, sizeof(name), "%s/save/%s/*.sv2", FS_Savegamedir (), savename); // was FS_Gamedir()
// Com_sprintf (name, sizeof(name), "%s/save/%s/*.sv2", FS_Savegamedir (), savename); // was FS_Gamedir()
Com_sprintf (name, sizeof(name), "%s/"SAVEDIRNAME"/%s/*.sv2", FS_Savegamedir (), savename); // was FS_Gamedir()
s = Sys_FindFirst(name, 0, 0 );
while (s)
{
@ -191,7 +196,8 @@ void SV_WipeSavegame (char *savename)
s = Sys_FindNext( 0, 0 );
}
Sys_FindClose ();
Com_sprintf (name, sizeof(name), "%s/save/%s/*.savz", FS_Savegamedir(), savename); // was FS_Gamedir()
// Com_sprintf (name, sizeof(name), "%s/save/%s/*.savz", FS_Savegamedir(), savename); // was FS_Gamedir()
Com_sprintf (name, sizeof(name), "%s/"SAVEDIRNAME"/%s/*.savz", FS_Savegamedir(), savename); // was FS_Gamedir()
s = Sys_FindFirst(name, 0, 0 );
while (s)
{
@ -224,36 +230,45 @@ void SV_CopySaveGame (char *src, char *dst)
SV_WipeSavegame (dst);
// copy the savegame over
Com_sprintf (name, sizeof(name), "%s/save/%s/server.ssv", FS_Savegamedir(), src); // was FS_Gamedir()
Com_sprintf (name2, sizeof(name2), "%s/save/%s/server.ssv", FS_Savegamedir(), dst); // was FS_Gamedir()
// Com_sprintf (name, sizeof(name), "%s/save/%s/server.ssv", FS_Savegamedir(), src); // was FS_Gamedir()
// Com_sprintf (name2, sizeof(name2), "%s/save/%s/server.ssv", FS_Savegamedir(), dst); // was FS_Gamedir()
Com_sprintf (name, sizeof(name), "%s/"SAVEDIRNAME"/%s/server.ssv", FS_Savegamedir(), src); // was FS_Gamedir()
Com_sprintf (name2, sizeof(name2), "%s/"SAVEDIRNAME"/%s/server.ssv", FS_Savegamedir(), dst); // was FS_Gamedir()
FS_CreatePath (name2);
FS_CopyFile (name, name2);
Com_sprintf (name, sizeof(name), "%s/save/%s/game.ssv", FS_Savegamedir(), src); // was FS_Gamedir()
Com_sprintf (name2, sizeof(name2), "%s/save/%s/game.ssv", FS_Savegamedir(), dst); // was FS_Gamedir()
// Com_sprintf (name, sizeof(name), "%s/save/%s/game.ssv", FS_Savegamedir(), src); // was FS_Gamedir()
// Com_sprintf (name2, sizeof(name2), "%s/save/%s/game.ssv", FS_Savegamedir(), dst); // was FS_Gamedir()
Com_sprintf (name, sizeof(name), "%s/"SAVEDIRNAME"/%s/game.ssv", FS_Savegamedir(), src); // was FS_Gamedir()
Com_sprintf (name2, sizeof(name2), "%s/"SAVEDIRNAME"/%s/game.ssv", FS_Savegamedir(), dst); // was FS_Gamedir()
FS_CopyFile (name, name2);
// Knightmare- copy screenshot
if (strcmp(dst, "kmq2save0")) // no screenshot for start of level autosaves
{
Com_sprintf (name, sizeof(name), "%s/save/%s/shot.jpg", FS_Savegamedir(), src); // was FS_Gamedir()
Com_sprintf (name2, sizeof(name2), "%s/save/%s/shot.jpg", FS_Savegamedir(), dst); // was FS_Gamedir()
// Com_sprintf (name, sizeof(name), "%s/save/%s/shot.jpg", FS_Savegamedir(), src); // was FS_Gamedir()
// Com_sprintf (name2, sizeof(name2), "%s/save/%s/shot.jpg", FS_Savegamedir(), dst); // was FS_Gamedir()
Com_sprintf (name, sizeof(name), "%s/"SAVEDIRNAME"/%s/shot.jpg", FS_Savegamedir(), src); // was FS_Gamedir()
Com_sprintf (name2, sizeof(name2), "%s/"SAVEDIRNAME"/%s/shot.jpg", FS_Savegamedir(), dst); // was FS_Gamedir()
FS_CopyFile (name, name2);
}
Com_sprintf (name, sizeof(name), "%s/save/%s/", FS_Savegamedir(), src); // was FS_Gamedir()
// Com_sprintf (name, sizeof(name), "%s/save/%s/", FS_Savegamedir(), src); // was FS_Gamedir()
Com_sprintf (name, sizeof(name), "%s/"SAVEDIRNAME"/%s/", FS_Savegamedir(), src); // was FS_Gamedir()
len = (int)strlen(name);
// Com_sprintf (name, sizeof(name), "%s/save/%s/*.sav", FS_Savegamedir(), src); // was FS_Gamedir()
for (i = 0; i < 2; i++)
{
Com_sprintf (name, sizeof(name), "%s/save/%s/*.%s", FS_Savegamedir(), src, saveExtensions[i]); // was FS_Gamedir()
// Com_sprintf (name, sizeof(name), "%s/save/%s/*.%s", FS_Savegamedir(), src, saveExtensions[i]); // was FS_Gamedir()
Com_sprintf (name, sizeof(name), "%s/"SAVEDIRNAME"/%s/*.%s", FS_Savegamedir(), src, saveExtensions[i]); // was FS_Gamedir()
extLen = (int)strlen (saveExtensions[i]);
found = Sys_FindFirst (name, 0, 0);
while (found)
{
// strncpy (name+len, found+len);
Q_strncpyz (name+len, found+len, sizeof(name)-len);
Com_sprintf (name2, sizeof(name2), "%s/save/%s/%s", FS_Savegamedir(), dst, found+len); // was FS_Gamedir()
// Com_sprintf (name2, sizeof(name2), "%s/save/%s/%s", FS_Savegamedir(), dst, found+len); // was FS_Gamedir()
Com_sprintf (name2, sizeof(name2), "%s/"SAVEDIRNAME"/%s/%s", FS_Savegamedir(), dst, found+len); // was FS_Gamedir()
FS_CopyFile (name, name2);
if (i == 0)
@ -292,7 +307,8 @@ void SV_WriteLevelFile (void)
Com_DPrintf("SV_WriteLevelFile()\n");
Com_sprintf (zipName, sizeof(zipName), "/save/current/%s.savz", sv.name);
// Com_sprintf (zipName, sizeof(zipName), "/save/current/%s.savz", sv.name);
Com_sprintf (zipName, sizeof(zipName), "/"SAVEDIRNAME"/current/%s.savz", sv.name);
Com_sprintf (intName, sizeof(intName), "%s.sv2", sv.name);
FS_FOpenCompressedFile (zipName, intName, &f, FS_WRITE);
if (!f)
@ -309,7 +325,8 @@ void SV_WriteLevelFile (void)
Com_DPrintf("SV_WriteLevelFile()\n");
Com_sprintf (name, sizeof(name), "%s/save/current/%s.sv2", FS_Savegamedir(), sv.name); // was FS_Gamedir()
// Com_sprintf (name, sizeof(name), "%s/save/current/%s.sv2", FS_Savegamedir(), sv.name); // was FS_Gamedir()
Com_sprintf (name, sizeof(name), "%s/"SAVEDIRNAME"/current/%s.sv2", FS_Savegamedir(), sv.name); // was FS_Gamedir()
f = fopen(name, "wb");
if (!f)
{
@ -321,11 +338,13 @@ void SV_WriteLevelFile (void)
fclose (f);
#endif // COMPRESSED_SAVEGAMES
Com_sprintf (name, sizeof(name), "%s/save/current/%s.sav", FS_Savegamedir(), sv.name); // was FS_Gamedir()
// Com_sprintf (name, sizeof(name), "%s/save/current/%s.sav", FS_Savegamedir(), sv.name); // was FS_Gamedir()
Com_sprintf (name, sizeof(name), "%s/"SAVEDIRNAME"/current/%s.sav", FS_Savegamedir(), sv.name); // was FS_Gamedir()
ge->WriteLevel (name);
#ifdef COMPRESSED_SAVEGAMES
// compress .sav into .savz
Com_sprintf (zipName, sizeof(zipName), "/save/current/%s.savz", sv.name);
// Com_sprintf (zipName, sizeof(zipName), "/save/current/%s.savz", sv.name);
Com_sprintf (zipName, sizeof(zipName), "/"SAVEDIRNAME"/current/%s.savz", sv.name);
Com_sprintf (intName, sizeof(intName), "%s.sav", sv.name);
FS_CompressFile (name, zipName, intName);
@ -353,7 +372,8 @@ void SV_ReadLevelFile (void)
Com_DPrintf("SV_ReadLevelFile()\n");
#ifdef COMPRESSED_SAVEGAMES // check for compressed .savz file here
Com_sprintf (zipName, sizeof(zipName), "save/current/%s.savz", sv.name);
// Com_sprintf (zipName, sizeof(zipName), "save/current/%s.savz", sv.name);
Com_sprintf (zipName, sizeof(zipName), SAVEDIRNAME"/current/%s.savz", sv.name);
Com_sprintf (intName, sizeof(intName), "%s.sv2", sv.name);
FS_FOpenCompressedFile (zipName, intName, &f, FS_READ);
@ -366,7 +386,8 @@ void SV_ReadLevelFile (void)
else
#endif // COMPRESSED_SAVEGAMES
{
Com_sprintf (name, sizeof(name), "save/current/%s.sv2", sv.name);
// Com_sprintf (name, sizeof(name), "save/current/%s.sv2", sv.name);
Com_sprintf (name, sizeof(name), SAVEDIRNAME"/current/%s.sv2", sv.name);
FS_FOpenFile (name, &f, FS_READ);
if (!f)
{
@ -378,12 +399,14 @@ void SV_ReadLevelFile (void)
FS_FCloseFile(f);
}
Com_sprintf (name, sizeof(name), "%s/save/current/%s.sav", FS_Savegamedir(), sv.name); // was FS_Gamedir()
// Com_sprintf (name, sizeof(name), "%s/save/current/%s.sav", FS_Savegamedir(), sv.name); // was FS_Gamedir()
Com_sprintf (name, sizeof(name), "%s/"SAVEDIRNAME"/current/%s.sav", FS_Savegamedir(), sv.name); // was FS_Gamedir()
#ifdef COMPRESSED_SAVEGAMES
// check for .sav; if not present, decompress from .savz
fp = fopen (name, "rb");
if (!fp) {
Com_sprintf (zipName, sizeof(zipName), "save/current/%s.savz", sv.name);
// Com_sprintf (zipName, sizeof(zipName), "save/current/%s.savz", sv.name);
Com_sprintf (zipName, sizeof(zipName), SAVEDIRNAME"/current/%s.savz", sv.name);
Com_sprintf (intName, sizeof(intName), "%s.sav", sv.name);
FS_DecompressFile (name, zipName, intName);
}
@ -409,7 +432,8 @@ void SV_WriteScreenshot (void)
Com_DPrintf("SV_WriteScreenshot()\n");
Com_sprintf (name, sizeof(name), "%s/save/current/shot.jpg", FS_Savegamedir()); // was FS_Gamedir()
// Com_sprintf (name, sizeof(name), "%s/save/current/shot.jpg", FS_Savegamedir()); // was FS_Gamedir()
Com_sprintf (name, sizeof(name), "%s/"SAVEDIRNAME"/current/shot.jpg", FS_Savegamedir()); // was FS_Gamedir()
R_ScaledScreenshot(name);
}
@ -433,7 +457,8 @@ void SV_WriteServerFile (qboolean autosave, qboolean quicksave)
Com_DPrintf("SV_WriteServerFile(%s)\n", autosave ? "true" : "false");
Com_sprintf (fileName, sizeof(fileName), "%s/save/current/server.ssv", FS_Savegamedir()); // was FS_Gamedir()
// Com_sprintf (fileName, sizeof(fileName), "%s/save/current/server.ssv", FS_Savegamedir()); // was FS_Gamedir()
Com_sprintf (fileName, sizeof(fileName), "%s/"SAVEDIRNAME"/current/server.ssv", FS_Savegamedir()); // was FS_Gamedir()
f = fopen (fileName, "wb");
if (!f)
{
@ -518,7 +543,8 @@ void SV_WriteServerFile (qboolean autosave, qboolean quicksave)
fclose (f);
// write game state
Com_sprintf (fileName, sizeof(fileName), "%s/save/current/game.ssv", FS_Savegamedir()); // was FS_Gamedir()
// Com_sprintf (fileName, sizeof(fileName), "%s/save/current/game.ssv", FS_Savegamedir()); // was FS_Gamedir()
Com_sprintf (fileName, sizeof(fileName), "%s/"SAVEDIRNAME"/current/game.ssv", FS_Savegamedir()); // was FS_Gamedir()
ge->WriteGame (fileName, autosave);
}
@ -538,7 +564,8 @@ void SV_ReadServerFile (void)
Com_DPrintf("SV_ReadServerFile()\n");
Com_sprintf (fileName, sizeof(fileName), "save/current/server.ssv");
// Com_sprintf (fileName, sizeof(fileName), "save/current/server.ssv");
Com_sprintf (fileName, sizeof(fileName), SAVEDIRNAME"/current/server.ssv");
FS_FOpenFile (fileName, &f, FS_READ);
if (!f)
{
@ -583,7 +610,8 @@ void SV_ReadServerFile (void)
Q_strncpyz (svs.mapcmd, mapcmd, sizeof(svs.mapcmd));
// read game state
Com_sprintf (fileName, sizeof(fileName), "%s/save/current/game.ssv", FS_Savegamedir()); // was FS_Gamedir()
// Com_sprintf (fileName, sizeof(fileName), "%s/save/current/game.ssv", FS_Savegamedir()); // was FS_Gamedir()
Com_sprintf (fileName, sizeof(fileName), "%s/"SAVEDIRNAME"/current/game.ssv", FS_Savegamedir()); // was FS_Gamedir()
ge->ReadGame (fileName);
}
@ -643,7 +671,8 @@ void SV_GameMap_f (void)
Com_DPrintf("SV_GameMap(%s)\n", Cmd_Argv(1));
FS_CreatePath (va("%s/save/current/", FS_Savegamedir())); // was FS_Gamedir()
// FS_CreatePath (va("%s/save/current/", FS_Savegamedir())); // was FS_Gamedir()
FS_CreatePath (va("%s/"SAVEDIRNAME"/current/", FS_Savegamedir())); // was FS_Gamedir()
// check for clearing the current savegame
map = Cmd_Argv(1);
@ -771,7 +800,8 @@ void SV_Loadgame_f (void)
}
// make sure the server.ssv file exists
Com_sprintf (name, sizeof(name), "%s/save/%s/server.ssv", FS_Savegamedir(), Cmd_Argv(1)); // was FS_Gamedir()
// Com_sprintf (name, sizeof(name), "%s/save/%s/server.ssv", FS_Savegamedir(), Cmd_Argv(1)); // was FS_Gamedir()
Com_sprintf (name, sizeof(name), "%s/"SAVEDIRNAME"/%s/server.ssv", FS_Savegamedir(), Cmd_Argv(1)); // was FS_Gamedir()
f = fopen (name, "rb");
if (!f)
{
@ -783,9 +813,11 @@ void SV_Loadgame_f (void)
// Knightmare- set saveshot name
if ( !dedicated->value && (!strcmp(Cmd_Argv(1), "quick") || !strcmp(Cmd_Argv(1), "quik")) )
{
Com_sprintf(sv_loadshotname, sizeof(sv_loadshotname), "save/%s/shot.jpg", Cmd_Argv(1));
// Com_sprintf(sv_loadshotname, sizeof(sv_loadshotname), "save/%s/shot.jpg", Cmd_Argv(1));
Com_sprintf(sv_loadshotname, sizeof(sv_loadshotname), SAVEDIRNAME"/%s/shot.jpg", Cmd_Argv(1));
R_FreePic (sv_loadshotname);
Com_sprintf(sv_loadshotname, sizeof(sv_loadshotname), "/save/%s/shot.jpg", Cmd_Argv(1));
// Com_sprintf(sv_loadshotname, sizeof(sv_loadshotname), "/save/%s/shot.jpg", Cmd_Argv(1));
Com_sprintf(sv_loadshotname, sizeof(sv_loadshotname), "/"SAVEDIRNAME"/%s/shot.jpg", Cmd_Argv(1));
load_saveshot = sv_loadshotname;
}

6
server/sv_init.c
View file

@ -141,12 +141,14 @@ void SV_CheckForSavegame (void)
if (Cvar_VariableValue ("deathmatch"))
return;
Com_sprintf (name, sizeof(name), "%s/save/current/%s.sav", FS_Savegamedir(), sv.name); // was FS_Gamedir()
// Com_sprintf (name, sizeof(name), "%s/save/current/%s.sav", FS_Savegamedir(), sv.name); // was FS_Gamedir()
Com_sprintf (name, sizeof(name), "%s/"SAVEDIRNAME"/current/%s.sav", FS_Savegamedir(), sv.name); // was FS_Gamedir()
f = fopen (name, "rb");
if (!f)
#ifdef COMPRESSED_SAVEGAMES
{
Com_sprintf (name, sizeof(name), "%s/save/current/%s.savz", FS_Savegamedir(), sv.name); // was FS_Gamedir()
// Com_sprintf (name, sizeof(name), "%s/save/current/%s.savz", FS_Savegamedir(), sv.name); // was FS_Gamedir()
Com_sprintf (name, sizeof(name), "%s/"SAVEDIRNAME"/current/%s.savz", FS_Savegamedir(), sv.name); // was FS_Gamedir()
f = fopen (name, "rb");
if (!f)
return; // no savegame

18
ui/ui_game_saveload.c
View file

@ -72,7 +72,8 @@ void Load_Savestrings (qboolean update)
for (i=0; i<MAX_SAVEGAMES; i++)
{
Com_sprintf (name, sizeof(name), "%s/save/kmq2save%i/server.ssv", FS_Savegamedir(), i); // was FS_Gamedir()
// Com_sprintf (name, sizeof(name), "%s/save/kmq2save%i/server.ssv", FS_Savegamedir(), i); // was FS_Gamedir()
Com_sprintf (name, sizeof(name), "%s/"SAVEDIRNAME"/kmq2save%i/server.ssv", FS_Savegamedir(), i); // was FS_Gamedir()
old_timestamp = m_savetimestamps[i];
stat(name, &st);
@ -95,7 +96,8 @@ void Load_Savestrings (qboolean update)
else
{
fclose (fp);
Com_sprintf (name, sizeof(name), "save/kmq2save%i/server.ssv", i);
// Com_sprintf (name, sizeof(name), "save/kmq2save%i/server.ssv", i);
Com_sprintf (name, sizeof(name), SAVEDIRNAME"/kmq2save%i/server.ssv", i);
FS_FOpenFile (name, &f, FS_READ);
if (!f)
{
@ -142,9 +144,11 @@ void ValidateSaveshots (void)
Com_sprintf(shotname, sizeof(shotname), "/levelshots/%s.pcx", m_mapname);
else
{ // free previously loaded shots
Com_sprintf(shotname, sizeof(shotname), "save/kmq2save%i/shot.jpg", i);
// Com_sprintf(shotname, sizeof(shotname), "save/kmq2save%i/shot.jpg", i);
Com_sprintf(shotname, sizeof(shotname), SAVEDIRNAME"/kmq2save%i/shot.jpg", i);
R_FreePic (shotname);
Com_sprintf(shotname, sizeof(shotname), "/save/kmq2save%i/shot.jpg", i);
// Com_sprintf(shotname, sizeof(shotname), "/save/kmq2save%i/shot.jpg", i);
Com_sprintf(shotname, sizeof(shotname), "/"SAVEDIRNAME"/kmq2save%i/shot.jpg", i);
}
if (R_DrawFindPic(shotname))
m_saveshotvalid[i] = true;
@ -232,7 +236,8 @@ void DrawSaveshot (qboolean loadmenu)
}
else if ( m_savevalid[i] && m_saveshotvalid[i] )
{
Com_sprintf(shotname, sizeof(shotname), "/save/kmq2save%i/shot.jpg", i);
// Com_sprintf(shotname, sizeof(shotname), "/save/kmq2save%i/shot.jpg", i);
Com_sprintf(shotname, sizeof(shotname), "/"SAVEDIRNAME"/kmq2save%i/shot.jpg", i);
SCR_DrawPic (SCREEN_WIDTH/2+46, SCREEN_HEIGHT/2-58, 240, 180, ALIGN_CENTER, shotname, 1.0);
}
@ -261,7 +266,8 @@ void LoadGameCallback (void *self)
// set saveshot name here
if ( m_saveshotvalid[ a->generic.localdata[0] ] && (a->generic.localdata[0] != 0) ) // autosave has no saveshot, but uses levelshot instead
{
Com_sprintf(loadshotname, sizeof(loadshotname), "/save/kmq2save%i/shot.jpg", a->generic.localdata[0]);
// Com_sprintf(loadshotname, sizeof(loadshotname), "/save/kmq2save%i/shot.jpg", a->generic.localdata[0]);
Com_sprintf(loadshotname, sizeof(loadshotname), "/"SAVEDIRNAME"/kmq2save%i/shot.jpg", a->generic.localdata[0]);
load_saveshot = loadshotname; }
else {
load_saveshot = NULL;