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

Refactor Rom class to improve code organization and remove unused dependencies

Browse Source
This commit is contained in:
scawful
2024-10-11 10:46:06 -04:00
parent 96d46dc93d
commit b22da9edb4
2 changed files with 16 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/rom.cc
View File

@@ -8,20 +8,15 @@
#include <ctime> #include <ctime>
#include <filesystem> #include <filesystem>
#include <fstream> #include <fstream>
#include <stack>
#include <string> #include <string>
#include <unordered_map>
#include <utility>
#include <vector> #include <vector>
#include "absl/container/flat_hash_map.h"
#include "absl/status/status.h" #include "absl/status/status.h"
#include "absl/status/statusor.h" #include "absl/status/statusor.h"
#include "absl/strings/str_cat.h" #include "absl/strings/str_cat.h"
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
#include "app/core/constants.h" #include "app/core/constants.h"
#include "app/core/platform/renderer.h" #include "app/core/platform/renderer.h"
#include "app/gfx/bitmap.h"
#include "app/gfx/compression.h" #include "app/gfx/compression.h"
#include "app/gfx/snes_color.h" #include "app/gfx/snes_color.h"
#include "app/gfx/snes_palette.h" #include "app/gfx/snes_palette.h"
@@ -212,8 +207,8 @@ absl::Status Rom::LoadZelda3() {
constexpr size_t kHeaderSize = 0x200; // 512 bytes constexpr size_t kHeaderSize = 0x200; // 512 bytes
if (size_ % kBaseRomSize == kHeaderSize) { if (size_ % kBaseRomSize == kHeaderSize) {
auto header = auto header =
std::vector<uchar>(rom_data_.begin(), rom_data_.begin() + 0x200); std::vector<uchar>(rom_data_.begin(), rom_data_.begin() + kHeaderSize);
rom_data_.erase(rom_data_.begin(), rom_data_.begin() + 0x200); rom_data_.erase(rom_data_.begin(), rom_data_.begin() + kHeaderSize);
size_ -= 0x200; size_ -= 0x200;
} }

10
src/app/rom.h
View File

@@ -3,36 +3,26 @@
#include <SDL.h> #include <SDL.h>
#include <algorithm>
#include <chrono>
#include <cstddef> #include <cstddef>
#include <cstdint> #include <cstdint>
#include <cstring> #include <cstring>
#include <ctime> #include <ctime>
#include <filesystem>
#include <fstream>
#include <functional>
#include <iostream> #include <iostream>
#include <map> #include <map>
#include <memory> #include <memory>
#include <stack>
#include <string> #include <string>
#include <unordered_map>
#include <variant> #include <variant>
#include <vector> #include <vector>
#include "absl/container/flat_hash_map.h"
#include "absl/status/status.h" #include "absl/status/status.h"
#include "absl/status/statusor.h" #include "absl/status/statusor.h"
#include "absl/strings/match.h" #include "absl/strings/match.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_format.h" #include "absl/strings/str_format.h"
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
#include "app/core/common.h" #include "app/core/common.h"
#include "app/core/constants.h" #include "app/core/constants.h"
#include "app/core/labeling.h" #include "app/core/labeling.h"
#include "app/gfx/bitmap.h" #include "app/gfx/bitmap.h"
#include "app/gfx/compression.h"
#include "app/gfx/snes_palette.h" #include "app/gfx/snes_palette.h"
#include "app/gfx/snes_tile.h" #include "app/gfx/snes_tile.h"