mirror of
https://github.com/thunderbrewhq/thunderbrew
synced 2025-07-24 17:41:13 +03:00
Compare commits
6 Commits
f1c1e225ba
...
0601ee96e9
Author | SHA1 | Date | |
---|---|---|---|
![]() |
0601ee96e9 | ||
![]() |
13ab4a6c29 | ||
![]() |
e3b6b932da | ||
![]() |
f893467b7c | ||
![]() |
d6fd888418 | ||
![]() |
f1d1dad08b |
2
lib/bc
2
lib/bc
@ -1 +1 @@
|
||||
Subproject commit e674242b473f6bbd4cbffbe493ba53ca70c6ae20
|
||||
Subproject commit 87a8d3f6432a82b794aecd0e7c0813ace2ed97bd
|
@ -1 +1 @@
|
||||
Subproject commit 438c900ff50b2dff0d8f7d9ff711051a3c83cbac
|
||||
Subproject commit 1a5c1bdd315a2fde008f241455e6d7b2d399bdd4
|
@ -1 +1 @@
|
||||
Subproject commit 22e9686d64db308a9b480ecf6e1fba43c2563315
|
||||
Subproject commit 0d64830c2d5d0ec719687c66e27dee0dea138c2f
|
@ -1 +1 @@
|
||||
Subproject commit 98bc6a59bcf1016b9f85239e6918e595ca0331c0
|
||||
Subproject commit fd78ba351b8f87a8ce68876a7e5246ea968ab91c
|
@ -22,7 +22,7 @@
|
||||
#include <storm/Error.hpp>
|
||||
#include <storm/Log.hpp>
|
||||
#include <bc/os/Path.hpp>
|
||||
#include <bc/file/File.hpp>
|
||||
#include <bc/File.hpp>
|
||||
|
||||
|
||||
CVar* Client::g_accountNameVar;
|
||||
@ -46,7 +46,8 @@ static char* s_localeArray[12] = {
|
||||
|
||||
|
||||
int32_t CCommand_ReloadUI(const char*, const char*) {
|
||||
// TODO:
|
||||
CGlueMgr::m_reload = 1;
|
||||
// CGGameUI::Reload();
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
@ -209,7 +209,7 @@ int32_t CVar::Load(HOSFILE file) {
|
||||
auto grown = 0x1fff < size;
|
||||
|
||||
int32_t result = 0;
|
||||
size_t bytesRead = 0;
|
||||
uint32_t bytesRead = 0;
|
||||
|
||||
if (OsReadFile(file, data, size, &bytesRead) == 0) {
|
||||
result = 0;
|
||||
|
@ -5,7 +5,7 @@
|
||||
#include <storm/Error.hpp>
|
||||
#include <storm/Memory.hpp>
|
||||
#include <storm/String.hpp>
|
||||
#include <bc/file/File.hpp>
|
||||
#include <bc/File.hpp>
|
||||
#include "util/Filesystem.hpp"
|
||||
|
||||
static char s_basepath[STORM_MAX_PATH] = { 0 };
|
||||
@ -150,7 +150,9 @@ int32_t SFile::OpenEx(SArchive* archive, const char* filename, uint32_t flags, S
|
||||
void* filehandle;
|
||||
HANDLE handle;
|
||||
|
||||
uint32_t openflags = BC_FILE_OPEN_MUST_EXIST | BC_FILE_OPEN_SHARE_READ | BC_FILE_OPEN_READ;
|
||||
using Mode = Blizzard::File::Mode;
|
||||
|
||||
uint32_t openflags = Mode::mustexist | Mode::shareread | Mode::read;
|
||||
Blizzard::File::StreamRecord* stream;
|
||||
|
||||
// Attempt to open plain file first
|
||||
@ -212,7 +214,10 @@ int32_t SFile::Read(SFile* file, void* buffer, size_t bytestoread, size_t* bytes
|
||||
switch (file->m_type) {
|
||||
case SFILE_PLAIN: {
|
||||
auto stream = reinterpret_cast<Blizzard::File::StreamRecord*>(file->m_handle);
|
||||
Blizzard::File::Read(stream, buffer, bytestoread, bytesread);
|
||||
int32_t count = static_cast<int32_t>(bytestoread);
|
||||
Blizzard::File::Read(stream, buffer, &count);
|
||||
if (bytesread)
|
||||
*bytesread = (count >= 0) ? static_cast<size_t>(count) : 0;
|
||||
return 1;
|
||||
}
|
||||
case SFILE_PAQ: {
|
||||
|
Loading…
Reference in New Issue
Block a user