diff options
Diffstat (limited to 'Minecraft.Client/Windows64/Windows64_Minecraft.cpp')
| -rw-r--r-- | Minecraft.Client/Windows64/Windows64_Minecraft.cpp | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp index 49c43cea..2eef5f73 100644 --- a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp +++ b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp @@ -40,6 +40,7 @@ #include "Resource.h" #include "..\..\Minecraft.World\compression.h" #include "..\..\Minecraft.World\OldChunkStorage.h" +#include "Common/PostProcesser.h" #include "Network\WinsockNetLayer.h" #include "Xbox/resource.h" @@ -564,6 +565,12 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) g_KBMInput.SetWindowFocused(true); break; + case WM_CHAR: + // Buffer typed characters so UIScene_Keyboard can dispatch them to the Iggy Flash player + if (wParam >= 0x20 || wParam == 0x08 || wParam == 0x0D) // printable chars + backspace + enter + g_KBMInput.OnChar((wchar_t)wParam); + break; + case WM_KEYDOWN: case WM_SYSKEYDOWN: { @@ -874,6 +881,8 @@ HRESULT InitDevice() RenderManager.Initialise(g_pd3dDevice, g_pSwapChain); + PostProcesser::GetInstance().Init(); + return S_OK; } @@ -994,9 +1003,6 @@ static Minecraft* InitialiseMinecraftRuntime() app.InitGameSettings(); app.InitialiseTips(); - pMinecraft->options->set(Options::Option::MUSIC, 1.0f); - pMinecraft->options->set(Options::Option::SOUND, 1.0f); - return pMinecraft; } @@ -1569,19 +1575,6 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance, } #ifdef _DEBUG_MENUS_ENABLED - // F4 Open debug overlay - if (g_KBMInput.IsKeyPressed(VK_F4)) - { - if (Minecraft *pMinecraft = Minecraft::GetInstance()) - { - if (pMinecraft->options && - app.GetGameStarted() && !ui.GetMenuDisplayed(0) && pMinecraft->screen == NULL) - { - ui.NavigateToScene(0, eUIScene_DebugOverlay, NULL, eUILayer_Debug); - } - } - } - // F6 Open debug console if (g_KBMInput.IsKeyPressed(VK_F6)) { @@ -1825,7 +1818,7 @@ SIZE_T WINAPI XMemSize( void DumpMem() { int totalLeak = 0; - for(AUTO_VAR(it, allocCounts.begin()); it != allocCounts.end(); it++ ) + for( auto it = allocCounts.begin(); it != allocCounts.end(); it++ ) { if(it->second > 0 ) { @@ -1873,7 +1866,7 @@ void MemPixStuff() int totals[MAX_SECT] = {0}; - for(AUTO_VAR(it, allocCounts.begin()); it != allocCounts.end(); it++ ) + for( auto it = allocCounts.begin(); it != allocCounts.end(); it++ ) { if(it->second > 0 ) { |