Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-29 17:38:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use uint32_t instead of char32_t

Browse Source
This commit is contained in:
Matt Penny
2020-02-11 00:48:07 -05:00
committed by Ethan Lee
parent e7252888b6
commit 4ccb48f440
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
desktop_version/src/Graphics.cpp
View File

@@ -133,7 +133,7 @@ void Graphics::init()
showmousecursor = true; showmousecursor = true;
} }
int Graphics::font_idx(char32_t ch) { int Graphics::font_idx(uint32_t ch) {
if (font_positions.size() > 0) { if (font_positions.size() > 0) {
std::map<int, int>::iterator iter = font_positions.find(ch); std::map<int, int>::iterator iter = font_positions.find(ch);
if (iter == font_positions.end()) { 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) { if (ch < 32) {
return 6; return 6;
} else { } else {

9
desktop_version/src/Graphics.h
View File

@@ -19,11 +19,6 @@
#include "GraphicsUtil.h" #include "GraphicsUtil.h"
#include "Screen.h" #include "Screen.h"
#if __cplusplus < 201103L // Pre-C++11
typedef uint32_t char32_t;
typedef uint16_t char16_t;
#endif
class map; class map;
class Graphics class Graphics
@@ -34,8 +29,8 @@ public:
GraphicsResources grphx; GraphicsResources grphx;
int bfontlen(char32_t ch); int bfontlen(uint32_t ch);
int font_idx(char32_t ch); int font_idx(uint32_t ch);
void Makebfont(); void Makebfont();