Skip to content

Commit

Permalink
pretend to fix etternagame#1062
Browse files Browse the repository at this point in the history
  • Loading branch information
poco0317 committed Oct 22, 2022
1 parent 793caf2 commit f768506
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
6 changes: 6 additions & 0 deletions src/Etterna/Actor/Gameplay/NoteDisplay.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include "RageUtil/Graphics/RageTexture.h"
#include "Etterna/Actor/Base/Sprite.h"
#include "Etterna/Models/StepsAndStyles/Style.h"
#include "RageUtil/Graphics/RageTextureManager.h"

#include <utility>
#include <algorithm>
Expand Down Expand Up @@ -233,10 +234,15 @@ MakeNoteResource(const std::string& sButton,
NOTESKIN->SetPlayerNumber(pn);
NOTESKIN->SetGameController(gc);

auto tmp = TEXTUREMAN->m_Prefs.m_iMaxTextureResolution;
TEXTUREMAN->m_Prefs.m_iMaxTextureResolution = 1048576;

pRes->m_pActor =
NOTESKIN->LoadActor(sButton, sElement, nullptr, bSpriteOnly, Color);
ASSERT(pRes->m_pActor != NULL);

TEXTUREMAN->m_Prefs.m_iMaxTextureResolution = tmp;

g_NoteResource[Color][nsap] = pRes;
it = g_NoteResource[Color].find(nsap);
}
Expand Down
3 changes: 1 addition & 2 deletions src/RageUtil/Graphics/RageTextureManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class RageTextureManager
RageTextureID GetDefaultTextureID();
RageTextureID GetScreenTextureID();
RageSurface* GetScreenSurface();

RageTextureManagerPrefs m_Prefs;
private:
void DeleteTexture(RageTexture* t);
enum GCType
Expand All @@ -104,7 +104,6 @@ class RageTextureManager
void GarbageCollect(GCType type);
RageTexture* LoadTextureInternal(RageTextureID ID);

RageTextureManagerPrefs m_Prefs;
int m_iNoWarnAboutOddDimensions{ 0 };
RageTextureID::TexPolicy m_TexturePolicy{ RageTextureID::TEX_DEFAULT };
};
Expand Down

0 comments on commit f768506

Please sign in to comment.