Mercurial > mm7
changeset 2493:bd4ada7615ce
Слияние
| author | Ritor1 |
|---|---|
| date | Mon, 15 Sep 2014 17:30:29 +0600 |
| parents | 85a12b497698 (current diff) e9adbbce69f9 (diff) |
| children | de8c5c223e9c |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/Game.cpp Mon Sep 15 17:30:19 2014 +0600 +++ b/Game.cpp Mon Sep 15 17:30:29 2014 +0600 @@ -4961,10 +4961,10 @@ pEventTimer->Initialize(); window = OSWindow::Create(L"Might and Magic Trilogy", game_width, game_height);//Create game window - //bool use_d3d11 = false; - //if (use_d3d11) - //pRenderer = RenderD3D11::Create(); - //else + bool use_d3d11 = false; + if (use_d3d11) + pRenderer = RenderD3D11::Create(); + else pRenderer = Render::Create();//Create DirectX if (!pRenderer) {
--- a/Outdoor.cpp Mon Sep 15 17:30:19 2014 +0600 +++ b/Outdoor.cpp Mon Sep 15 17:30:29 2014 +0600 @@ -3161,11 +3161,6 @@ int v48; // eax@203 int v54; // eax@215 int v55; // eax@217 -// BSPModel *v58; // eax@228 - //unsigned __int64 v59; // qax@228 -// BSPModel *v60; // eax@228 - //unsigned __int64 v61; // qax@228 -// int v62; // eax@241 unsigned int v66; // esi@263 signed int v68; // ecx@263 int v69; // eax@263 @@ -3179,13 +3174,6 @@ int pTerrainHeight; // eax@321 // int v86; // [sp-20h] [bp-B4h]@246 int v87; // [sp-20h] [bp-B4h]@248 -// signed int v88; // [sp-1Ch] [bp-B0h]@246 -// unsigned int v89; // [sp-18h] [bp-ACh]@246 -// signed int v90; // [sp-14h] [bp-A8h]@246 -// signed int v91; // [sp-10h] [bp-A4h]@246 -// int v92; // [sp-Ch] [bp-A0h]@246 -// unsigned int v94; // [sp-8h] [bp-9Ch]@246 -// int v96; // [sp-4h] [bp-98h]@246 int v97; // [sp+Ch] [bp-88h]@180 Vec3_int_ v98; bool not_high_fall; // [sp+1Ch] [bp-78h]@33 @@ -3676,8 +3664,8 @@ if (hovering && !pParty->bFlying)// { //v33 = -(pEventTimer->uTimeElapsed * GetGravityStrength()); - v34 = fall_speed + 2 * -(pEventTimer->uTimeElapsed * GetGravityStrength()); - fall_speed += 2 * -(pEventTimer->uTimeElapsed * GetGravityStrength()); + v34 = fall_speed + (-(pEventTimer->uTimeElapsed * GetGravityStrength()) << 1); + fall_speed += (-(pEventTimer->uTimeElapsed * GetGravityStrength()) << 1 ); //y(t) = 2*gt } else if (!partyAtHighSlope) v34 = fall_speed;