Zmiana AnsiString na std::string. Zakończenie sprawy przypadkowo skasowanego mover.h

This commit is contained in:
firleju
2016-10-21 06:56:46 +02:00
parent ab34354584
commit 167b1e3a8d
18 changed files with 1466 additions and 306 deletions

View File

@@ -662,7 +662,7 @@ int WINAPI WinMain(HINSTANCE hInstance, // instance
else if (str == AnsiString("-v"))
{ // nazwa wybranego pojazdu
str = Parser->GetNextSymbol().LowerCase();
Global::asHumanCtrlVehicle = str;
Global::asHumanCtrlVehicle = str.c_str();
}
else if (str == AnsiString("-modifytga"))
{ // wykonanie modyfikacji wszystkich plików TGA
@@ -695,7 +695,7 @@ int WINAPI WinMain(HINSTANCE hInstance, // instance
if (Bpp != 32)
Bpp = 16;
// create our OpenGL window
if (!CreateGLWindow(Global::asHumanCtrlVehicle.c_str(), WindowWidth, WindowHeight, Bpp,
if (!CreateGLWindow(const_cast<char*>(Global::asHumanCtrlVehicle.c_str()), WindowWidth, WindowHeight, Bpp,
fullscreen))
return 0; // quit if window was not created
SetForegroundWindow(hWnd);