mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-07-05 03:21:34 +00:00
Code Issues Releases Wiki Activity

Avoid dead code

Browse source
This commit is contained in:
Andrei Kortunov 2021-01-09 13:52:01 +04:00
parent 801e2d6ad0
commit 7fc4c9f3f6
6 changed files with 10 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/opencs/model/filter/parser.cpp
View file

@ -325,12 +325,6 @@ std::shared_ptr<CSMFilter::Node> CSMFilter::Parser::parseNAry (const Token& keyw
break; break;
} }
if (nodes.empty())
{
error();
return std::shared_ptr<Node>();
}
switch (keyword.mType) switch (keyword.mType)
{ {
case Token::Type_Keyword_And: return std::shared_ptr<CSMFilter::Node> (new AndNode (nodes)); case Token::Type_Keyword_And: return std::shared_ptr<CSMFilter::Node> (new AndNode (nodes));

8
apps/opencs/view/render/terraintexturemode.cpp
View file

@ -429,12 +429,8 @@ void CSVRender::TerrainTextureMode::editTerrainTextureGrid(const WorldspaceHitRe
{ {
int distanceX(0); int distanceX(0);
int distanceY(0); int distanceY(0);
if (i_cell < cellX) distanceX = xHitInCell + landTextureSize * abs(i_cell-cellX) - i; distanceX = abs(i-xHitInCell);
if (j_cell < cellY) distanceY = yHitInCell + landTextureSize * abs(j_cell-cellY) - j; distanceY = abs(j-yHitInCell);
if (i_cell > cellX) distanceX = -xHitInCell + landTextureSize* abs(i_cell-cellX) + i;
if (j_cell > cellY) distanceY = -yHitInCell + landTextureSize * abs(j_cell-cellY) + j;
if (i_cell == cellX) distanceX = abs(i-xHitInCell);
if (j_cell == cellY) distanceY = abs(j-yHitInCell);
float distance = std::round(sqrt(pow(distanceX, 2)+pow(distanceY, 2))); float distance = std::round(sqrt(pow(distanceX, 2)+pow(distanceY, 2)));
float rf = static_cast<float>(mBrushSize) / 2; float rf = static_cast<float>(mBrushSize) / 2;
if (distance < rf) newTerrain[j*landTextureSize+i] = brushInt; if (distance < rf) newTerrain[j*landTextureSize+i] = brushInt;

2
apps/openmw/mwgui/journalwindow.cpp
View file

@ -561,7 +561,7 @@ namespace
if (mAllQuests) if (mAllQuests)
{ {
SetNamesInactive setInactive(list); SetNamesInactive setInactive(list);
mModel->visitQuestNames(!mAllQuests, setInactive); mModel->visitQuestNames(false, setInactive);
} }
MWBase::Environment::get().getWindowManager()->playSound("book page"); MWBase::Environment::get().getWindowManager()->playSound("book page");

4
apps/openmw/mwmechanics/character.cpp
View file

@ -446,9 +446,9 @@ std::string CharacterController::fallbackShortWeaponGroup(const std::string& bas
const ESM::WeaponType* weapInfo = getWeaponType(mWeaponType); const ESM::WeaponType* weapInfo = getWeaponType(mWeaponType);
// For real two-handed melee weapons use 2h swords animations as fallback, otherwise use the 1h ones // For real two-handed melee weapons use 2h swords animations as fallback, otherwise use the 1h ones
if (isRealWeapon && weapInfo->mFlags & ESM::WeaponType::TwoHanded && weapInfo->mWeaponClass == ESM::WeaponType::Melee) if (weapInfo->mFlags & ESM::WeaponType::TwoHanded && weapInfo->mWeaponClass == ESM::WeaponType::Melee)
groupName += twoHandFallback; groupName += twoHandFallback;
else if (isRealWeapon) else
groupName += oneHandFallback; groupName += oneHandFallback;
// Special case for crossbows - we shouls apply 1h animations a fallback only for lower body // Special case for crossbows - we shouls apply 1h animations a fallback only for lower body

3
components/compiler/scanner.hpp
View file

@ -139,8 +139,6 @@ namespace Compiler
if (length < 0) return false; if (length < 0) return false;
for (int i = 0; i <= length; i++) for (int i = 0; i <= length; i++)
{
if (length >= i)
{ {
in.get (ch); in.get (ch);
@ -149,7 +147,6 @@ namespace Compiler
mData[i] = ch; mData[i] = ch;
} }
}
mLength = length; mLength = length;

2
extern/oics/ICSInputControlSystem_joystick.cpp vendored
View file

@ -286,7 +286,7 @@ namespace ICS
//ControlAxisBinderItem joystickBinderItem = mControlsJoystickAxisBinderMap[ evt.which ][ axis ]; // joystic axis start at 0 index //ControlAxisBinderItem joystickBinderItem = mControlsJoystickAxisBinderMap[ evt.which ][ axis ]; // joystic axis start at 0 index
//Control* ctrl = joystickBinderItem.control; //Control* ctrl = joystickBinderItem.control;
//if(ctrl && ctrl->isAxisBindable()) //if(ctrl && ctrl->isAxisBindable())
if(mDetectingBindingControl && mDetectingBindingControl->isAxisBindable()) if(mDetectingBindingControl->isAxisBindable())
{ {
if( abs( evt.value ) > ICS_JOYSTICK_AXIS_BINDING_MARGIN) if( abs( evt.value ) > ICS_JOYSTICK_AXIS_BINDING_MARGIN)
{ {