mirror of
https://github.com/bsnes-emu/bsnes.git
synced 2025-08-31 00:00:12 +02:00
Update to v106r65 release.
byuu says: This synchronizes bsnes/higan with many recent internal nall changes. This will be the last WIP until I am situated in Japan. Apologies for the bugfixes that didn't get applied yet, I ran out of time.
This commit is contained in:
@@ -4,10 +4,8 @@
|
||||
|
||||
namespace nall { namespace Decode {
|
||||
|
||||
inline auto LZSA(const void* data) -> vector<uint8_t> {
|
||||
inline auto LZSA(array_view<uint8_t> input) -> vector<uint8_t> {
|
||||
vector<uint8_t> output;
|
||||
|
||||
auto input = (const uint8_t*)data;
|
||||
uint index = 0;
|
||||
|
||||
uint size = 0;
|
||||
|
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <nall/filemap.hpp>
|
||||
#include <nall/file-map.hpp>
|
||||
#include <nall/string.hpp>
|
||||
#include <nall/vector.hpp>
|
||||
#include <nall/decode/inflate.hpp>
|
||||
@@ -24,7 +24,7 @@ struct ZIP {
|
||||
|
||||
auto open(const string& filename) -> bool {
|
||||
close();
|
||||
if(fm.open(filename, filemap::mode::read) == false) return false;
|
||||
if(fm.open(filename, file::mode::read) == false) return false;
|
||||
if(open(fm.data(), fm.size()) == false) {
|
||||
fm.close();
|
||||
return false;
|
||||
@@ -115,11 +115,11 @@ struct ZIP {
|
||||
}
|
||||
|
||||
auto close() -> void {
|
||||
if(fm.open()) fm.close();
|
||||
if(fm) fm.close();
|
||||
}
|
||||
|
||||
protected:
|
||||
filemap fm;
|
||||
file_map fm;
|
||||
const uint8_t* filedata;
|
||||
uint filesize;
|
||||
|
||||
|
Reference in New Issue
Block a user