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

DrawOverworldSprites experiment flag

Browse Source
This commit is contained in:
scawful
2023-11-11 19:04:48 -05:00
parent a9c9a0fad0
commit 0cefa777cb
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/zelda3/overworld.cc
View File

@@ -139,8 +139,10 @@ absl::Status Overworld::Load(ROM &rom) {
FetchLargeMaps(); FetchLargeMaps();
LoadEntrances(); LoadEntrances();
// Load Sprites will go here.
RETURN_IF_ERROR(LoadOverworldMaps()) RETURN_IF_ERROR(LoadOverworldMaps())
if (flags().kDrawOverworldSprites) {
LoadSprites();
}
is_loaded_ = true; is_loaded_ = true;
return absl::OkStatus(); return absl::OkStatus();

5
src/app/zelda3/overworld.h
View File

@@ -9,6 +9,7 @@
#include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_map.h"
#include "absl/status/status.h" #include "absl/status/status.h"
#include "app/core/common.h"
#include "app/core/constants.h" #include "app/core/constants.h"
#include "app/gfx/bitmap.h" #include "app/gfx/bitmap.h"
#include "app/gfx/snes_tile.h" #include "app/gfx/snes_tile.h"
@@ -178,7 +179,7 @@ struct MapData {
std::vector<uint8_t> lowData; std::vector<uint8_t> lowData;
}; };
class Overworld : public SharedROM { class Overworld : public SharedROM, public core::ExperimentFlags {
public: public:
absl::Status Load(ROM &rom); absl::Status Load(ROM &rom);
OWBlockset &GetMapTiles(int world_type); OWBlockset &GetMapTiles(int world_type);
@@ -194,7 +195,7 @@ class Overworld : public SharedROM {
auto AreaGraphics() const { auto AreaGraphics() const {
return overworld_maps_[current_map_].AreaGraphics(); return overworld_maps_[current_map_].AreaGraphics();
} }
auto Entrances() const { return all_entrances_; } auto &Entrances() { return all_entrances_; }
auto AreaPalette() const { auto AreaPalette() const {
return overworld_maps_[current_map_].AreaPalette(); return overworld_maps_[current_map_].AreaPalette();
} }