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

remove inlines

Browse Source
This commit is contained in:
scawful
2022-07-06 22:35:00 -04:00
parent 8378f6bf2d
commit 6e97649e2f
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/core/controller.h
View File

@@ -35,7 +35,7 @@ class Controller {
void CreateWindow(); void CreateWindow();
void CreateRenderer(); void CreateRenderer();
void CreateGuiContext() const; void CreateGuiContext() const;
inline void quit() { active_ = false; } void quit() { active_ = false; }
friend int ::main(int argc, char **argv); friend int ::main(int argc, char **argv);
struct sdl_deleter { struct sdl_deleter {

16
src/app/editor/overworld_editor.h
View File

@@ -33,22 +33,22 @@ class OverworldEditor {
void LoadBlockset(); void LoadBlockset();
void LoadGraphics(); void LoadGraphics();
app::zelda3::Overworld overworld_; zelda3::Overworld overworld_;
app::gfx::SNESPalette palette_; gfx::SNESPalette palette_;
app::gfx::TilePreset current_set_; gfx::TilePreset current_set_;
app::rom::ROM rom_; rom::ROM rom_;
app::gfx::Bitmap tile16_blockset_bmp_; gfx::Bitmap tile16_blockset_bmp_;
uchar *tile16_blockset_ptr_ = new uchar[1048576]; uchar *tile16_blockset_ptr_ = new uchar[1048576];
app::gfx::Bitmap current_gfx_bmp_; gfx::Bitmap current_gfx_bmp_;
uchar *current_gfx_ptr_ = new uchar[(128 * 512) / 2]; uchar *current_gfx_ptr_ = new uchar[(128 * 512) / 2];
app::gfx::Bitmap allgfxBitmap; gfx::Bitmap allgfxBitmap;
uchar *allGfx16Ptr = new uchar[(128 * 7136) / 2]; uchar *allGfx16Ptr = new uchar[(128 * 7136) / 2];
app::gfx::Bitmap mapblockset16Bitmap; gfx::Bitmap mapblockset16Bitmap;
std::unordered_map<unsigned int, SDL_Texture *> all_texture_sheet_; std::unordered_map<unsigned int, SDL_Texture *> all_texture_sheet_;

4
src/app/rom.h
View File

@@ -36,8 +36,8 @@ class ROM {
char* CreateAllGfxDataRaw(); char* CreateAllGfxDataRaw();
void CreateAllGraphicsData(uchar* allGfx16Ptr); void CreateAllGraphicsData(uchar* allGfx16Ptr);
inline uchar* data() { return current_rom_; } uchar* data() { return current_rom_; }
inline auto Renderer() { return sdl_renderer_; } auto Renderer() { return sdl_renderer_; }
const uchar* getTitle() const { return title; } const uchar* getTitle() const { return title; }
long getSize() const { return size_; } long getSize() const { return size_; }
char getVersion() const { return version_; } char getVersion() const { return version_; }

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

@@ -20,9 +20,9 @@ namespace zelda3 {
class Overworld { class Overworld {
public: public:
void Load(app::rom::ROM& rom, uchar* allGfxPtr); void Load(app::rom::ROM& rom, uchar* allGfxPtr);
inline auto GetTiles16() const { return tiles16; } auto GetTiles16() const { return tiles16; }
inline auto GetCurrentGfxSetPtr() { return currentOWgfx16Ptr; } auto GetCurrentGfxSetPtr() { return currentOWgfx16Ptr; }
inline auto GetMapBlockset16Ptr() { return mapblockset16; } auto GetMapBlockset16Ptr() { return mapblockset16; }
std::shared_ptr<uchar[]> overworldMapPointer; std::shared_ptr<uchar[]> overworldMapPointer;
gfx::Bitmap overworldMapBitmap; gfx::Bitmap overworldMapBitmap;