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

Fix incorrect uses of String(char[])

Browse Source
This commit is contained in:
mniip 2018-05-04 20:05:26 +03:00
parent d6a92bdab5
commit 1485ae5a21
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/GameSave.cpp
View File

@ -1947,7 +1947,7 @@ void GameSave::readPSv(char * saveDataChar, int dataLength)
x = 254; x = 254;
memcpy(tempSignText, data+p, x); memcpy(tempSignText, data+p, x);
tempSignText[x] = 0; tempSignText[x] = 0;
tempSign.text = format::CleanString(tempSignText, true, true, true).Substr(0, 45); tempSign.text = format::CleanString(ByteString(tempSignText).FromUtf8(), true, true, true).Substr(0, 45);
tempSigns.push_back(tempSign); tempSigns.push_back(tempSign);
p += x; p += x;
} }

7
src/gui/interface/Window.cpp
View File

@ -227,11 +227,10 @@ void Window::DoDraw()
{ {
int xPos = focusedComponent_->Position.X+focusedComponent_->Size.X+5+Position.X; int xPos = focusedComponent_->Position.X+focusedComponent_->Size.X+5+Position.X;
Graphics * g = ui::Engine::Ref().g; Graphics * g = ui::Engine::Ref().g;
char tempString[512]; String tempString, tempString2;
char tempString2[512];
sprintf(tempString, "Position: L %d, R %d, T: %d, B: %d", focusedComponent_->Position.X, Size.X-(focusedComponent_->Position.X+focusedComponent_->Size.X), focusedComponent_->Position.Y, Size.Y-(focusedComponent_->Position.Y+focusedComponent_->Size.Y)); tempString = String::Build("Position: L ", focusedComponent_->Position.X, ", R ", Size.X-(focusedComponent_->Position.X+focusedComponent_->Size.X), ", T: ", focusedComponent_->Position.Y, ", B: ", Size.Y-(focusedComponent_->Position.Y+focusedComponent_->Size.Y));
sprintf(tempString2, "Size: %d, %d", focusedComponent_->Size.X, focusedComponent_->Size.Y); tempString2 = String::Build("Size: ", focusedComponent_->Size.X, ", ", focusedComponent_->Size.Y);
if (Graphics::textwidth(tempString)+xPos > WINDOWW) if (Graphics::textwidth(tempString)+xPos > WINDOWW)
xPos = WINDOWW-(Graphics::textwidth(tempString)+5); xPos = WINDOWW-(Graphics::textwidth(tempString)+5);