From 82fa4439bfd8873f8b0d26aee4fbe892bfb631af Mon Sep 17 00:00:00 2001
From: anyc <dev@kicherer.org>
Date: Mon, 19 May 2014 21:04:28 +0200
Subject: [PATCH] renamed strings.[ch] to string_ids.[ch] due to name collision

---
 projects/openrct2.vcxproj         | 6 +++---
 projects/openrct2.vcxproj.filters | 6 +++---
 src/editor.c                      | 2 +-
 src/game.c                        | 2 +-
 src/gfx.c                         | 2 +-
 src/intro.c                       | 2 +-
 src/news_item.c                   | 2 +-
 src/news_item.h                   | 2 +-
 src/park.c                        | 2 +-
 src/scenario.c                    | 2 +-
 src/screenshot.c                  | 2 +-
 src/{strings.c => string_ids.c}   | 2 +-
 src/{strings.h => string_ids.h}   | 4 ++--
 src/title.c                       | 2 +-
 src/viewport.c                    | 2 +-
 src/window_about.c                | 2 +-
 src/window_banner.c               | 2 +-
 src/window_cheats.c               | 2 +-
 src/window_clear_scenery.c        | 2 +-
 src/window_dropdown.c             | 2 +-
 src/window_footpath.c             | 2 +-
 src/window_game_bottom_toolbar.c  | 2 +-
 src/window_game_top_toolbar.c     | 2 +-
 src/window_guest_list.c           | 2 +-
 src/window_land.c                 | 2 +-
 src/window_map.c                  | 2 +-
 src/window_news.c                 | 2 +-
 src/window_options.c              | 2 +-
 src/window_park.c                 | 2 +-
 src/window_ride_list.c            | 2 +-
 src/window_save_prompt.c          | 2 +-
 src/window_title_exit.c           | 2 +-
 src/window_title_logo.c           | 2 +-
 src/window_title_menu.c           | 2 +-
 src/window_title_scenarioselect.c | 2 +-
 src/window_tooltip.c              | 2 +-
 src/window_water.c                | 2 +-
 37 files changed, 42 insertions(+), 42 deletions(-)
 rename src/{strings.c => string_ids.c} (99%)
 rename src/{strings.h => string_ids.h} (99%)

diff --git a/projects/openrct2.vcxproj b/projects/openrct2.vcxproj
index 95fe426232..b1c490f757 100644
--- a/projects/openrct2.vcxproj
+++ b/projects/openrct2.vcxproj
@@ -39,7 +39,7 @@
     <ClInclude Include="..\src\settings.h" />
     <ClInclude Include="..\src\sprite.h" />
     <ClInclude Include="..\src\sprites.h" />
-    <ClInclude Include="..\src\strings.h" />
+    <ClInclude Include="..\src\string_ids.h" />
     <ClInclude Include="..\src\title.h" />
     <ClInclude Include="..\src\track.h" />
     <ClInclude Include="..\src\tutorial.h" />
@@ -74,7 +74,7 @@
     <ClCompile Include="..\src\sawyercoding.c" />
     <ClCompile Include="..\src\scenario.c" />
     <ClCompile Include="..\src\screenshot.c" />
-    <ClCompile Include="..\src\strings.c" />
+    <ClCompile Include="..\src\string_ids.c" />
     <ClCompile Include="..\src\title.c" />
     <ClCompile Include="..\src\track.c" />
     <ClCompile Include="..\src\tutorial.c" />
@@ -193,4 +193,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/projects/openrct2.vcxproj.filters b/projects/openrct2.vcxproj.filters
index a37dff35ba..f1bf2f4f96 100644
--- a/projects/openrct2.vcxproj.filters
+++ b/projects/openrct2.vcxproj.filters
@@ -48,7 +48,7 @@
     <ClInclude Include="resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\strings.h">
+    <ClInclude Include="..\src\string_ids.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\src\peep.h">
@@ -182,7 +182,7 @@
     <ClCompile Include="..\src\scenario.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\strings.c">
+    <ClCompile Include="..\src\string_ids.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\src\config.c">
@@ -302,4 +302,4 @@
       <Filter>Resource Files</Filter>
     </None>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/editor.c b/src/editor.c
index e2d8e01f7b..b1aac65f76 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -31,7 +31,7 @@
 #include "viewport.h"
 #include "finance.h"
 #include "audio.h"
-#include "strings.h"
+#include "string_ids.h"
 
 static void set_all_land_owned();
 
diff --git a/src/game.c b/src/game.c
index 8aa081caee..9f779df8dd 100644
--- a/src/game.c
+++ b/src/game.c
@@ -32,7 +32,7 @@
 #include "sawyercoding.h"
 #include "scenario.h"
 #include "screenshot.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "title.h"
 #include "tutorial.h"
 #include "viewport.h"
diff --git a/src/gfx.c b/src/gfx.c
index dbcbefc35c..30e781f5e3 100644
--- a/src/gfx.c
+++ b/src/gfx.c
@@ -24,7 +24,7 @@
 #include "addresses.h"
 #include "gfx.h"
 #include "rct2.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "window.h"
 
 // HACK These were originally passed back through registers
diff --git a/src/intro.c b/src/intro.c
index adf85e5028..aee44c43d1 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -25,7 +25,7 @@
 #include "rct2.h"
 #include "osinterface.h"
 #include "sprites.h"
-#include "strings.h"
+#include "string_ids.h"
 
 static void screen_intro_process_mouse_input();
 static void screen_intro_process_keyboard_input();
diff --git a/src/news_item.c b/src/news_item.c
index 4b5fa14e7c..083ef02f58 100644
--- a/src/news_item.c
+++ b/src/news_item.c
@@ -24,7 +24,7 @@
 #include "news_item.h"
 #include "rct2.h"
 #include "ride.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "sprite.h"
 #include "window.h"
 
diff --git a/src/news_item.h b/src/news_item.h
index a82aa29b0f..a089496741 100644
--- a/src/news_item.h
+++ b/src/news_item.h
@@ -23,7 +23,7 @@
 
 #include "rct2.h"
 #include "map.h"
-#include "strings.h"
+#include "string_ids.h"
 
 
 enum {
diff --git a/src/park.c b/src/park.c
index a3698008f7..bb7413f0fa 100644
--- a/src/park.c
+++ b/src/park.c
@@ -26,7 +26,7 @@
 #include "ride.h"
 #include "scenario.h"
 #include "sprite.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "window.h"
 
 int park_is_open()
diff --git a/src/scenario.c b/src/scenario.c
index c4e86986da..51f8710294 100644
--- a/src/scenario.c
+++ b/src/scenario.c
@@ -31,7 +31,7 @@
 #include "ride.h"
 #include "sawyercoding.h"
 #include "scenario.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "sprite.h"
 #include "viewport.h"
 
diff --git a/src/screenshot.c b/src/screenshot.c
index bf92238c2e..d557297a9e 100644
--- a/src/screenshot.c
+++ b/src/screenshot.c
@@ -26,7 +26,7 @@
 #include "gfx.h"
 #include "rct2.h"
 #include "screenshot.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "window_error.h"
 
 
diff --git a/src/strings.c b/src/string_ids.c
similarity index 99%
rename from src/strings.c
rename to src/string_ids.c
index fc50c8f1b6..331bb7537b 100644
--- a/src/strings.c
+++ b/src/string_ids.c
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include "addresses.h"
 #include "rct2.h"
-#include "strings.h"
+#include "string_ids.h"
 
 /**
  * Writes a formatted string to a buffer.
diff --git a/src/strings.h b/src/string_ids.h
similarity index 99%
rename from src/strings.h
rename to src/string_ids.h
index df01bb87c8..76ce106940 100644
--- a/src/strings.h
+++ b/src/string_ids.h
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#ifndef _STRINGS_H_
-#define _STRINGS_H_
+#ifndef _STRING_IDS_H_
+#define _STRING_IDS_H_
 
 typedef unsigned short rct_string_id;
 
diff --git a/src/title.c b/src/title.c
index 1664250b60..5240805f3b 100644
--- a/src/title.c
+++ b/src/title.c
@@ -32,7 +32,7 @@
 #include "rct2.h"
 #include "ride.h"
 #include "scenario.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "viewport.h"
 #include "editor.h"
 
diff --git a/src/viewport.c b/src/viewport.c
index b005bafad2..8f58623c45 100644
--- a/src/viewport.c
+++ b/src/viewport.c
@@ -21,7 +21,7 @@
 #include "addresses.h"
 #include "config.h"
 #include "gfx.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "viewport.h"
 #include "window.h"
 
diff --git a/src/window_about.c b/src/window_about.c
index 4250d65cdd..50c6d126d6 100644
--- a/src/window_about.c
+++ b/src/window_about.c
@@ -20,7 +20,7 @@
 
 #include <string.h>
 #include "addresses.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "sprites.h"
 #include "widget.h"
 #include "window.h"
diff --git a/src/window_banner.c b/src/window_banner.c
index 8f930d330b..67c115c045 100644
--- a/src/window_banner.c
+++ b/src/window_banner.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include "addresses.h"
 #include "config.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "viewport.h"
 #include "widget.h"
 #include "window.h"
diff --git a/src/window_cheats.c b/src/window_cheats.c
index c9500f65f1..f504a3ef76 100644
--- a/src/window_cheats.c
+++ b/src/window_cheats.c
@@ -22,7 +22,7 @@
 #include "addresses.h"
 #include "park.h"
 #include "peep.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "sprite.h"
 #include "sprites.h"
 #include "widget.h"
diff --git a/src/window_clear_scenery.c b/src/window_clear_scenery.c
index 9b8bde8727..13560367ab 100644
--- a/src/window_clear_scenery.c
+++ b/src/window_clear_scenery.c
@@ -20,7 +20,7 @@
 
 #include "addresses.h"
 #include "map.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "sprites.h"
 #include "widget.h"
 #include "window.h"
diff --git a/src/window_dropdown.c b/src/window_dropdown.c
index 84607a4632..03fe290e42 100644
--- a/src/window_dropdown.c
+++ b/src/window_dropdown.c
@@ -21,7 +21,7 @@
 #include <memory.h>
 #include "addresses.h"
 #include "scenario.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "sprites.h"
 #include "widget.h"
 #include "window.h"
diff --git a/src/window_footpath.c b/src/window_footpath.c
index 429baa8248..94345d9e3f 100644
--- a/src/window_footpath.c
+++ b/src/window_footpath.c
@@ -23,7 +23,7 @@
 #include "audio.h"
 #include "game.h"
 #include "map.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "sprites.h"
 #include "viewport.h"
 #include "widget.h"
diff --git a/src/window_game_bottom_toolbar.c b/src/window_game_bottom_toolbar.c
index 496a0e813c..86fa308a9e 100644
--- a/src/window_game_bottom_toolbar.c
+++ b/src/window_game_bottom_toolbar.c
@@ -26,7 +26,7 @@
 #include "peep.h"
 #include "sprite.h"
 #include "sprites.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "widget.h"
 #include "window.h"
 
diff --git a/src/window_game_top_toolbar.c b/src/window_game_top_toolbar.c
index 1f341ce6b8..c68df5182f 100644
--- a/src/window_game_top_toolbar.c
+++ b/src/window_game_top_toolbar.c
@@ -21,7 +21,7 @@
 #include "addresses.h"
 #include "game.h"
 #include "sprites.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "widget.h"
 #include "window.h"
 #include "window_dropdown.h"
diff --git a/src/window_guest_list.c b/src/window_guest_list.c
index bbdcbcca56..0ef8b24cbe 100644
--- a/src/window_guest_list.c
+++ b/src/window_guest_list.c
@@ -22,7 +22,7 @@
 #include "addresses.h"
 #include "game.h"
 #include "peep.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "sprite.h"
 #include "sprites.h"
 #include "widget.h"
diff --git a/src/window_land.c b/src/window_land.c
index 4a146bcf58..acefd10fc7 100644
--- a/src/window_land.c
+++ b/src/window_land.c
@@ -20,7 +20,7 @@
 
 #include "addresses.h"
 #include "map.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "sprites.h"
 #include "widget.h"
 #include "window.h"
diff --git a/src/window_map.c b/src/window_map.c
index fbb7005077..fe8f814910 100644
--- a/src/window_map.c
+++ b/src/window_map.c
@@ -20,7 +20,7 @@
 
 #include "addresses.h"
 #include "sprites.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "widget.h"
 #include "window.h"
 
diff --git a/src/window_news.c b/src/window_news.c
index 2bd3134588..c4b1c562a5 100644
--- a/src/window_news.c
+++ b/src/window_news.c
@@ -22,7 +22,7 @@
 #include "addresses.h"
 #include "audio.h"
 #include "news_item.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "sprite.h"
 #include "sprites.h"
 #include "widget.h"
diff --git a/src/window_options.c b/src/window_options.c
index 49f4285b81..ea999dd409 100644
--- a/src/window_options.c
+++ b/src/window_options.c
@@ -22,7 +22,7 @@
 #include "audio.h"
 #include "config.h"
 #include "gfx.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "viewport.h"
 #include "widget.h"
 #include "window.h"
diff --git a/src/window_park.c b/src/window_park.c
index 3c05270061..e9635e70d6 100644
--- a/src/window_park.c
+++ b/src/window_park.c
@@ -26,7 +26,7 @@
 #include "peep.h"
 #include "ride.h"
 #include "scenario.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "sprite.h"
 #include "sprites.h"
 #include "util.h"
diff --git a/src/window_ride_list.c b/src/window_ride_list.c
index a7dde38fe8..4e7bb35115 100644
--- a/src/window_ride_list.c
+++ b/src/window_ride_list.c
@@ -22,7 +22,7 @@
 #include "addresses.h"
 #include "game.h"
 #include "ride.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "sprites.h"
 #include "widget.h"
 #include "window.h"
diff --git a/src/window_save_prompt.c b/src/window_save_prompt.c
index a0a06597fd..40ba01f982 100644
--- a/src/window_save_prompt.c
+++ b/src/window_save_prompt.c
@@ -21,7 +21,7 @@
 #include "addresses.h"
 #include "game.h"
 #include "rct2.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "sprites.h"
 #include "tutorial.h"
 #include "widget.h"
diff --git a/src/window_title_exit.c b/src/window_title_exit.c
index 780e4cf3b4..843a848cc7 100644
--- a/src/window_title_exit.c
+++ b/src/window_title_exit.c
@@ -21,7 +21,7 @@
 #include "addresses.h"
 #include "game.h"
 #include "sprites.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "widget.h"
 #include "window.h"
 
diff --git a/src/window_title_logo.c b/src/window_title_logo.c
index f30a66cea4..1b1b4a06ac 100644
--- a/src/window_title_logo.c
+++ b/src/window_title_logo.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #include "addresses.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "sprites.h"
 #include "widget.h"
 #include "window.h"
diff --git a/src/window_title_menu.c b/src/window_title_menu.c
index e139ce8397..63f3c68e25 100644
--- a/src/window_title_menu.c
+++ b/src/window_title_menu.c
@@ -21,7 +21,7 @@
 #include "addresses.h"
 #include "editor.h"
 #include "game.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "sprites.h"
 #include "tutorial.h"
 #include "widget.h"
diff --git a/src/window_title_scenarioselect.c b/src/window_title_scenarioselect.c
index 5523f6aa55..c0e22f6287 100644
--- a/src/window_title_scenarioselect.c
+++ b/src/window_title_scenarioselect.c
@@ -22,7 +22,7 @@
 #include "audio.h"
 #include "date.h"
 #include "scenario.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "sprites.h"
 #include "widget.h"
 #include "window.h"
diff --git a/src/window_tooltip.c b/src/window_tooltip.c
index b570a190d3..52602d6c41 100644
--- a/src/window_tooltip.c
+++ b/src/window_tooltip.c
@@ -20,7 +20,7 @@
 
 #include <memory.h>
 #include "addresses.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "widget.h"
 #include "window.h"
 
diff --git a/src/window_water.c b/src/window_water.c
index 57c8fc9a09..d22819a56b 100644
--- a/src/window_water.c
+++ b/src/window_water.c
@@ -20,7 +20,7 @@
 
 #include "addresses.h"
 #include "map.h"
-#include "strings.h"
+#include "string_ids.h"
 #include "sprites.h"
 #include "widget.h"
 #include "window.h"