scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update filename type passed to LoadFromFile

Browse Source
This commit is contained in:
scawful
2024-05-28 13:25:30 -04:00
parent a9787b7055
commit 5e389b634c
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/rom.cc
View File

@@ -126,14 +126,13 @@ absl::Status Rom::LoadAllGraphicsData() {
return absl::OkStatus(); return absl::OkStatus();
} }
absl::Status Rom::LoadFromFile(const absl::string_view& filename, absl::Status Rom::LoadFromFile(const std::string& filename, bool z3_load) {
bool z3_load) {
if (filename.empty()) { if (filename.empty()) {
return absl::InvalidArgumentError( return absl::InvalidArgumentError(
"Could not load ROM: parameter `filename` is empty."); "Could not load ROM: parameter `filename` is empty.");
} }
// Set filename // Set filename
filename_ = filename.data(); filename_ = filename;
// Open file // Open file
std::ifstream file(filename_, std::ios::binary); std::ifstream file(filename_, std::ios::binary);

3
src/app/rom.h
View File

@@ -171,8 +171,7 @@ class Rom : public core::ExperimentFlags {
* @param z3_load Whether to load data specific to Zelda 3. * @param z3_load Whether to load data specific to Zelda 3.
* *
*/ */
absl::Status LoadFromFile(const absl::string_view& filename, absl::Status LoadFromFile(const std::string& filename, bool z3_load = true);
bool z3_load = true);
absl::Status LoadFromPointer(uchar* data, size_t length); absl::Status LoadFromPointer(uchar* data, size_t length);
absl::Status LoadFromBytes(const Bytes& data); absl::Status LoadFromBytes(const Bytes& data);