Skip to content

Commit

Permalink
Revert "Fixed: Fatal error when a font is not set"
Browse files Browse the repository at this point in the history
This reverts commit 5e2f924.

Attempting to perform any of these operations without a currently
active font is indeed a logic error. Subverting the fatal error is
not a solution.
  • Loading branch information
danij-deng committed Dec 6, 2012
1 parent 7ae765a commit 62454e1
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions doomsday/engine/src/render/rend_font.c
Expand Up @@ -495,16 +495,11 @@ static int textFragmentWidth(const char* fragment)
const char* ch;
unsigned char c;

// Cannot determine height without a current font.
if(!fr.fontNum) return 0;

/*
if(fr.fontNum == 0)
{
Con_Error("textFragmentHeight: Cannot determine height without a current font.");
exit(1);
}
*/

// Just add them together.
len = strlen(fragment);
Expand All @@ -527,14 +522,11 @@ static int textFragmentHeight(const char* fragment)
size_t len;
uint i;

if(!fr.fontNum) return 0;

/*
if(fr.fontNum == 0)
{
Con_Error("textFragmentHeight: Cannot determine height without a current font.");
exit(1);
}*/
}

// Find the greatest height.
i = 0;
Expand Down

0 comments on commit 62454e1

Please sign in to comment.