From d472aef7601ac3118553e8cda4d77b8f406daeed Mon Sep 17 00:00:00 2001
From: Clarence Risher <sparr0@gmail.com>
Date: Mon, 21 Dec 2015 23:35:32 -0800
Subject: [PATCH] sublimetext project astyle rule fix

---
 .astylerc                     |  2 +-
 CONTRIBUTING.md               |  2 +-
 Cataclysm-DDA.sublime-project | 23 +++--------------------
 3 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/.astylerc b/.astylerc
index 5f12420966c6f..7477eb7f4c9df 100644
--- a/.astylerc
+++ b/.astylerc
@@ -1,4 +1,4 @@
-# These options are mirrored in .astylerc, Cataclysm-DDA.sublime-project, CONTRIBUTING.md, doc/CODE_STYLE.txt
+# These options are mirrored in .astylerc, CONTRIBUTING.md, doc/CODE_STYLE.txt
 
 # "One True Brace Style"
 --style=1tbs
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f675829966fbb..162f3560ac4e2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -23,7 +23,7 @@ to ensure that their formatting is correct:
 
     astyle --style=1tbs --indent=spaces=4 --align-pointer=name --max-code-length=100 --break-after-logical --indent-classes --indent-preprocessor --indent-switches --indent-col1-comments --min-conditional-indent=0 --pad-oper --unpad-paren --pad-paren-in --add-brackets --convert-tabs
 
-These options are mirrored in .astylerc, Cataclysm-DDA.sublime-project, CONTRIBUTING.md, doc/CODE_STYLE.txt
+These options are mirrored in .astylerc, CONTRIBUTING.md, doc/CODE_STYLE.txt
 
 For example, from vi, set marks a and b around the block, then:
 
diff --git a/Cataclysm-DDA.sublime-project b/Cataclysm-DDA.sublime-project
index 773c24eb480e1..b8bd21559dc3d 100644
--- a/Cataclysm-DDA.sublime-project
+++ b/Cataclysm-DDA.sublime-project
@@ -73,26 +73,9 @@
 		{
 			"options_c++":
 			{
-				"comment" : "These options are mirrored in .astylerc, Cataclysm-DDA.sublime-project, CONTRIBUTING.md, doc/CODE_STYLE.txt",
-				"additional_options":
-				[
-					"--style=1tbs",
-					"--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"
+            }
 		}
 	}
 }