renamed strings.[ch] to string_ids.[ch] due to name collision

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>
+</Project>

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>
+</Project>

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();
 

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"

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

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();

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"
 

src/news_item.h

@@ -23,7 +23,7 @@
 
 #include "rct2.h"
 #include "map.h"
-#include "strings.h"
+#include "string_ids.h"
 
 
 enum {

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()

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"
 

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"
 
 

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.

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;
 

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"
 

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"
 

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"

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"

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"

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"

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"

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"

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"
 

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"
 

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"

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"

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"

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"
 

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"