Fixed game settings menu in 800x600; fixed player standing check

5b1fa258 · D-AIRY · beb5cc91 · 5b1fa258 · 5b1fa258 · 5b1fa258
Commit 5b1fa258 authored Jul 28, 2019 by D-AIRY
Showing with 3 additions and 2 deletions

build/gamesource/gui/menu/settings_game.html build/gamesource/gui/menu/settings_game.html +1 -0

source/SkyXEngine.h source/SkyXEngine.h +1 -1

source/game/Player.cpp source/game/Player.cpp +1 -1

No files found.
--- a/build/gamesource/gui/menu/settings_game.html
+++ b/build/gamesource/gui/menu/settings_game.html
 <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">

--- 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


--- 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);