1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 01:59:43 +01:00

Replace utfcpp by UTF8.h in Editor.cpp

This commit is contained in:
Dav999-v 2023-02-23 04:13:15 +01:00 committed by Misa Elizabeth Kai
parent 393c5ac4fe
commit c5a48776c9

View file

@ -4,7 +4,6 @@
#include "Editor.h" #include "Editor.h"
#include <string> #include <string>
#include <utf8/unchecked.h>
#include "Constants.h" #include "Constants.h"
#include "CustomLevels.h" #include "CustomLevels.h"
@ -21,6 +20,7 @@
#include "Music.h" #include "Music.h"
#include "Screen.h" #include "Screen.h"
#include "Script.h" #include "Script.h"
#include "UTF8.h"
#include "UtilityClass.h" #include "UtilityClass.h"
#include "VFormat.h" #include "VFormat.h"
#include "Vlogging.h" #include "Vlogging.h"
@ -2292,7 +2292,7 @@ void editorinput(void)
ed.sby--; ed.sby--;
} }
key.keybuffer=ed.sb[ed.pagey+ed.sby]; key.keybuffer=ed.sb[ed.pagey+ed.sby];
ed.sbx = utf8::unchecked::distance(ed.sb[ed.pagey+ed.sby].begin(), ed.sb[ed.pagey+ed.sby].end()); ed.sbx = UTF8_total_codepoints(ed.sb[ed.pagey+ed.sby].c_str());
music.playef(11); music.playef(11);
} }
} }
@ -2382,7 +2382,7 @@ void editorinput(void)
}} }}
ed.sb[ed.pagey+ed.sby]=key.keybuffer; ed.sb[ed.pagey+ed.sby]=key.keybuffer;
ed.sbx = utf8::unchecked::distance(ed.sb[ed.pagey+ed.sby].begin(), ed.sb[ed.pagey+ed.sby].end()); ed.sbx = UTF8_total_codepoints(ed.sb[ed.pagey+ed.sby].c_str());
if(!game.press_map && !key.isDown(27)) game.mapheld=false; if(!game.press_map && !key.isDown(27)) game.mapheld=false;
if (!game.mapheld) if (!game.mapheld)
@ -2400,7 +2400,7 @@ void editorinput(void)
ed.sby--; ed.sby--;
} }
key.keybuffer=ed.sb[ed.pagey+ed.sby]; key.keybuffer=ed.sb[ed.pagey+ed.sby];
ed.sbx = utf8::unchecked::distance(ed.sb[ed.pagey+ed.sby].begin(), ed.sb[ed.pagey+ed.sby].end()); ed.sbx = UTF8_total_codepoints(ed.sb[ed.pagey+ed.sby].c_str());
} }
else else
{ {