mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2024-12-22 09:39:43 +01:00
Use uint32_t instead of char32_t
This commit is contained in:
parent
e7252888b6
commit
4ccb48f440
2 changed files with 4 additions and 9 deletions
|
@ -133,7 +133,7 @@ void Graphics::init()
|
|||
showmousecursor = true;
|
||||
}
|
||||
|
||||
int Graphics::font_idx(char32_t ch) {
|
||||
int Graphics::font_idx(uint32_t ch) {
|
||||
if (font_positions.size() > 0) {
|
||||
std::map<int, int>::iterator iter = font_positions.find(ch);
|
||||
if (iter == font_positions.end()) {
|
||||
|
@ -194,7 +194,7 @@ void Graphics::Makebfont()
|
|||
}
|
||||
}
|
||||
|
||||
int Graphics::bfontlen(char32_t ch) {
|
||||
int Graphics::bfontlen(uint32_t ch) {
|
||||
if (ch < 32) {
|
||||
return 6;
|
||||
} else {
|
||||
|
|
|
@ -19,11 +19,6 @@
|
|||
#include "GraphicsUtil.h"
|
||||
#include "Screen.h"
|
||||
|
||||
#if __cplusplus < 201103L // Pre-C++11
|
||||
typedef uint32_t char32_t;
|
||||
typedef uint16_t char16_t;
|
||||
#endif
|
||||
|
||||
class map;
|
||||
|
||||
class Graphics
|
||||
|
@ -34,8 +29,8 @@ public:
|
|||
|
||||
GraphicsResources grphx;
|
||||
|
||||
int bfontlen(char32_t ch);
|
||||
int font_idx(char32_t ch);
|
||||
int bfontlen(uint32_t ch);
|
||||
int font_idx(uint32_t ch);
|
||||
|
||||
void Makebfont();
|
||||
|
||||
|
|
Loading…
Reference in a new issue