X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=.clang-format;h=63f12b6c42adefca9fe9a5d7e5b34360ae79e018;hb=5e4a01f2debd173058963f3c19dd954fcd039660;hp=82e2abf156aed04137bcfc075a1f76cb082c6c6a;hpb=22567d107fffe7a6833b96cc99d531e5303b47dd;p=minetest.git

diff --git a/.clang-format b/.clang-format
index 82e2abf15..63f12b6c4 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,12 +1,33 @@
 BasedOnStyle: LLVM
-IndentWidth: 8
+IndentWidth: 4
 UseTab: Always
-BreakBeforeBraces: Linux
+TabWidth: 4
+BreakBeforeBraces: Custom
+Standard: Cpp11
+BraceWrapping:
+  AfterClass: true
+  AfterControlStatement: false
+  AfterEnum: true
+  AfterFunction: true
+  AfterNamespace: true
+  AfterStruct: true
+  AfterUnion: true
+  BeforeCatch: false
+  BeforeElse: false
+FixNamespaceComments: false
 AllowShortIfStatementsOnASingleLine: false
 IndentCaseLabels: false
-AccessModifierOffset: -8
+AccessModifierOffset: -4
+ColumnLimit: 90
+AllowShortFunctionsOnASingleLine: InlineOnly
+SortIncludes: false
 IncludeCategories:
   - Regex:           '^".*'
     Priority:        2
   - Regex:           '^<.*'
     Priority:        1
+AlignAfterOpenBracket: DontAlign
+ContinuationIndentWidth: 8
+ConstructorInitializerIndentWidth: 8
+BreakConstructorInitializers: AfterColon
+AlwaysBreakTemplateDeclarations: Yes