matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move TPT's icons to the (real) Private Use Area of the unicode

Browse Source
This commit is contained in:
mniip 2018-05-01 07:01:56 +03:00
parent b8c5e94a41
commit 833383b121
15 changed files with 146 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/font.h
View File

@ -280,6 +280,7 @@ unsigned short font_ptrs[] = {
0x06FE, 0x070E, 0x071B, 0x0728, 0x0738, 0x0745, 0x0758, 0x0768,
0x0778, 0x0788, 0x0798, 0x07A5, 0x07B5, 0x07C2, 0x07D2, 0x07E2,
0x07F5, 0x0805, 0x0815, 0x0825, 0x0832, 0x0839, 0x0846, 0x0859,
0x0866, 0x087F, 0x08A4, 0x08C9, 0x08E8, 0x090D, 0x092C, 0x094B,
0x096A, 0x0989, 0x09A8, 0x09C7, 0x09E6, 0x0A0B, 0x0A1E, 0x0A3D,
0x0A5C, 0x0A7B, 0x0A9A, 0x0AB3, 0x0AD5, 0x0AF7, 0x0B1C, 0x0B41,
@ -300,7 +301,8 @@ unsigned short font_ptrs[] = {
0x155E,
};
unsigned int font_ranges[][2] = {
{ 0x000000, 0x0000FF },
{ 0x000000, 0x00007F },
{ 0x00E000, 0x00E07F },
{ 0x00FFFD, 0x00FFFD },
{ 0, 0 },
};

178
src/graphics/Graphics.cpp
View File

@ -803,262 +803,262 @@ void Graphics::draw_icon(int x, int y, Icon icon, unsigned char alpha, bool inve
{
case IconOpen:
if(invert)
drawchar(x, y, 0x81, 0, 0, 0, alpha);
drawchar(x, y, 0xE001, 0, 0, 0, alpha);
else
drawchar(x, y, 0x81, 255, 255, 255, alpha);
drawchar(x, y, 0xE001, 255, 255, 255, alpha);
break;
case IconReload:
if(invert)
drawchar(x, y, 0x91, 0, 0, 0, alpha);
drawchar(x, y, 0xE011, 0, 0, 0, alpha);
else
drawchar(x, y, 0x91, 255, 255, 255, alpha);
drawchar(x, y, 0xE011, 255, 255, 255, alpha);
break;
case IconSave:
if(invert)
drawchar(x, y, 0x82, 0, 0, 0, alpha);
drawchar(x, y, 0xE002, 0, 0, 0, alpha);
else
drawchar(x, y, 0x82, 255, 255, 255, alpha);
drawchar(x, y, 0xE002, 255, 255, 255, alpha);
break;
case IconVoteUp:
if(invert)
{
drawchar(x-11, y+1, 0xCB, 0, 100, 0, alpha);
drawchar(x-11, y+1, 0xE04B, 0, 100, 0, alpha);
drawtext(x+2, y+1, "Vote", 0, 100, 0, alpha);
}
else
{
drawchar(x-11, y+1, 0xCB, 0, 187, 18, alpha);
drawchar(x-11, y+1, 0xE04B, 0, 187, 18, alpha);
drawtext(x+2, y+1, "Vote", 0, 187, 18, alpha);
}
break;
case IconVoteDown:
if(invert)
drawchar(x, y, 0xCA, 100, 10, 0, alpha);
drawchar(x, y, 0xE04A, 100, 10, 0, alpha);
else
drawchar(x, y, 0xCA, 187, 40, 0, alpha);
drawchar(x, y, 0xE04A, 187, 40, 0, alpha);
break;
case IconTag:
if(invert)
drawchar(x, y, 0x83, 0, 0, 0, alpha);
drawchar(x, y, 0xE003, 0, 0, 0, alpha);
else
drawchar(x, y, 0x83, 255, 255, 255, alpha);
drawchar(x, y, 0xE003, 255, 255, 255, alpha);
break;
case IconNew:
if(invert)
drawchar(x, y, 0x92, 0, 0, 0, alpha);
drawchar(x, y, 0xE012, 0, 0, 0, alpha);
else
drawchar(x, y, 0x92, 255, 255, 255, alpha);
drawchar(x, y, 0xE012, 255, 255, 255, alpha);
break;
case IconLogin:
if(invert)
drawchar(x, y+1, 0x84, 0, 0, 0, alpha);
drawchar(x, y+1, 0xE004, 0, 0, 0, alpha);
else
drawchar(x, y+1, 0x84, 255, 255, 255, alpha);
drawchar(x, y+1, 0xE004, 255, 255, 255, alpha);
break;
case IconSimulationSettings:
if(invert)
drawchar(x, y+1, 0xCF, 0, 0, 0, alpha);
drawchar(x, y+1, 0xE04F, 0, 0, 0, alpha);
else
drawchar(x, y+1, 0xCF, 255, 255, 255, alpha);
drawchar(x, y+1, 0xE04F, 255, 255, 255, alpha);
break;
case IconRenderSettings:
if(invert)
{
drawchar(x, y+1, 0xD8, 255, 0, 0, alpha);
drawchar(x, y+1, 0xD9, 0, 255, 0, alpha);
drawchar(x, y+1, 0xDA, 0, 0, 255, alpha);
drawchar(x, y+1, 0xE058, 255, 0, 0, alpha);
drawchar(x, y+1, 0xE059, 0, 255, 0, alpha);
drawchar(x, y+1, 0xE05A, 0, 0, 255, alpha);
}
else
{
addchar(x, y+1, 0xD8, 255, 0, 0, alpha);
addchar(x, y+1, 0xD9, 0, 255, 0, alpha);
addchar(x, y+1, 0xDA, 0, 0, 255, alpha);
addchar(x, y+1, 0xE058, 255, 0, 0, alpha);
addchar(x, y+1, 0xE059, 0, 255, 0, alpha);
addchar(x, y+1, 0xE05A, 0, 0, 255, alpha);
}
break;
case IconPause:
if(invert)
drawchar(x, y, 0x90, 0, 0, 0, alpha);
drawchar(x, y, 0xE010, 0, 0, 0, alpha);
else
drawchar(x, y, 0x90, 255, 255, 255, alpha);
drawchar(x, y, 0xE010, 255, 255, 255, alpha);
break;
case IconFavourite:
if(invert)
drawchar(x, y, 0xCC, 100, 80, 32, alpha);
drawchar(x, y, 0xE04C, 100, 80, 32, alpha);
else
drawchar(x, y, 0xCC, 192, 160, 64, alpha);
drawchar(x, y, 0xE04C, 192, 160, 64, alpha);
break;
case IconReport:
if(invert)
drawchar(x, y, 0xE3, 140, 140, 0, alpha);
drawchar(x, y, 0xE063, 140, 140, 0, alpha);
else
drawchar(x, y, 0xE3, 255, 255, 0, alpha);
drawchar(x, y, 0xE063, 255, 255, 0, alpha);
break;
case IconUsername:
if(invert)
{
drawchar(x, y, 0x8B, 32, 64, 128, alpha);
drawchar(x, y, 0x8A, 0, 0, 0, alpha);
drawchar(x, y, 0xE00B, 32, 64, 128, alpha);
drawchar(x, y, 0xE00A, 0, 0, 0, alpha);
}
else
{
drawchar(x, y, 0x8B, 32, 64, 128, alpha);
drawchar(x, y, 0x8A, 255, 255, 255, alpha);
drawchar(x, y, 0xE00B, 32, 64, 128, alpha);
drawchar(x, y, 0xE00A, 255, 255, 255, alpha);
}
break;
case IconPassword:
if(invert)
{
drawchar(x, y, 0x8C, 160, 144, 32, alpha);
drawchar(x, y, 0x84, 0, 0, 0, alpha);
drawchar(x, y, 0xE00C, 160, 144, 32, alpha);
drawchar(x, y, 0xE004, 0, 0, 0, alpha);
}
else
{
drawchar(x, y, 0x8C, 160, 144, 32, alpha);
drawchar(x, y, 0x84, 255, 255, 255, alpha);
drawchar(x, y, 0xE00C, 160, 144, 32, alpha);
drawchar(x, y, 0xE004, 255, 255, 255, alpha);
}
break;
case IconClose:
if(invert)
drawchar(x, y, 0xAA, 20, 20, 20, alpha);
drawchar(x, y, 0xE02A, 20, 20, 20, alpha);
else
drawchar(x, y, 0xAA, 230, 230, 230, alpha);
drawchar(x, y, 0xE02A, 230, 230, 230, alpha);
break;
case IconVoteSort:
if (invert)
{
drawchar(x, y, 0xA9, 44, 48, 32, alpha);
drawchar(x, y, 0xA8, 32, 44, 32, alpha);
drawchar(x, y, 0xA7, 128, 128, 128, alpha);
drawchar(x, y, 0xE029, 44, 48, 32, alpha);
drawchar(x, y, 0xE028, 32, 44, 32, alpha);
drawchar(x, y, 0xE027, 128, 128, 128, alpha);
}
else
{
drawchar(x, y, 0xA9, 144, 48, 32, alpha);
drawchar(x, y, 0xA8, 32, 144, 32, alpha);
drawchar(x, y, 0xA7, 255, 255, 255, alpha);
drawchar(x, y, 0xE029, 144, 48, 32, alpha);
drawchar(x, y, 0xE028, 32, 144, 32, alpha);
drawchar(x, y, 0xE027, 255, 255, 255, alpha);
}
break;
case IconDateSort:
if (invert)
{
drawchar(x, y, 0xA6, 32, 32, 32, alpha);
drawchar(x, y, 0xE026, 32, 32, 32, alpha);
}
else
{
drawchar(x, y, 0xA6, 255, 255, 255, alpha);
drawchar(x, y, 0xE026, 255, 255, 255, alpha);
}
break;
case IconMyOwn:
if (invert)
{
drawchar(x, y, 0x94, 192, 160, 64, alpha);
drawchar(x, y, 0x93, 32, 32, 32, alpha);
drawchar(x, y, 0xE014, 192, 160, 64, alpha);
drawchar(x, y, 0xE013, 32, 32, 32, alpha);
}
else
{
drawchar(x, y, 0x94, 192, 160, 64, alpha);
drawchar(x, y, 0x93, 255, 255, 255, alpha);
drawchar(x, y, 0xE014, 192, 160, 64, alpha);
drawchar(x, y, 0xE013, 255, 255, 255, alpha);
}
break;
case IconSearch:
drawchar(x, y, 0x8E, 30, 30, 180, alpha);
drawchar(x, y, 0x8F, 255, 255, 255, alpha);
drawchar(x, y, 0xE00E, 30, 30, 180, alpha);
drawchar(x, y, 0xE00F, 255, 255, 255, alpha);
break;
case IconDelete:
if(invert)
{
drawchar(x, y, 0x86, 159, 47, 31, alpha);
drawchar(x, y, 0x85, 0, 0, 0, alpha);
drawchar(x, y, 0xE006, 159, 47, 31, alpha);
drawchar(x, y, 0xE005, 0, 0, 0, alpha);
}
else
{
drawchar(x, y, 0x86, 159, 47, 31, alpha);
drawchar(x, y, 0x85, 255, 255, 255, alpha);
drawchar(x, y, 0xE006, 159, 47, 31, alpha);
drawchar(x, y, 0xE005, 255, 255, 255, alpha);
}
break;
case IconAdd:
if(invert)
{
drawchar(x, y, 0x86, 32, 144, 32, alpha);
drawchar(x, y, 0x89, 0, 0, 0, alpha);
drawchar(x, y, 0xE006, 32, 144, 32, alpha);
drawchar(x, y, 0xE009, 0, 0, 0, alpha);
}
else
{
drawchar(x, y, 0x86, 32, 144, 32, alpha);
drawchar(x, y, 0x89, 255, 255, 255, alpha);
drawchar(x, y, 0xE006, 32, 144, 32, alpha);
drawchar(x, y, 0xE009, 255, 255, 255, alpha);
}
break;
case IconVelocity:
drawchar(x+1, y, 0x98, 128, 160, 255, alpha);
drawchar(x+1, y, 0xE018, 128, 160, 255, alpha);
break;
case IconPressure:
if(invert)
drawchar(x+1, y+1, 0x99, 180, 160, 16, alpha);
drawchar(x+1, y+1, 0xE019, 180, 160, 16, alpha);
else
drawchar(x+1, y+1, 0x99, 255, 212, 32, alpha);
drawchar(x+1, y+1, 0xE019, 255, 212, 32, alpha);
break;
case IconPersistant:
if(invert)
drawchar(x+1, y+1, 0x9A, 20, 20, 20, alpha);
drawchar(x+1, y+1, 0xE01A, 20, 20, 20, alpha);
else
drawchar(x+1, y+1, 0x9A, 212, 212, 212, alpha);
drawchar(x+1, y+1, 0xE01A, 212, 212, 212, alpha);
break;
case IconFire:
drawchar(x+1, y+1, 0x9B, 255, 0, 0, alpha);
drawchar(x+1, y+1, 0x9C, 255, 255, 64, alpha);
drawchar(x+1, y+1, 0xE01B, 255, 0, 0, alpha);
drawchar(x+1, y+1, 0xE01C, 255, 255, 64, alpha);
break;
case IconBlob:
if(invert)
drawchar(x+1, y, 0xBF, 55, 180, 55, alpha);
drawchar(x+1, y, 0xE03F, 55, 180, 55, alpha);
else
drawchar(x+1, y, 0xBF, 55, 255, 55, alpha);
drawchar(x+1, y, 0xE03F, 55, 255, 55, alpha);
break;
case IconHeat:
drawchar(x+3, y, 0xBE, 255, 0, 0, alpha);
drawchar(x+3, y, 0xE03E, 255, 0, 0, alpha);
if(invert)
drawchar(x+3, y, 0xBD, 0, 0, 0, alpha);
drawchar(x+3, y, 0xE03D, 0, 0, 0, alpha);
else
drawchar(x+3, y, 0xBD, 255, 255, 255, alpha);
drawchar(x+3, y, 0xE03D, 255, 255, 255, alpha);
break;
case IconBlur:
if(invert)
drawchar(x+1, y, 0xC4, 50, 70, 180, alpha);
drawchar(x+1, y, 0xE044, 50, 70, 180, alpha);
else
drawchar(x+1, y, 0xC4, 100, 150, 255, alpha);
drawchar(x+1, y, 0xE044, 100, 150, 255, alpha);
break;
case IconGradient:
if(invert)
drawchar(x+1, y+1, 0xD3, 255, 50, 255, alpha);
drawchar(x+1, y+1, 0xE053, 255, 50, 255, alpha);
else
drawchar(x+1, y+1, 0xD3, 205, 50, 205, alpha);
drawchar(x+1, y+1, 0xE053, 205, 50, 205, alpha);
break;
case IconLife:
if(invert)
drawchar(x, y+1, 0xE0, 0, 0, 0, alpha);
drawchar(x, y+1, 0xE060, 0, 0, 0, alpha);
else
drawchar(x, y+1, 0xE0, 255, 255, 255, alpha);
drawchar(x, y+1, 0xE060, 255, 255, 255, alpha);
break;
case IconEffect:
drawchar(x+1, y, 0xE1, 255, 255, 160, alpha);
drawchar(x+1, y, 0xE061, 255, 255, 160, alpha);
break;
case IconGlow:
drawchar(x+1, y, 0xDF, 200, 255, 255, alpha);
drawchar(x+1, y, 0xE05F, 200, 255, 255, alpha);
break;
case IconWarp:
drawchar(x+1, y, 0xDE, 255, 255, 255, alpha);
drawchar(x+1, y, 0xE05E, 255, 255, 255, alpha);
break;
case IconBasic:
if(invert)
drawchar(x+1, y+1, 0xDB, 50, 50, 0, alpha);
drawchar(x+1, y+1, 0xE05B, 50, 50, 0, alpha);
else
drawchar(x+1, y+1, 0xDB, 255, 255, 200, alpha);
drawchar(x+1, y+1, 0xE05B, 255, 255, 200, alpha);
break;
case IconAltAir:
if(invert) {
drawchar(x+1, y+1, 0xD4, 180, 55, 55, alpha);
drawchar(x+1, y+1, 0xD5, 55, 180, 55, alpha);
drawchar(x+1, y+1, 0xE054, 180, 55, 55, alpha);
drawchar(x+1, y+1, 0xE055, 55, 180, 55, alpha);
} else {
drawchar(x+1, y+1, 0xD4, 255, 55, 55, alpha);
drawchar(x+1, y+1, 0xD5, 55, 255, 55, alpha);
drawchar(x+1, y+1, 0xE054, 255, 55, 55, alpha);
drawchar(x+1, y+1, 0xE055, 55, 255, 55, alpha);
}
break;
default:

6
src/graphics/Renderer.cpp
View File

@ -677,7 +677,7 @@ VideoBuffer * Renderer::WallIcon(int wallID, int width, int height)
newTexture->SetPixel(i, j, PIXR(pc), PIXG(pc), PIXB(pc), 255);
}
}
newTexture->AddCharacter(4, 2, 0x8D, 255, 255, 255, 255);
newTexture->AddCharacter(4, 2, 0xE00D, 255, 255, 255, 255);
for (i=width/3; i<width; i++)
{
newTexture->SetPixel(i, 7+(int)(3.9f*cos(i*0.3f)), 255, 255, 255, 255);
@ -805,7 +805,7 @@ void Renderer::DrawWalls()
// there is no velocity here, draw a streamline and continue
if (!xVel && !yVel)
{
drawtext(x*CELL, y*CELL-2, "\x8D", 255, 255, 255, 128);
drawtext(x*CELL, y*CELL-2, String(1, 0xE00D), 255, 255, 255, 128);
addpixel(oldX, oldY, 255, 255, 255, 255);
continue;
}
@ -836,7 +836,7 @@ void Renderer::DrawWalls()
xf += xVel;
yf += yVel;
}
drawtext(x*CELL, y*CELL-2, "\x8D", 255, 255, 255, 128);
drawtext(x*CELL, y*CELL-2, String(1, 0xE00D), 255, 255, 255, 128);
}
break;
case 1:

4
src/gui/font/FontEditor.cpp
View File

@ -281,7 +281,7 @@ FontEditor::FontEditor(ByteString _header):
v->PrevChar();
}
};
ui::Button *prev = new ui::Button(ui::Point(currentX, baseline), ui::Point(17, 17), "\x96");
ui::Button *prev = new ui::Button(ui::Point(currentX, baseline), ui::Point(17, 17), String(1, 0xE016));
currentX += 18;
prev->SetActionCallback(new PrevCharAction(this));
AddComponent(prev);
@ -316,7 +316,7 @@ FontEditor::FontEditor(ByteString _header):
v->NextChar();
}
};
ui::Button *next = new ui::Button(ui::Point(currentX, baseline), ui::Point(17, 17), "\x95");
ui::Button *next = new ui::Button(ui::Point(currentX, baseline), ui::Point(17, 17), String(1, 0xE015));
currentX += 18;
next->SetActionCallback(new NextCharAction(this));
AddComponent(next);

2
src/gui/game/GameModel.cpp
View File

@ -264,7 +264,7 @@ void GameModel::BuildMenus()
//Create menus
for (int i = 0; i < SC_TOTAL; i++)
{
menuList.push_back(new Menu(sim->msections[i].icon[0], sim->msections[i].name, sim->msections[i].doshow));
menuList.push_back(new Menu(sim->msections[i].icon, sim->msections[i].name, sim->msections[i].doshow));
}
//Build menus from Simulation elements

6
src/gui/game/GameView.cpp
View File

@ -433,7 +433,7 @@ GameView::GameView():
v->c->OpenElementSearch();
}
};
ui::Button * tempButton = new ui::Button(ui::Point(WINDOWW-16, WINDOWH-32), ui::Point(15, 15), "\xE5", "Search for elements");
ui::Button * tempButton = new ui::Button(ui::Point(WINDOWW-16, WINDOWH-32), ui::Point(15, 15), String(1, 0xE065), "Search for elements");
tempButton->Appearance.Margin = ui::Border(0, 2, 3, 2);
tempButton->SetActionCallback(new ElementSearchAction(this));
AddComponent(tempButton);
@ -1912,7 +1912,7 @@ void GameView::NotifyNotificationsChanged(GameModel * sender)
AddComponent(tempButton);
notificationComponents.push_back(tempButton);
tempButton = new ui::Button(ui::Point(XRES-20, currentY), ui::Point(15, 15), "\xAA");
tempButton = new ui::Button(ui::Point(XRES-20, currentY), ui::Point(15, 15), String(1, 0xE02A));
//tempButton->SetIcon(IconClose);
tempButton->SetActionCallback(new CloseNotificationButtonAction(this, *iter));
tempButton->Appearance.Margin.Left -= 1;
@ -2266,7 +2266,7 @@ void GameView::OnDraw()
{
String::Stream sampleInfo;
sampleInfo << recordingIndex;
sampleInfo << ". \x8E REC";
sampleInfo << ". " + String(1, 0xE00E) + " REC";
int textWidth = Graphics::textwidth(sampleInfo.str());
g->fillrect(XRES-20-textWidth, 12, textWidth+8, 15, 0, 0, 0, 255*0.5);

2
src/gui/game/SampleTool.cpp
View File

@ -15,7 +15,7 @@ VideoBuffer * SampleTool::GetIcon(int toolID, int width, int height)
newTexture->SetPixel(x, y, PIXR(pc), PIXG(pc), PIXB(pc), 255);
}
}
newTexture->AddCharacter((width/2)-5, (height/2)-5, 0xE6, 255, 255, 255, 255);
newTexture->AddCharacter((width/2)-5, (height/2)-5, 0xE066, 255, 255, 255, 255);
newTexture->BlendPixel(10, 9, 100, 180, 255, 255);
newTexture->BlendPixel(11, 8, 100, 180, 255, 255);
newTexture->BlendPixel(12, 7, 100, 180, 255, 255);

12
src/gui/game/SignTool.cpp
View File

@ -128,10 +128,10 @@ SignWindow::SignWindow(SignTool * tool_, Simulation * sim_, int signID_, ui::Poi
justification = new ui::DropDown(ui::Point(52, 48), ui::Point(50, 16));
AddComponent(justification);
justification->AddOption(std::pair<String, int>("\xA0 Left", (int)sign::Left));
justification->AddOption(std::pair<String, int>("\x9E Middle", (int)sign::Middle));
justification->AddOption(std::pair<String, int>("\x9F Right", (int)sign::Right));
justification->AddOption(std::pair<String, int>("\x9D None", (int)sign::None));
justification->AddOption(std::pair<String, int>(String(1, 0xE020) + " Left", (int)sign::Left));
justification->AddOption(std::pair<String, int>(String(1, 0xE01E) + " Middle", (int)sign::Middle));
justification->AddOption(std::pair<String, int>(String(1, 0xE01F) + " Right", (int)sign::Right));
justification->AddOption(std::pair<String, int>(String(1, 0xE01D) + " None", (int)sign::None));
justification->SetOption(1);
justification->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
@ -268,8 +268,8 @@ VideoBuffer * SignTool::GetIcon(int toolID, int width, int height)
newTexture->SetPixel(x, y, PIXR(pc), PIXG(pc), PIXB(pc), 255);
}
}
newTexture->AddCharacter((width/2)-5, (height/2)-5, 0xA1, 32, 64, 128, 255);
newTexture->BlendCharacter((width/2)-5, (height/2)-5, 0xA0, 255, 255, 255, 255);
newTexture->AddCharacter((width/2)-5, (height/2)-5, 0xE021, 32, 64, 128, 255);
newTexture->BlendCharacter((width/2)-5, (height/2)-5, 0xE020, 255, 255, 255, 255);
return newTexture;
}

2
src/gui/game/ToolButton.cpp
View File

@ -67,7 +67,7 @@ void ToolButton::Draw(const ui::Point& screenPos)
}
if (Favorite::Ref().IsFavorite(toolIdentifier))
{
g->drawtext(screenPos.X, screenPos.Y, "\xE8", Appearance.BorderFavorite.Red, Appearance.BorderFavorite.Green, Appearance.BorderFavorite.Blue, Appearance.BorderFavorite.Alpha);
g->drawtext(screenPos.X, screenPos.Y, String(1, 0xE068), Appearance.BorderFavorite.Red, Appearance.BorderFavorite.Green, Appearance.BorderFavorite.Blue, Appearance.BorderFavorite.Alpha);
}
if (totalColour<544)

20
src/gui/interface/SaveButton.cpp
View File

@ -41,22 +41,22 @@ SaveButton::SaveButton(Point position, Point size, SaveInfo * save):
String votes, icon;
votes = format::NumberToString<int>(save->GetVotesUp()-save->GetVotesDown());
icon += 0xBB;
icon += 0xE03B;
for (size_t j = 1; j < votes.length(); j++)
icon += 0xBC;
icon += 0xB9;
icon += 0xBA;
icon += 0xE03C;
icon += 0xE039;
icon += 0xE03A;
votesBackground = icon;
for (String::iterator iter = icon.begin(), end = icon.end(); iter != end; ++iter)
*iter -= 14;
*iter -= 14; // 0xE039 -> 0xE02B
votesBackground2 = icon;
for (String::iterator iter = votes.begin(), end = votes.end(); iter != end; ++iter)
if(*iter != '-')
*iter += 127;
*iter += 0xDFFF; // 0x30 -> 0xE02F
votesString = votes;
@ -239,15 +239,15 @@ void SaveButton::Draw(const Point& screenPos)
int y = screenPos.Y-15+(Size.Y-thumbBoxSize.Y)/2+thumbBoxSize.Y;
g->fillrect(x+1, y+1, 7, 8, 255, 255, 255, 255);
if (isMouseInsideHistory) {
g->drawtext(x, y, "\xA6", 200, 100, 80, 255);
g->drawtext(x, y, String(1, 0xE026), 200, 100, 80, 255);
} else {
g->drawtext(x, y, "\xA6", 160, 70, 50, 255);
g->drawtext(x, y, String(1, 0xE026), 160, 70, 50, 255);
}
}
if (!save->GetPublished())
{
g->drawtext(screenPos.X, screenPos.Y-2, "\xCD", 255, 255, 255, 255);
g->drawtext(screenPos.X, screenPos.Y-2, "\xCE", 212, 151, 81, 255);
g->drawtext(screenPos.X, screenPos.Y-2, String(1, 0xE04D), 255, 255, 255, 255);
g->drawtext(screenPos.X, screenPos.Y-2, String(1, 0xE04E), 212, 151, 81, 255);
}
}
else if (file)

8
src/gui/interface/Textbox.cpp
View File

@ -65,7 +65,7 @@ void Textbox::SetText(String newText)
if(masked)
{
String maskedText = newText;
std::fill(maskedText.begin(), maskedText.end(), '\x8D');
std::fill(maskedText.begin(), maskedText.end(), 0xE00D);
Label::SetText(maskedText);
}
else
@ -159,7 +159,7 @@ void Textbox::cutSelection()
if(masked)
{
String maskedText = backingText;
std::fill(maskedText.begin(), maskedText.end(), '\x8D');
std::fill(maskedText.begin(), maskedText.end(), 0xE00D);
Label::SetText(maskedText);
}
else
@ -223,7 +223,7 @@ void Textbox::pasteIntoSelection()
if(masked)
{
String maskedText = backingText;
std::fill(maskedText.begin(), maskedText.end(), '\x8D');
std::fill(maskedText.begin(), maskedText.end(), 0xE00D);
Label::SetText(maskedText);
}
else
@ -459,7 +459,7 @@ void Textbox::OnVKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
if (masked)
{
String maskedText = backingText;
std::fill(maskedText.begin(), maskedText.end(), '\x8D');
std::fill(maskedText.begin(), maskedText.end(), 0xE00D);
Label::SetText(maskedText);
}
else

4
src/gui/localbrowser/LocalBrowserView.cpp
View File

@ -21,8 +21,8 @@ LocalBrowserView::LocalBrowserView():
lastChanged(0),
pageCount(0)
{
nextButton = new ui::Button(ui::Point(WINDOWW-52, WINDOWH-18), ui::Point(50, 16), "Next \x95");
previousButton = new ui::Button(ui::Point(2, WINDOWH-18), ui::Point(50, 16), "\x96 Prev");
nextButton = new ui::Button(ui::Point(WINDOWW-52, WINDOWH-18), ui::Point(50, 16), "Next " + String(1, 0xE015));
previousButton = new ui::Button(ui::Point(2, WINDOWH-18), ui::Point(50, 16), String(1, 0xE016) + " Prev");
undeleteButton = new ui::Button(ui::Point(WINDOWW-122, WINDOWH-18), ui::Point(60, 16), "Rescan");
AddComponent(nextButton);
AddComponent(previousButton);

4
src/gui/search/SearchView.cpp
View File

@ -24,8 +24,8 @@ SearchView::SearchView():
Client::Ref().AddListener(this);
nextButton = new ui::Button(ui::Point(WINDOWW-52, WINDOWH-18), ui::Point(50, 16), "Next \x95");
previousButton = new ui::Button(ui::Point(2, WINDOWH-18), ui::Point(50, 16), "\x96 Prev");
nextButton = new ui::Button(ui::Point(WINDOWW-52, WINDOWH-18), ui::Point(50, 16), "Next " + String(1, 0xE015));
previousButton = new ui::Button(ui::Point(2, WINDOWH-18), ui::Point(50, 16), String(1, 0xE016) + " Prev");
tagsLabel = new ui::Label(ui::Point(270, WINDOWH-18), ui::Point(WINDOWW-540, 16), "\boPopular Tags:");
motdLabel = new ui::RichLabel(ui::Point(51, WINDOWH-18), ui::Point(WINDOWW-102, 16), Client::Ref().GetMessageOfTheDay());

2
src/simulation/MenuSection.h
View File

@ -3,7 +3,7 @@
struct menu_section
{
String icon;
String::value_type icon;
String name;
int itemcount;
int doshow;

36
src/simulation/SimulationData.cpp
View File

@ -128,24 +128,24 @@ std::vector<menu_section> LoadMenus()
{
return
{
{"\xC1", "Walls", 0, 1},
{"\xC2", "Electronics", 0, 1},
{"\xD6", "Powered Materials", 0, 1},
{"\x99", "Sensors", 0, 1},
{"\xE2", "Force", 0, 1},
{"\xC3", "Explosives", 0, 1},
{"\xC5", "Gases", 0, 1},
{"\xC4", "Liquids", 0, 1},
{"\xD0", "Powders", 0, 1},
{"\xD1", "Solids", 0, 1},
{"\xC6", "Radioactive", 0, 1},
{"\xCC", "Special", 0, 1},
{"\xD2", "Game Of Life", 0, 1},
{"\xD7", "Tools", 0, 1},
{"\xE7", "Favorites", 0, 1},
{"\xE4", "Decoration tools", 0, 1},
{"\xC8", "Cracker", 0, 0},
{"\xC8", "Cracker!", 0, 0},
{0xE041, "Walls", 0, 1},
{0xE042, "Electronics", 0, 1},
{0xE056, "Powered Materials", 0, 1},
{0xE019, "Sensors", 0, 1},
{0xE062, "Force", 0, 1},
{0xE043, "Explosives", 0, 1},
{0xE045, "Gases", 0, 1},
{0xE044, "Liquids", 0, 1},
{0xE050, "Powders", 0, 1},
{0xE051, "Solids", 0, 1},
{0xE046, "Radioactive", 0, 1},
{0xE04C, "Special", 0, 1},
{0xE052, "Game Of Life", 0, 1},
{0xE057, "Tools", 0, 1},
{0xE067, "Favorites", 0, 1},
{0xE064, "Decoration tools", 0, 1},
{0xE048, "Cracker", 0, 0},
{0xE048, "Cracker!", 0, 0},
};
}