mirror
/
openmw
mirror of https://github.com/OpenMW/openmw.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Add comma to the last array element to prevent putting multiple elements on a single line

Browse Source
make_linux_ci_do_zoomies
elsid 2 years ago
parent 5b1d6917ef
commit 52b7b66e9f
No known key found for this signature in database
GPG Key ID: 4DE04C198CBA7625
7 changed files with 48 additions and 47 deletions
Show Stats Download Patch File Download Diff File

36
apps/esmtool/labels.cpp
Unescape Escape View File

@ -46,7 +46,7 @@ std::string bodyPartLabel(int idx)
"Right Shoulder",
"Left Shoulder",
"Weapon",
"Tail"
"Tail",
};
return bodyPartLabels[idx];
}
@ -73,7 +73,7 @@ std::string meshPartLabel(int idx)
"Knee",
"Upper Leg",
"Clavicle",
"Tail"
"Tail",
};
return meshPartLabels[idx];
}
@ -88,7 +88,7 @@ std::string meshTypeLabel(int idx)
static const char *meshTypeLabels[] = {
"Skin",
"Clothing",
"Armor"
"Armor",
};
return meshTypeLabels[idx];
}
@ -110,7 +110,7 @@ std::string clothingTypeLabel(int idx)
"Left Glove",
"Skirt",
"Ring",
"Amulet"
"Amulet",
};
return clothingTypeLabels[idx];
}
@ -133,7 +133,7 @@ std::string armorTypeLabel(int idx)
"Right Gauntlet",
"Shield",
"Left Bracer",
"Right Bracer"
"Right Bracer",
};
return armorTypeLabels[idx];
}
@ -150,7 +150,7 @@ std::string dialogTypeLabel(int idx)
"Voice",
"Greeting",
"Persuasion",
"Journal"
"Journal",
};
return dialogTypeLabels[idx];
}
@ -169,7 +169,7 @@ std::string questStatusLabel(int idx)
"Name",
"Finished",
"Restart",
"Deleted"
"Deleted",
};
return questStatusLabels[idx];
}
@ -205,7 +205,7 @@ std::string soundTypeLabel(int idx)
"Moan",
"Roar",
"Scream",
"Land"
"Land",
};
return soundTypeLabels[idx];
}
@ -231,7 +231,7 @@ std::string weaponTypeLabel(int idx)
"Marksman Crossbow",
"Marksman Thrown",
"Arrow",
"Bolt"
"Bolt",
};
return weaponTypeLabels[idx];
}
@ -396,7 +396,7 @@ std::string magicEffectLabel(int idx)
"sEffectSummonCreature02",
"sEffectSummonCreature03",
"sEffectSummonCreature04",
"sEffectSummonCreature05"
"sEffectSummonCreature05",
};
return magicEffectLabels[idx];
}
@ -416,7 +416,7 @@ std::string attributeLabel(int idx)
"Speed",
"Endurance",
"Personality",
"Luck"
"Luck",
};
return attributeLabels[idx];
}
@ -434,7 +434,7 @@ std::string spellTypeLabel(int idx)
"Blight Disease",
"Disease",
"Curse",
"Powers"
"Powers",
};
return spellTypeLabels[idx];
}
@ -449,7 +449,7 @@ std::string specializationLabel(int idx)
const char* specializationLabels [] = {
"Combat",
"Magic",
"Stealth"
"Stealth",
};
return specializationLabels[idx];
}
@ -488,7 +488,7 @@ std::string skillLabel(int idx)
"Marksman",
"Mercantile",
"Speechcraft",
"Hand-to-hand"
"Hand-to-hand",
};
return skillLabels[idx];
}
@ -519,7 +519,7 @@ std::string rangeTypeLabel(int idx)
const char* rangeTypeLabels [] = {
"Self",
"Touch",
"Target"
"Target",
};
return rangeTypeLabels[idx];
}
@ -537,7 +537,7 @@ std::string schoolLabel(int idx)
"Destruction",
"Illusion",
"Mysticism",
"Restoration"
"Restoration",
};
return schoolLabels[idx];
}
@ -553,7 +553,7 @@ std::string enchantTypeLabel(int idx)
"Cast Once",
"Cast When Strikes",
"Cast When Used",
"Constant Effect"
"Constant Effect",
};
return enchantTypeLabels[idx];
}
@ -638,7 +638,7 @@ std::string ruleFunction(int idx)
"Alarm",
"Flee",
"Should Attack",
"Werewolf"
"Werewolf",
};
return ruleFunctions[idx];
}

3
apps/opencs/model/world/columns.cpp
Unescape Escape View File

@ -375,7 +375,8 @@ namespace CSMWorld
{ ColumnId_LevelledCreatureId,"Levelled Creature" },
{ -1, 0 } // end marker
// end marker
{ -1, 0 },
};
}
}

20
apps/opencs/model/world/defaultgmsts.cpp
Unescape Escape View File

@ -267,7 +267,7 @@ const char* CSMWorld::DefaultGmsts::Floats[CSMWorld::DefaultGmsts::FloatCount] =
"fWereWolfStrength",
"fWereWolfUnarmored",
"fWereWolfWillPower",
"fWortChanceValue"
"fWortChanceValue",
};
const char * CSMWorld::DefaultGmsts::Ints[CSMWorld::DefaultGmsts::IntCount] =
@ -360,7 +360,7 @@ const char * CSMWorld::DefaultGmsts::Ints[CSMWorld::DefaultGmsts::IntCount] =
"iWereWolfBounty",
"iWereWolfFightMod",
"iWereWolfFleeMod",
"iWereWolfLevelToAttack"
"iWereWolfLevelToAttack",
};
const char * CSMWorld::DefaultGmsts::Strings[CSMWorld::DefaultGmsts::StringCount] =
@ -1538,7 +1538,7 @@ const char * CSMWorld::DefaultGmsts::Strings[CSMWorld::DefaultGmsts::StringCount
"sXTimes",
"sXTimesINT",
"sYes",
"sYourGold"
"sYourGold",
};
const char * CSMWorld::DefaultGmsts::OptionalFloats[CSMWorld::DefaultGmsts::OptionalFloatCount] =
@ -1584,7 +1584,7 @@ const char * CSMWorld::DefaultGmsts::OptionalFloats[CSMWorld::DefaultGmsts::Opti
"fWereWolfSpeed",
"fWereWolfStrength",
"fWereWolfUnarmored",
"fWereWolfWillPower"
"fWereWolfWillPower",
};
const char * CSMWorld::DefaultGmsts::OptionalInts[CSMWorld::DefaultGmsts::OptionalIntCount] =
@ -1592,7 +1592,7 @@ const char * CSMWorld::DefaultGmsts::OptionalInts[CSMWorld::DefaultGmsts::Option
"iWereWolfBounty",
"iWereWolfFightMod",
"iWereWolfFleeMod",
"iWereWolfLevelToAttack"
"iWereWolfLevelToAttack",
};
const char * CSMWorld::DefaultGmsts::OptionalStrings[CSMWorld::DefaultGmsts::OptionalStringCount] =
@ -1622,7 +1622,7 @@ const char * CSMWorld::DefaultGmsts::OptionalStrings[CSMWorld::DefaultGmsts::Opt
"sWerewolfAlarmMessage",
"sWerewolfPopup",
"sWerewolfRefusal",
"sWerewolfRestMessage"
"sWerewolfRestMessage",
};
const float CSMWorld::DefaultGmsts::FloatsDefaultValues[CSMWorld::DefaultGmsts::FloatCount] =
@ -1884,7 +1884,7 @@ const float CSMWorld::DefaultGmsts::FloatsDefaultValues[CSMWorld::DefaultGmsts::
150.0f, // fWereWolfStrength
100.0f, // fWereWolfUnarmored
1.0f, // fWereWolfWillPower
15.0f // fWortChanceValue
15.0f, // fWortChanceValue
};
const int CSMWorld::DefaultGmsts::IntsDefaultValues[CSMWorld::DefaultGmsts::IntCount] =
@ -1977,7 +1977,7 @@ const int CSMWorld::DefaultGmsts::IntsDefaultValues[CSMWorld::DefaultGmsts::IntC
10000, // iWereWolfBounty
100, // iWereWolfFightMod
100, // iWereWolfFleeMod
20 // iWereWolfLevelToAttack
20, // iWereWolfLevelToAttack
};
const float CSMWorld::DefaultGmsts::FloatLimits[CSMWorld::DefaultGmsts::FloatCount * 2] =
@ -2239,7 +2239,7 @@ const float CSMWorld::DefaultGmsts::FloatLimits[CSMWorld::DefaultGmsts::FloatCou
-FInf, FInf, // fWereWolfStrength
-FInf, FInf, // fWereWolfUnarmored
-FInf, FInf, // fWereWolfWillPower
0, FInf // fWortChanceValue
0, FInf, // fWortChanceValue
};
const int CSMWorld::DefaultGmsts::IntLimits[CSMWorld::DefaultGmsts::IntCount * 2] =
@ -2332,5 +2332,5 @@ const int CSMWorld::DefaultGmsts::IntLimits[CSMWorld::DefaultGmsts::IntCount * 2
IMin, IMax, // iWereWolfBounty
IMin, IMax, // iWereWolfFightMod
IMin, IMax, // iWereWolfFleeMod
IMin, IMax // iWereWolfLevelToAttack
IMin, IMax, // iWereWolfLevelToAttack
};

10
apps/openmw/mwlua/inputbindings.cpp
Unescape Escape View File

@ -140,7 +140,7 @@ namespace MWLua
{"TogglePostProcessorHUD", MWInput::A_TogglePostProcessorHUD},
{"ZoomIn", MWInput::A_ZoomIn},
{"ZoomOut", MWInput::A_ZoomOut}
{"ZoomOut", MWInput::A_ZoomOut},
}));
api["CONTROL_SWITCH"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, std::string_view>({
@ -150,7 +150,7 @@ namespace MWLua
{"Looking", "playerlooking"},
{"Magic", "playermagic"},
{"ViewMode", "playerviewswitch"},
{"VanityMode", "vanitymode"}
{"VanityMode", "vanitymode"},
}));
api["CONTROLLER_BUTTON"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, SDL_GameControllerButton>({
@ -168,7 +168,7 @@ namespace MWLua
{"DPadUp", SDL_CONTROLLER_BUTTON_DPAD_UP},
{"DPadDown", SDL_CONTROLLER_BUTTON_DPAD_DOWN},
{"DPadLeft", SDL_CONTROLLER_BUTTON_DPAD_LEFT},
{"DPadRight", SDL_CONTROLLER_BUTTON_DPAD_RIGHT}
{"DPadRight", SDL_CONTROLLER_BUTTON_DPAD_RIGHT},
}));
api["CONTROLLER_AXIS"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
@ -182,7 +182,7 @@ namespace MWLua
{"LookUpDown", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_LookUpDown)},
{"LookLeftRight", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_LookLeftRight)},
{"MoveForwardBackward", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_MoveForwardBackward)},
{"MoveLeftRight", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_MoveLeftRight)}
{"MoveLeftRight", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_MoveLeftRight)},
}));
api["KEY"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, SDL_Scancode>({
@ -293,7 +293,7 @@ namespace MWLua
{"Semicolon", SDL_SCANCODE_SEMICOLON},
{"Slash", SDL_SCANCODE_SLASH},
{"Space", SDL_SCANCODE_SPACE},
{"Tab", SDL_SCANCODE_TAB}
{"Tab", SDL_SCANCODE_TAB},
}));
return LuaUtil::makeReadOnly(api);

10
components/esm/attr.cpp
Unescape Escape View File

@ -10,7 +10,7 @@ const Attribute::AttributeID Attribute::sAttributeIds[Attribute::Length] = {
Attribute::Speed,
Attribute::Endurance,
Attribute::Personality,
Attribute::Luck
Attribute::Luck,
};
const std::string Attribute::sAttributeNames[Attribute::Length] = {
@ -21,7 +21,7 @@ const std::string Attribute::sAttributeNames[Attribute::Length] = {
"Speed",
"Endurance",
"Personality",
"Luck"
"Luck",
};
const std::string Attribute::sGmstAttributeIds[Attribute::Length] = {
@ -32,7 +32,7 @@ const std::string Attribute::sGmstAttributeIds[Attribute::Length] = {
"sAttributeSpeed",
"sAttributeEndurance",
"sAttributePersonality",
"sAttributeLuck"
"sAttributeLuck",
};
const std::string Attribute::sGmstAttributeDescIds[Attribute::Length] = {
@ -43,7 +43,7 @@ const std::string Attribute::sGmstAttributeDescIds[Attribute::Length] = {
"sSpdDesc",
"sEndDesc",
"sPerDesc",
"sLucDesc"
"sLucDesc",
};
const std::string Attribute::sAttributeIcons[Attribute::Length] = {
@ -54,5 +54,5 @@ const std::string Attribute::sAttributeIcons[Attribute::Length] = {
"icons\\k\\attribute_speed.dds",
"icons\\k\\attribute_endurance.dds",
"icons\\k\\attribute_personality.dds",
"icons\\k\\attribute_luck.dds"
"icons\\k\\attribute_luck.dds",
};

2
components/esm3/loadmgef.cpp
Unescape Escape View File

@ -160,7 +160,7 @@ namespace
"SummonBear",
"SummonBonewolf",
"SummonCreature04",
"SummonCreature05"
"SummonCreature05",
};
const int NumberOfHardcodedFlags = 143;

14
components/fx/parse_constants.hpp
Unescape Escape View File

@ -23,7 +23,7 @@ namespace fx
{"disable_underwater" , Technique::Flag_Disable_Underwater},
{"disable_abovewater" , Technique::Flag_Disable_Abovewater},
{"disable_sunglare" , Technique::Flag_Disable_SunGlare},
{"hidden" , Technique::Flag_Hidden}
{"hidden" , Technique::Flag_Hidden},
}};
constexpr std::array<std::pair<std::string_view, int>, 6> SourceFormat = {{
@ -63,7 +63,7 @@ namespace fx
{"depth_component16" , GL_DEPTH_COMPONENT16},
{"depth_component24" , GL_DEPTH_COMPONENT24},
{"depth_component32" , GL_DEPTH_COMPONENT32},
{"depth_component32f", GL_DEPTH_COMPONENT32F}
{"depth_component32f", GL_DEPTH_COMPONENT32F},
}};
constexpr std::array<std::pair<std::string_view, osg::Texture::InternalFormatMode>, 13> Compression = {{
@ -79,7 +79,7 @@ namespace fx
{"rgtc1" , osg::Texture::USE_RGTC1_COMPRESSION},
{"rgtc2" , osg::Texture::USE_RGTC2_COMPRESSION},
{"s3tc_dxt1c" , osg::Texture::USE_S3TC_DXT1c_COMPRESSION},
{"s3tc_dxt1a" , osg::Texture::USE_S3TC_DXT1a_COMPRESSION}
{"s3tc_dxt1a" , osg::Texture::USE_S3TC_DXT1a_COMPRESSION},
}};
constexpr std::array<std::pair<std::string_view, osg::Texture::WrapMode>, 6> WrapMode = {{
@ -87,7 +87,7 @@ namespace fx
{"clamp_to_edge" , osg::Texture::CLAMP_TO_EDGE},
{"clamp_to_border", osg::Texture::CLAMP_TO_BORDER},
{"repeat" , osg::Texture::REPEAT},
{"mirror" , osg::Texture::MIRROR}
{"mirror" , osg::Texture::MIRROR},
}};
constexpr std::array<std::pair<std::string_view, osg::Texture::FilterMode>, 6> FilterMode = {{
@ -96,7 +96,7 @@ namespace fx
{"linear_mipmap_nearest" , osg::Texture::LINEAR_MIPMAP_NEAREST},
{"nearest" , osg::Texture::NEAREST},
{"nearest_mipmap_linear" , osg::Texture::NEAREST_MIPMAP_LINEAR},
{"nearest_mipmap_nearest", osg::Texture::NEAREST_MIPMAP_NEAREST}
{"nearest_mipmap_nearest", osg::Texture::NEAREST_MIPMAP_NEAREST},
}};
constexpr std::array<std::pair<std::string_view, osg::BlendFunc::BlendFuncMode>, 15> BlendFunc = {{
@ -114,7 +114,7 @@ namespace fx
{"one_minus_constant_color" , osg::BlendFunc::ONE_MINUS_CONSTANT_COLOR},
{"constant_alpha" , osg::BlendFunc::CONSTANT_ALPHA},
{"one_minus_constant_alpha" , osg::BlendFunc::ONE_MINUS_CONSTANT_ALPHA},
{"zero" , osg::BlendFunc::ZERO}
{"zero" , osg::BlendFunc::ZERO},
}};
constexpr std::array<std::pair<std::string_view, osg::BlendEquation::Equation>, 8> BlendEquation = {{
@ -125,7 +125,7 @@ namespace fx
{"logic_op" , osg::BlendEquation::LOGIC_OP},
{"add" , osg::BlendEquation::FUNC_ADD},
{"subtract" , osg::BlendEquation::FUNC_SUBTRACT},
{"reverse_subtract" , osg::BlendEquation::FUNC_REVERSE_SUBTRACT}
{"reverse_subtract" , osg::BlendEquation::FUNC_REVERSE_SUBTRACT},
}};
}
}

Write Preview
Loading…
Cancel
Save