From 09f0846115006e3b9e43d6a24b3da82adba4b4b0 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Fri, 19 Mar 2010 20:16:04 +1300
Subject: [PATCH] don't set everyone's name to Chris, etc.

---
 openra-data.sln           | 19 +++----------------
 settings-netplay-ra.ini   |  3 +--
 settings-netplay-rang.ini |  4 ++++
 3 files changed, 8 insertions(+), 18 deletions(-)
 create mode 100644 settings-netplay-rang.ini

diff --git a/openra-data.sln b/openra-data.sln
index bf91b19a05..c8dcfe480c 100644
--- a/openra-data.sln
+++ b/openra-data.sln
@@ -6,7 +6,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ra", "ra", "{59F0734D-2F86-4C26-8171-CF45EE01E97A}"
 	ProjectSection(SolutionItems) = preProject
 		mods\ra\defaults.yaml = mods\ra\defaults.yaml
-		mods\ra\merge-rules.yaml = mods\ra\merge-rules.yaml
 		mods\ra\mod.yaml = mods\ra\mod.yaml
 		mods\ra\nopower.shp = mods\ra\nopower.shp
 		mods\ra\rules.ini = mods\ra\rules.ini
@@ -25,6 +24,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "aftermath", "aftermath", "{
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ra-ng", "ra-ng", "{8C56DCEF-63A3-4E69-B826-20C5F7EF4C43}"
 	ProjectSection(SolutionItems) = preProject
+		mods\ra-ng\crate-drop.yaml = mods\ra-ng\crate-drop.yaml
 		mods\ra-ng\defense-queue.yaml = mods\ra-ng\defense-queue.yaml
 		mods\ra-ng\mod.yaml = mods\ra-ng\mod.yaml
 	EndProjectSection
@@ -39,8 +39,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shaders", "shaders", "{119A
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "settings", "settings", "{CCCBD235-11AB-4FA2-9641-93038EACAFC8}"
 	ProjectSection(SolutionItems) = preProject
-		settings-netplay-local-aftermath.ini = settings-netplay-local-aftermath.ini
-		settings-netplay-local.ini = settings-netplay-local.ini
+		settings-netplay-cnc.ini = settings-netplay-cnc.ini
+		settings-netplay-ra.ini = settings-netplay-ra.ini
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "globals", "globals", "{27CA9A65-2FEE-4995-B7F0-E5BE1BB5494B}"
@@ -60,18 +60,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{3FB8CE49-01F
 		doc\shp dune 2.txt = doc\shp dune 2.txt
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "remaps", "remaps", "{CA06F234-23DF-4DF3-95D5-42F6C67A387D}"
-	ProjectSection(SolutionItems) = preProject
-		mods\ra\blue.rem = mods\ra\blue.rem
-		mods\ra\gold.rem = mods\ra\gold.rem
-		mods\ra\gray.rem = mods\ra\gray.rem
-		mods\ra\green.rem = mods\ra\green.rem
-		mods\ra\orange.rem = mods\ra\orange.rem
-		mods\ra\red.rem = mods\ra\red.rem
-		mods\ra\salmon.rem = mods\ra\salmon.rem
-		mods\ra\teal.rem = mods\ra\teal.rem
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cnc", "cnc", "{65D8A06F-F2DF-4000-A4F7-AFDB4C282698}"
 	ProjectSection(SolutionItems) = preProject
 		mods\cnc\chrome-gdi.png = mods\cnc\chrome-gdi.png
@@ -108,6 +96,5 @@ Global
 		{8DA16338-FA8F-4CCD-8731-CBFCF5E31A78} = {F0BAF862-166C-402E-AF8E-16CA1A5EB585}
 		{8C56DCEF-63A3-4E69-B826-20C5F7EF4C43} = {F0BAF862-166C-402E-AF8E-16CA1A5EB585}
 		{65D8A06F-F2DF-4000-A4F7-AFDB4C282698} = {F0BAF862-166C-402E-AF8E-16CA1A5EB585}
-		{CA06F234-23DF-4DF3-95D5-42F6C67A387D} = {59F0734D-2F86-4C26-8171-CF45EE01E97A}
 	EndGlobalSection
 EndGlobal
diff --git a/settings-netplay-ra.ini b/settings-netplay-ra.ini
index 55120406f7..be73876bc4 100644
--- a/settings-netplay-ra.ini
+++ b/settings-netplay-ra.ini
@@ -1,5 +1,4 @@
 [Settings]
 NetworkHost=localhost
 NetworkPort=1234
-InitialMods=ra,ra-ng
-PlayerName=Chris
\ No newline at end of file
+InitialMods=ra
\ No newline at end of file
diff --git a/settings-netplay-rang.ini b/settings-netplay-rang.ini
new file mode 100644
index 0000000000..d4e75e21ed
--- /dev/null
+++ b/settings-netplay-rang.ini
@@ -0,0 +1,4 @@
+[Settings]
+NetworkHost=localhost
+NetworkPort=1234
+InitialMods=ra,ra-ng
\ No newline at end of file