From 5b1fa258633e7bd1ee0683fca376733eec2b529a Mon Sep 17 00:00:00 2001
From: D-AIRY <admin@ds-servers.com>
Date: Sun, 28 Jul 2019 19:14:21 +0300
Subject: [PATCH] Fixed game settings menu in 800x600; fixed player standing
check
---
build/gamesource/gui/menu/settings_game.html | 1 +
source/SkyXEngine.h | 2 +-
source/game/Player.cpp | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/build/gamesource/gui/menu/settings_game.html b/build/gamesource/gui/menu/settings_game.html
index 6e5b858bc..d1c9d1ad8 100644
--- a/build/gamesource/gui/menu/settings_game.html
+++ b/build/gamesource/gui/menu/settings_game.html
@@ -1,6 +1,7 @@
<html onkeyup="return_ingame">
<head>
<link type="text/css" rel="stylesheet" href="settings_menu.css"/>
+ <link type="text/css" rel="stylesheet" href="settings_menu_800x600.css" max-width="800" />
</head>
<body style="font-name: quick-junky-regular;color: #c6f0fd;">
<div id="background">
diff --git a/source/SkyXEngine.h b/source/SkyXEngine.h
index fe3d7fce2..c2ade2281 100644
--- a/source/SkyXEngine.h
+++ b/source/SkyXEngine.h
@@ -292,7 +292,7 @@ QT стиль документирования (!) и QT_AUTOBRIEF - корот
#ifndef __SKYXENGINE_H
#define __SKYXENGINE_H
-#define SKYXENGINE_VERSION "X.2.0-dev"
+#define SKYXENGINE_VERSION "X.2.1-dev"
#define SKYXENGINE_VERSION4EDITORS "SkyXEngine version " ## SKYXENGINE_VERSION
diff --git a/source/game/Player.cpp b/source/game/Player.cpp
index e6d6ba5ee..592ca4daf 100644
--- a/source/game/Player.cpp
+++ b/source/game/Player.cpp
@@ -181,7 +181,7 @@ void CPlayer::updateInput(float dt)
mov = true;
}
- if(m_uMoveDir & PM_CROUCH || (m_fCurrentHeight < 1.0f && !m_pCharacter->canStandUp((m_fCapsHeight - m_fCapsRadius * 2.0f) * (1.0f - m_fCurrentHeight))))
+ if(m_uMoveDir & PM_CROUCH || (m_fCurrentHeight < 0.99f && !m_pCharacter->canStandUp((m_fCapsHeight - m_fCapsRadius * 2.0f) * (1.0f - m_fCurrentHeight))))
{
m_fCurrentHeight -= dt;
float fMinHeight = (m_fCapsHeightCrouch - m_fCapsRadius * 2.0f) / (m_fCapsHeight - m_fCapsRadius * 2.0f);
--
GitLab