mirror of
https://github.com/AquariaOSE/Aquaria.git
synced 2024-12-27 15:15:47 +00:00
6dc1c1e8d1
- HTTP networking support, mods can be downloaded via the builtin downloader. All network activity runs in a seperate thread, which is started as soon as any network activity is requested. - The master server is hard-coded to fg.wzff.de/aqmods/ if not specified otherwise; this setting can be overridden in the config file. - The mod selector screen is now a grid-view for much better navigation; also works with joystick. - VFS code is functionally similar to the old molebox-packed release for win32. The game could also have its data shipped in a Zip file or any other kind of archive. - It is still possible to build without VFS support, but then the mod downloader and soft-patching will not be available. The full commit history can be found here: https://github.com/fgenesis/Aquaria_clean/compare/master...vfs The most important commit messages follow: [...] This replaces all std::ifstream with InStream, and fopen(), ... with vfopen(), ... Some code is #ifdef'd for better performance and less memory-copying. VFILE is defined to whatever type of file is in use: - FILE if BBGE_BUILD_VFS is not defined - tttvfs::VFSFile if it is. Other changes: - [un]packFile() is now unused and obsolete. That code has not been adjusted to use VFILE. - glpng can now load from a memory buffer. - TinyXML uses the VFS for reading operations now. - The rather clunky binary stream loading of glfont2 got replaced with ByteBuffer, which gets its data in one block (necessary to use the VFS without implementing a somewhat STL-compliant std::ifstream replacement.) ------------- Implement loading mods from zip files. ------------- Implement soft-patching game data files. (Replacing textures/audio/... on the fly) ------------- Misc bits: - Extended GUI focus handling a bit - Fixed weirdness in texture loading... not sure but this seems more correct to me. Actually, considering that the texture will have its native size after restarting the game, the lines removed with this commit seem pretty useless.
55 lines
1.3 KiB
C++
55 lines
1.3 KiB
C++
#ifndef FILE_API_H
|
|
#define FILE_API_H
|
|
|
|
// TODO: need VFS output functions?
|
|
|
|
#ifdef BBGE_BUILD_VFS
|
|
|
|
#include "ttvfs/VFS.h"
|
|
#include <sstream>
|
|
|
|
extern ttvfs::VFSHelper vfs;
|
|
typedef ttvfs::VFSFile VFILE;
|
|
|
|
|
|
VFILE *vfopen(const char *fn, const char *mode);
|
|
size_t vfread(void *ptr, size_t size, size_t count, VFILE *vf);
|
|
int vfclose(VFILE *vf);
|
|
size_t vfwrite(const void *ptr, size_t size, size_t count, VFILE *vf);
|
|
int vfseek(VFILE *vf, long int offset, int origin);
|
|
char *vfgets(char *str, int num, VFILE *vf);
|
|
void vfclear(VFILE *vf);
|
|
long int vftell(VFILE *vf);
|
|
|
|
// This class is a minimal adapter to support STL-like read-only file streams for VFS files, using std::istringstream.
|
|
class InStream : public std::istringstream
|
|
{
|
|
public:
|
|
InStream(const char *fn);
|
|
InStream(const std::string& fn);
|
|
bool open(const char *fn);
|
|
inline bool is_open() { return good(); }
|
|
inline void close() {}
|
|
private:
|
|
void _init(const char *fn);
|
|
};
|
|
|
|
#else // BBGE_BUILD_VFS
|
|
|
|
#include <stdio.h>
|
|
#include <fstream>
|
|
typedef std::ifstream InStream;
|
|
typedef FILE VFILE;
|
|
#define vfopen fopen
|
|
#define vfread fread
|
|
#define vfclose fclose
|
|
#define vfwrite fwrite
|
|
#define vfseek fseek
|
|
#define vfgets fgets
|
|
#define vftell ftell
|
|
#define vfclear
|
|
|
|
#endif // BBGE_BUILD_VFS
|
|
|
|
|
|
#endif // FILE_API_H
|