mirror of
https://github.com/reactos/reactos.git
synced 2025-08-06 23:02:59 +00:00
- Proper fix for unicode/ansi compilation ability of 3dtext (at least to fix compiler warning preventing trunk to compile), however one problem remains:
glCallLists(_tcslen(text), GL_UNSIGNED_SHORT, text); // Draws The Display List Text GL_UNSIGNED_SHORT should be substituted by GL_UNSIGNED_BYTE if compiling as ANSI. svn path=/trunk/; revision=29971
This commit is contained in:
parent
115362a89d
commit
e57b602266
1 changed files with 3 additions and 3 deletions
|
@ -77,14 +77,14 @@ GLvoid KillFont(GLvoid) // Delete The Font
|
||||||
glDeleteLists(base, 256); // Delete All 256 Characters
|
glDeleteLists(base, 256); // Delete All 256 Characters
|
||||||
}
|
}
|
||||||
|
|
||||||
GLvoid glPrint(LPWSTR text) // Custom GL "Print" Routine
|
GLvoid glPrint(LPTSTR text) // Custom GL "Print" Routine
|
||||||
{
|
{
|
||||||
if (text == NULL) // If There's No Text
|
if (text == NULL) // If There's No Text
|
||||||
return; // Do Nothing
|
return; // Do Nothing
|
||||||
|
|
||||||
glPushAttrib(GL_LIST_BIT); // Pushes The Display List Bits
|
glPushAttrib(GL_LIST_BIT); // Pushes The Display List Bits
|
||||||
glListBase(base); // Sets The Base Character to 32
|
glListBase(base); // Sets The Base Character to 32
|
||||||
glCallLists(wcslen(text), GL_UNSIGNED_SHORT, text); // Draws The Display List Text
|
glCallLists(_tcslen(text), GL_UNSIGNED_SHORT, text); // Draws The Display List Text
|
||||||
glPopAttrib(); // Pops The Display List Bits
|
glPopAttrib(); // Pops The Display List Bits
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue