Commit 5b1fa258 authored by D-AIRY's avatar D-AIRY

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

parent beb5cc91
<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">
......
......@@ -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
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment