zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-11 18:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- cleaned out the remaining wrappers from cache1d.h and use the file system directly instead.

Browse source
This commit is contained in:
Christoph Oelckers 2019-12-07 10:49:23 +01:00
parent 30cbcb54b1
commit 0342b96335
24 changed files with 34 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/blood/src/demo.cpp
View file

@ -212,16 +212,14 @@ bool CDemo::SetupPlayback(const char *pzFile)
at1 = 0; at1 = 0;
if (pzFile) if (pzFile)
{ {
hPFile = fopenFileReader(pzFile, 0); if (!hPFile.OpenFile(pzFile))
if (!hPFile.isOpen())
return false; return false;
} }
else else
{ {
if (!pCurrentDemo) if (!pCurrentDemo)
return false; return false;
hPFile = fopenFileReader(pCurrentDemo->zName, 0); if (!hPFile.OpenFile(pCurrentDemo->zName))
if (hPFile.isOpen())
return false; return false;
} }
hPFile.Read(&atf, sizeof(DEMOHEADER)); hPFile.Read(&atf, sizeof(DEMOHEADER));
@ -412,8 +410,8 @@ void CDemo::LoadDemoInfo(void)
D_AddWildFile(demos, zFN); D_AddWildFile(demos, zFN);
for (auto &filename : demos) for (auto &filename : demos)
{ {
auto hFile = fopenFileReader(filename, 0); FileReader hFile;
if (!hFile.isOpen()) if (!hFile.OpenFile(filename))
ThrowError("Error loading demo file header."); ThrowError("Error loading demo file header.");
hFile.Read(&atf, sizeof(atf)); hFile.Read(&atf, sizeof(atf));
#if B_BIG_ENDIAN == 1 #if B_BIG_ENDIAN == 1

16
source/build/include/cache1d.h
View file

@ -9,23 +9,7 @@
#ifndef cache1d_h_ #ifndef cache1d_h_
#define cache1d_h_ #define cache1d_h_
#include "compat.h"
#include "files.h"
void cacheAllocateBlock(intptr_t *newhandle, int32_t newbytes, uint8_t *newlockptr); void cacheAllocateBlock(intptr_t *newhandle, int32_t newbytes, uint8_t *newlockptr);
extern int32_t pathsearchmode; // 0 = gamefs mode (default), 1 = localfs mode (editor's mode)
#include "filesystem/filesystem.h"
// This is only here to mark a file as not being part of the game assets (e.g. savegames)
// These should be handled differently (e.g read from a userdata directory or similar things.)
inline FileReader fopenFileReader(const char* name, int where)
{
FileReader fr;
fr.OpenFile(name);
return fr;
}
#endif // cache1d_h_ #endif // cache1d_h_

2
source/build/include/palette.h
View file

@ -11,7 +11,7 @@
#ifndef palette_h_ #ifndef palette_h_
#define palette_h_ #define palette_h_
#include "cache1d.h" #include "filesystem/filesystem.h"
#define MAXBASEPALS 256 #define MAXBASEPALS 256
#define MAXPALOOKUPS 256 #define MAXPALOOKUPS 256

3
source/build/src/common.cpp
View file

@ -292,7 +292,8 @@ static char* KeyValues_FindKeyValue(char **vdfbuf, char * const vdfbufend, const
void Paths_ParseSteamKeyValuesForPaths(const char *vdf, SteamPathParseFunc func) void Paths_ParseSteamKeyValuesForPaths(const char *vdf, SteamPathParseFunc func)
{ {
FileReader fr = fopenFileReader(vdf, 0); FileReader fr;
if (!fr.OpenFile(vdf)) return;
auto size = fr.GetLength(); auto size = fr.GetLength();
char *vdfbuf, *vdfbufend; char *vdfbuf, *vdfbufend;

2
source/build/src/scriptfile.cpp
View file

@ -9,7 +9,7 @@
#include "scriptfile.h" #include "scriptfile.h"
#include "baselayer.h" #include "baselayer.h"
#include "compat.h" #include "compat.h"
#include "cache1d.h" #include "filesystem/filesystem.h"
#define ISWS(x) ((x == ' ') || (x == '\t') || (x == '\r') || (x == '\n')) #define ISWS(x) ((x == ' ') || (x == '\t') || (x == '\r') || (x == '\n'))

4
source/build/src/sdlayer.cpp
View file

@ -667,8 +667,8 @@ static SDL_GameController *controller = NULL;
static void LoadSDLControllerDB() static void LoadSDLControllerDB()
{ {
auto fh = fopenFileReader("gamecontrollerdb.txt", 0); FileReader fh;
if (!fh.isOpen()) if (!fh.OpenFile("gamecontrollerdb.txt"))
return; return;
int flen = fh.GetLength(); int flen = fh.GetLength();

2
source/common/fonts/fontchars.cpp
View file

@ -34,7 +34,7 @@
** **
*/ */
#include "cache1d.h" #include "filesystem/filesystem.h"
#include "bitmap.h" #include "bitmap.h"
#include "image.h" #include "image.h"
#include "imagehelpers.h" #include "imagehelpers.h"

2
source/common/fonts/singlelumpfont.cpp
View file

@ -40,7 +40,7 @@
#include "fontchars.h" #include "fontchars.h"
#include "printf.h" #include "printf.h"
#include "imagehelpers.h" #include "imagehelpers.h"
#include "cache1d.h" #include "filesystem/filesystem.h"
#include "fontinternals.h" #include "fontinternals.h"

2
source/common/openaudio.h
View file

@ -1,4 +1,6 @@
#pragma once #pragma once
#include "filesystem/filesystem.h"
// This really, really needs to be redone in its entirety, the audio lookup code is hideous. // This really, really needs to be redone in its entirety, the audio lookup code is hideous.
extern FileReader S_OpenAudio(const char *fn, char searchfirst, uint8_t ismusic); extern FileReader S_OpenAudio(const char *fn, char searchfirst, uint8_t ismusic);

2
source/common/rts.cpp
View file

@ -35,7 +35,7 @@
#include <stdint.h> #include <stdint.h>
#include "zstring.h" #include "zstring.h"
#include "tarray.h" #include "tarray.h"
#include "cache1d.h" #include "filesystem/filesystem.h"
#include "rts.h" #include "rts.h"
#include "m_swap.h" #include "m_swap.h"

2
source/common/secrets.cpp
View file

@ -1,5 +1,5 @@
#include "c_dispatch.h" #include "c_dispatch.h"
#include "cache1d.h" #include "filesystem/filesystem.h"
#include "printf.h" #include "printf.h"
#include "v_text.h" #include "v_text.h"
#include "tarray.h" #include "tarray.h"

2
source/common/textures/formats/ddstexture.cpp
View file

@ -55,7 +55,7 @@
#include "imagehelpers.h" #include "imagehelpers.h"
#include "image.h" #include "image.h"
#include "m_png.h" #include "m_png.h"
#include "cache1d.h" #include "filesystem/filesystem.h"
// Since we want this to compile under Linux too, we need to define this // Since we want this to compile under Linux too, we need to define this
// stuff ourselves instead of including a DirectX header. // stuff ourselves instead of including a DirectX header.

2
source/common/textures/formats/jpegtexture.cpp
View file

@ -40,7 +40,7 @@
#include "printf.h" #include "printf.h"
#include "bitmap.h" #include "bitmap.h"
#include "image.h" #include "image.h"
#include "cache1d.h" #include "filesystem/filesystem.h"
#include "imagehelpers.h" #include "imagehelpers.h"
#include "v_text.h" #include "v_text.h"

2
source/common/textures/formats/pcxtexture.cpp
View file

@ -39,7 +39,7 @@
#include "bitmap.h" #include "bitmap.h"
#include "imagehelpers.h" #include "imagehelpers.h"
#include "image.h" #include "image.h"
#include "cache1d.h" #include "filesystem/filesystem.h"
//========================================================================== //==========================================================================
// //

2
source/common/textures/formats/pngtexture.cpp
View file

@ -41,7 +41,7 @@
#include "imagehelpers.h" #include "imagehelpers.h"
#include "image.h" #include "image.h"
#include "printf.h" #include "printf.h"
#include "cache1d.h" #include "filesystem/filesystem.h"
//========================================================================== //==========================================================================
// //

2
source/common/textures/formats/stbtexture.cpp
View file

@ -49,7 +49,7 @@
#include "bitmap.h" #include "bitmap.h"
#include "imagehelpers.h" #include "imagehelpers.h"
#include "image.h" #include "image.h"
#include "cache1d.h" #include "filesystem/filesystem.h"
//========================================================================== //==========================================================================
// //

2
source/common/textures/formats/tgatexture.cpp
View file

@ -37,7 +37,7 @@
#include "templates.h" #include "templates.h"
#include "bitmap.h" #include "bitmap.h"
#include "image.h" #include "image.h"
#include "cache1d.h" #include "filesystem/filesystem.h"
#include "imagehelpers.h" #include "imagehelpers.h"

2
source/common/textures/image.cpp
View file

@ -38,7 +38,7 @@
#include "bitmap.h" #include "bitmap.h"
#include "image.h" #include "image.h"
#include "files.h" #include "files.h"
#include "cache1d.h" #include "filesystem/filesystem.h"
#include "imagehelpers.h" #include "imagehelpers.h"
int FImageSource::NextID; int FImageSource::NextID;

11
source/common/utility/sc_man.cpp
View file

@ -20,7 +20,8 @@
#include "printf.h" #include "printf.h"
#include "name.h" #include "name.h"
#include "v_text.h" #include "v_text.h"
#include "cache1d.h" #include "templates.h"
#include "filesystem/filesystem.h"
// MACROS ------------------------------------------------------------------ // MACROS ------------------------------------------------------------------
@ -544,13 +545,13 @@ bool FScanner::GetToken ()
{ {
TokenType = TK_UIntConst; TokenType = TK_UIntConst;
BigNumber = (int64_t)strtoull(String, &stopper, 0); BigNumber = (int64_t)strtoull(String, &stopper, 0);
Number = (int)clamp(BigNumber, 0, UINT_MAX); Number = (int)clamp<int64_t>(BigNumber, 0, UINT_MAX);
Float = (unsigned)Number; Float = (unsigned)Number;
} }
else else
{ {
BigNumber = strtoll(String, &stopper, 0); BigNumber = strtoll(String, &stopper, 0);
Number = (int)clamp(BigNumber, INT_MIN, INT_MAX); Number = (int)clamp<int64_t>(BigNumber, INT_MIN, INT_MAX);
Float = Number; Float = Number;
} }
} }
@ -652,7 +653,7 @@ bool FScanner::GetNumber ()
else else
{ {
BigNumber = strtoll(String, &stopper, 0); BigNumber = strtoll(String, &stopper, 0);
Number = (int)clamp(BigNumber, INT_MIN, INT_MAX); Number = (int)clamp<int64_t>(BigNumber, INT_MIN, INT_MAX);
if (*stopper != 0) if (*stopper != 0)
{ {
ScriptError ("SC_GetNumber: Bad numeric constant \"%s\".", String); ScriptError ("SC_GetNumber: Bad numeric constant \"%s\".", String);
@ -709,7 +710,7 @@ bool FScanner::CheckNumber ()
else else
{ {
BigNumber = strtoll (String, &stopper, 0); BigNumber = strtoll (String, &stopper, 0);
Number = (int)clamp(BigNumber, INT_MIN, INT_MAX); Number = (int)clamp<int64_t>(BigNumber, INT_MIN, INT_MAX);
if (*stopper != 0) if (*stopper != 0)
{ {
UnGet(); UnGet();

3
source/duke3d/src/demo.cpp
View file

@ -95,8 +95,7 @@ static int32_t G_OpenDemoRead(int32_t g_whichDemo) // 0 = mine
demofnptr = demofn; demofnptr = demofn;
} }
g_demo_recFilePtr = fopenFileReader(demofnptr, g_loadFromGroupOnly); if (!g_demo_recFilePtr.OpenFile(demofnptr))
if (!g_demo_recFilePtr.isOpen())
return 0; return 0;
Bassert(g_whichDemo >= 1); Bassert(g_whichDemo >= 1);

2
source/duke3d/src/demo.h
View file

@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define demo_h_ #define demo_h_
#include "compat.h" #include "compat.h"
#include "cache1d.h" #include "filesystem/filesystem.h"
BEGIN_DUKE_NS BEGIN_DUKE_NS

1
source/duke3d/src/gamevars.h
View file

@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "fix16.hpp" #include "fix16.hpp"
#include "gamedef.h" #include "gamedef.h"
#include "filesystem/filesystem.h"
BEGIN_DUKE_NS BEGIN_DUKE_NS

2
source/libsmackerdec/src/FileStream.cpp
View file

@ -18,7 +18,7 @@
*/ */
#include "FileStream.h" #include "FileStream.h"
#include "cache1d.h" #include "filesystem/filesystem.h"
#include <stdlib.h> #include <stdlib.h>
namespace SmackerCommon { namespace SmackerCommon {

3
source/rr/src/demo.cpp
View file

@ -95,8 +95,7 @@ static int32_t G_OpenDemoRead(int32_t g_whichDemo) // 0 = mine
demofnptr = demofn; demofnptr = demofn;
} }
g_demo_recFilePtr = fopenFileReader(demofnptr, g_loadFromGroupOnly); if (!g_demo_recFilePtr.OpenFile(demofnptr))
if (!g_demo_recFilePtr.isOpen())
return 0; return 0;
Bassert(g_whichDemo >= 1); Bassert(g_whichDemo >= 1);