LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-20 12:40:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed love.graphics.reset reverting the current font to nil and breaking love.graphics.print.

Browse Source
This commit is contained in:
Alex Szpakowski
2014-09-11 02:42:56 -03:00
parent 346aa7d839
commit f972c9923f
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Graphics.cpp
+6 -5
View File
@@ -615,6 +615,12 @@ Color Graphics::getBackgroundColor() const
void Graphics::setFont(Font *font) void Graphics::setFont(Font *font)
{ {
// Hack: the Lua-facing love.graphics.print function will set the current
// font if needed, but only on its first call... we want to make sure a nil
// font is never accidentally set (e.g. via love.graphics.reset.)
if (font == nullptr)
return;
DisplayState &state = states.back(); DisplayState &state = states.back();
state.font.set(font); state.font.set(font);
} }
@@ -1289,11 +1295,6 @@ void Graphics::pop()
{ {
DisplayState &newstate = states[states.size() - 2]; DisplayState &newstate = states[states.size() - 2];
// Hack: the Lua-facing love.graphics.print function will set the current
// font if needed, but only on its first call... we always want a font.
if (newstate.font.get() == nullptr)
newstate.font.set(states.back().font.get());
restoreStateChecked(newstate); restoreStateChecked(newstate);
// The last two states in the stack should be equal now. // The last two states in the stack should be equal now.