Merge remote-tracking branch 'origin/pr/14552'

* origin/pr/14552: sublimetext project astyle rule fix
CleverRaven · Dec 22, 2015 · 046a048 · 046a048
2 parents 9ff25da + d472aef
commit 046a048
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 22 deletions.
diff --git a/.astylerc b/.astylerc
@@ -1,4 +1,4 @@
-# These options are mirrored in .astylerc, Cataclysm-DDA.sublime-project and doc/CODE_STYLE.txt
+# These options are mirrored in .astylerc and doc/CODE_STYLE.txt
 
 # "One True Brace Style"
 --style=1tbs

diff --git a/Cataclysm-DDA.sublime-project b/Cataclysm-DDA.sublime-project
@@ -73,27 +73,9 @@
 		{
 			"options_c++":
 			{
-				"comment" : "These options are mirrored in .astylerc, Cataclysm-DDA.sublime-project and doc/CODE_STYLE.txt",
-				"additional_options":
-				[
-					"--style=1tbs",
-					"--attach-inlines"
-					"--indent=spaces=4",
-					"--align-pointer=name",
-					"--max-code-length=100",
-					"--break-after-logical",
-					"--indent-classes",
-					"--indent-switches",
-					"--indent-preprocessor",
-					"--indent-col1-comments",
-					"--min-conditional-indent=0",
-					"--pad-oper",
-					"--add-brackets",
-					"--convert-tabs",
-					"--unpad-paren",
-					"--pad-paren-in"
-				]
-			}
+                "use_only_additional_options": true,
+                "additional_options_file": ".astylerc"
+            }
 		}
 	}
 }