diff --git a/Minecraft.Client/Common/Media/Intro1080.swf b/Minecraft.Client/Common/Media/Intro1080.swf
index c9f2d3ba4..e0a90a579 100644
Binary files a/Minecraft.Client/Common/Media/Intro1080.swf and b/Minecraft.Client/Common/Media/Intro1080.swf differ
diff --git a/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp b/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp
index a1cbc1449..93f1edf11 100644
--- a/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp
@@ -368,7 +368,7 @@ void UIScene_MainMenu::handlePress(F64 controlId, F64 childId)
UINT uiIDA[2];
uiIDA[0]=IDS_CANCEL;
uiIDA[1]=IDS_OK;
- ui.RequestErrorMessage(IDS_WARNING_ARCADE_TITLE, IDS_WARNING_ARCADE_TEXT, uiIDA, 2, XUSER_INDEX_ANY,&UIScene_MainMenu::ExitGameReturned,this);
+ ui.RequestErrorMessage(IDS_WINDOWS_EXIT, IDS_WARNING_ARCADE_TEXT, uiIDA, 2, XUSER_INDEX_ANY,&UIScene_MainMenu::ExitGameReturned,this);
}
else
{
diff --git a/Minecraft.Client/GameRenderer.cpp b/Minecraft.Client/GameRenderer.cpp
index 73b39529c..8c9dd5916 100644
--- a/Minecraft.Client/GameRenderer.cpp
+++ b/Minecraft.Client/GameRenderer.cpp
@@ -392,7 +392,7 @@ float GameRenderer::getFov(float a, bool applyEffects)
float fov = m_fov;//70;
if (applyEffects)
{
- fov += mc->options->fov * 40;
+ //fov += mc->options->fov * 40;
fov *= oFov[playerIdx] + (this->fov[playerIdx] - oFov[playerIdx]) * a;
}
if (player->getHealth() <= 0)
diff --git a/Minecraft.Client/Screen.cpp b/Minecraft.Client/Screen.cpp
index 041f8175b..7966c5c96 100644
--- a/Minecraft.Client/Screen.cpp
+++ b/Minecraft.Client/Screen.cpp
@@ -204,7 +204,7 @@ void Screen::updateEvents()
// Map to Screen::keyPressed
int mappedKey = -1;
wchar_t ch = 0;
- if (vk == VK_ESCAPE) mappedKey = Keyboard::KEY_ESCAPE;
+ if (vk == VK_ESCAPE) mappedKey = Keyboard::KEY_ESCAPE;
else if (vk == VK_RETURN) mappedKey = Keyboard::KEY_RETURN;
else if (vk == VK_BACK) mappedKey = Keyboard::KEY_BACK;
else if (vk == VK_UP) mappedKey = Keyboard::KEY_UP;
diff --git a/Minecraft.Client/Windows64/KeyboardMouseInput.h b/Minecraft.Client/Windows64/KeyboardMouseInput.h
index 0f14dfa1f..2079a72a1 100644
--- a/Minecraft.Client/Windows64/KeyboardMouseInput.h
+++ b/Minecraft.Client/Windows64/KeyboardMouseInput.h
@@ -25,12 +25,20 @@ public:
static const int KEY_DROP = 'Q';
static const int KEY_CRAFTING = 'C';
static const int KEY_CRAFTING_ALT = 'R';
+ static const int KEY_CHAT = 'T';
static const int KEY_CONFIRM = VK_RETURN;
static const int KEY_CANCEL = VK_ESCAPE;
static const int KEY_PAUSE = VK_ESCAPE;
- static const int KEY_THIRD_PERSON = VK_F5;
+ static const int KEY_TOGGLE_HUD = VK_F1;
static const int KEY_DEBUG_INFO = VK_F3;
static const int KEY_DEBUG_MENU = VK_F4;
+ static const int KEY_THIRD_PERSON = VK_F5;
+ static const int KEY_DEBUG_CONSOLE = VK_F6;
+ static const int KEY_HOST_SETTINGS = VK_F8;
+ static const int KEY_FULLSCREEN = VK_F11;
+
+ // todo: implement and shi
+ static const int KEY_SCREENSHOT = VK_F2;
void Init();
void Tick();
diff --git a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
index 73cba8ddf..81430ffcc 100644
--- a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
+++ b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
@@ -1765,7 +1765,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
}
// F1 toggles the HUD
- if (g_KBMInput.IsKeyPressed(VK_F1))
+ if (g_KBMInput.IsKeyPressed(KeyboardMouseInput::KEY_TOGGLE_HUD))
{
const int primaryPad = ProfileManager.GetPrimaryPad();
const unsigned char displayHud = app.GetGameSettings(primaryPad, eGameSetting_DisplayHUD);
@@ -1774,7 +1774,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
}
// F3 toggles onscreen debug info
- if (g_KBMInput.IsKeyPressed(VK_F3))
+ if (g_KBMInput.IsKeyPressed(KeyboardMouseInput::KEY_DEBUG_INFO))
{
if (const Minecraft* pMinecraft = Minecraft::GetInstance())
{
@@ -1787,7 +1787,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
#ifdef _DEBUG_MENUS_ENABLED
// F6 Open debug console
- if (g_KBMInput.IsKeyPressed(VK_F6))
+ if (g_KBMInput.IsKeyPressed(KeyboardMouseInput::KEY_DEBUG_CONSOLE))
{
static bool s_debugConsole = false;
s_debugConsole = !s_debugConsole;
@@ -1795,14 +1795,14 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
}
#endif
- // F11 Toggle fullscreen
- if (g_KBMInput.IsKeyPressed(VK_F11))
+ // toggle fullscreen
+ if (g_KBMInput.IsKeyPressed(KeyboardMouseInput::KEY_FULLSCREEN))
{
ToggleFullscreen();
}
// TAB opens game info menu. - Vvis :3 - Updated by detectiveren
- if (g_KBMInput.IsKeyPressed(VK_TAB) && !ui.GetMenuDisplayed(0))
+ if (g_KBMInput.IsKeyPressed(KeyboardMouseInput::KEY_HOST_SETTINGS) && !ui.GetMenuDisplayed(0))
{
if (Minecraft* pMinecraft = Minecraft::GetInstance())
{
@@ -1814,7 +1814,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
}
// Open chat
- if (g_KBMInput.IsKeyPressed('T') && app.GetGameStarted() && !ui.GetMenuDisplayed(0) && pMinecraft->screen == NULL)
+ if (g_KBMInput.IsKeyPressed(KeyboardMouseInput::KEY_CHAT) && app.GetGameStarted() && !ui.GetMenuDisplayed(0) && pMinecraft->screen == NULL)
{
g_KBMInput.ClearCharBuffer();
pMinecraft->setScreen(new ChatScreen());
diff --git a/Minecraft.Client/Windows64Media/Media/languages.loc b/Minecraft.Client/Windows64Media/Media/languages.loc
index e3d9162b0..3fb5b1a06 100644
Binary files a/Minecraft.Client/Windows64Media/Media/languages.loc and b/Minecraft.Client/Windows64Media/Media/languages.loc differ
diff --git a/Minecraft.Client/Windows64Media/loc/stringsGeneric.xml b/Minecraft.Client/Windows64Media/loc/stringsGeneric.xml
index 0900c48c1..258eba2b7 100644
--- a/Minecraft.Client/Windows64Media/loc/stringsGeneric.xml
+++ b/Minecraft.Client/Windows64Media/loc/stringsGeneric.xml
@@ -8819,4 +8819,7 @@ All Ender Chests in a world are linked. Items placed into an Ender Chest are acc
Cure
+
+ Exit Minecraft
+
\ No newline at end of file
diff --git a/Minecraft.World/Bat.cpp b/Minecraft.World/Bat.cpp
index 462fef57d..3fa30ddbb 100644
--- a/Minecraft.World/Bat.cpp
+++ b/Minecraft.World/Bat.cpp
@@ -30,7 +30,7 @@ void Bat::defineSynchedData()
float Bat::getSoundVolume()
{
- return 0.1f;
+ return 0.8f;
}
float Bat::getVoicePitch()
diff --git a/Minecraft.World/Cow.cpp b/Minecraft.World/Cow.cpp
index 69628d64f..0b959fc15 100644
--- a/Minecraft.World/Cow.cpp
+++ b/Minecraft.World/Cow.cpp
@@ -72,7 +72,7 @@ void Cow::playStepSound(int xt, int yt, int zt, int t)
float Cow::getSoundVolume()
{
- return 0.4f;
+ return 1.f;
}
int Cow::getDeathLoot()
diff --git a/Minecraft.World/FireworksRecipe.cpp b/Minecraft.World/FireworksRecipe.cpp
index feb1cf573..c4a9ca80a 100644
--- a/Minecraft.World/FireworksRecipe.cpp
+++ b/Minecraft.World/FireworksRecipe.cpp
@@ -37,6 +37,7 @@ void FireworksRecipe::ReleaseThreadStorage()
void FireworksRecipe::setResultItem(shared_ptr item)
{
ThreadStorage *tls = static_cast(TlsGetValue(tlsIdx));
+ if (tls == nullptr) tls = tlsDefault;
tls->resultItem = item;
}
@@ -269,6 +270,7 @@ bool FireworksRecipe::matches(shared_ptr craftSlots, Level *l
shared_ptr FireworksRecipe::assemble(shared_ptr craftSlots)
{
ThreadStorage *tls = static_cast(TlsGetValue(tlsIdx));
+ if (tls == nullptr) tls = tlsDefault;
return tls->resultItem->copy();
//return resultItem->copy();
}
@@ -281,6 +283,7 @@ int FireworksRecipe::size()
const ItemInstance *FireworksRecipe::getResultItem()
{
ThreadStorage *tls = static_cast(TlsGetValue(tlsIdx));
+ if (tls == nullptr) tls = tlsDefault;
return tls->resultItem.get();
//return resultItem.get();
}