remove unnecessary header includes

src/config.c

@@ -19,7 +19,6 @@
  *****************************************************************************/
 
 #include <SDL_keycode.h>
-#include <ctype.h>
 #include "addresses.h"
 #include "config.h"
 #include "localisation/localisation.h"

src/drawing/drawing.c

@@ -18,12 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <assert.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <windows.h>
-#include <limits.h>
 #include "../addresses.h"
 #include "../common.h"
 #include "../localisation/localisation.h"

src/interface/viewport.c

@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <assert.h>
 #include "../addresses.h"
 #include "../config.h"
 #include "../drawing/drawing.h"

src/interface/widget.c

@@ -18,9 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <windows.h>
-#include <memory.h>
-#include <stdlib.h>
 #include "../addresses.h"
 #include "../drawing/drawing.h"
 #include "../input.h"

src/interface/window.c

@@ -18,7 +18,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *****************************************************************************/
 
-#include <string.h>
 #include "../addresses.h"
 #include "../audio/audio.h"
 #include "../game.h"

src/localisation/language.c

@@ -18,8 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <stdio.h>
-#include <string.h>
 #include "../addresses.h"
 #include "localisation.h"
 

src/management/news_item.c

@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <string.h>
 #include "../addresses.h"
 #include "../audio/audio.h"
 #include "../input.h"

src/object.c

@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <ctype.h>
 #include "addresses.h"
 #include "localisation/localisation.h"
 #include "object.h"

src/peep/peep.c

@@ -18,8 +18,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *****************************************************************************/
 
-#include <assert.h>
-#include <windows.h>
 #include "../addresses.h"
 #include "../audio/audio.h"
 #include "../audio/mixer.h"

src/platform/osinterface.c

@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <stdio.h>
 #include <shlobj.h>
 #include <tchar.h>
 #include <SDL.h>

src/platform/platform.h

@@ -38,5 +38,6 @@ void platform_hide_cursor();
 void platform_show_cursor();
 void platform_get_cursor_position(int *x, int *y);
 void platform_set_cursor_position(int x, int y);
+unsigned int platform_get_ticks();
 
 #endif

src/platform/windows.c

@@ -215,6 +215,11 @@ void platform_set_cursor_position(int x, int y)
 	SetCursorPos(x, y);
 }
 
+unsigned int platform_get_ticks()
+{
+	return GetTickCount();
+}
+
 /**
  * http://alter.org.ua/en/docs/win/args/
  */

src/rct2.c

@@ -21,12 +21,6 @@
 #pragma warning(disable : 4996) // GetVersionExA deprecated
 
 #include <setjmp.h>
-#ifdef _MSC_VER
-#include <time.h>
-#endif
-#include <windows.h>
-#include <shlobj.h>
-#include <SDL.h>
 #include "addresses.h"
 #include "audio/audio.h"
 #include "audio/mixer.h"

src/rct2.h

@@ -22,12 +22,18 @@
 #define _RCT2_H_
 
 #include <assert.h>
+#include <ctype.h>
+#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
+#ifdef _MSC_VER
+	#include <time.h>
+#endif
+
 typedef signed char sint8;
 typedef signed short sint16;
 typedef signed long sint32;

src/ride/ride.c

@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <windows.h>
 #include "../addresses.h"
 #include "../audio/audio.h"
 #include "../audio/mixer.h"

src/ride/ride_data.c

@@ -8,7 +8,6 @@
  * https://gist.github.com/kevinburke/eaeb1d8149a6eef0dcc1
  */
 
-#include <stdbool.h>
 #include "ride.h"
 #include "ride_data.h"
 

src/ride/ride_data.h

@@ -21,7 +21,6 @@
 #ifndef _RIDE_DATA_H_
 #define _RIDE_DATA_H_
 
-#include <stdbool.h>
 #include "../common.h"
 
 typedef struct {

src/scenario.c

@@ -18,8 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <windows.h>
-#include "title.h"
 #include "addresses.h"
 #include "game.h"
 #include "interface/viewport.h"
@@ -30,8 +28,10 @@
 #include "management/marketing.h"
 #include "management/news_item.h"
 #include "object.h"
+#include "platform/platform.h"
 #include "ride/ride.h"
 #include "scenario.h"
+#include "title.h"
 #include "util/sawyercoding.h"
 #include "util/util.h"
 #include "world/map.h"
@@ -201,8 +201,8 @@ int scenario_load_and_play_from_path(const char *path)
 
 	// Create the scenario pseduo-random seeds using the current time
 	uint32 srand0, srand1;
-	srand0 = RCT2_GLOBAL(RCT2_ADDRESS_SCENARIO_SRAND_0, uint32) ^ timeGetTime();
-	srand1 = RCT2_GLOBAL(RCT2_ADDRESS_SCENARIO_SRAND_1, uint32) ^ timeGetTime();
+	srand0 = RCT2_GLOBAL(RCT2_ADDRESS_SCENARIO_SRAND_0, uint32) ^ platform_get_ticks();
+	srand1 = RCT2_GLOBAL(RCT2_ADDRESS_SCENARIO_SRAND_1, uint32) ^ platform_get_ticks();
 
 	window_close_construction_windows();
 

src/title.c

@@ -18,7 +18,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *****************************************************************************/
 
-#include <time.h>
 #include "addresses.h"
 #include "audio/audio.h"
 #include "config.h"

src/util/sawyercoding.c

@@ -18,8 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <windows.h>
-#include <string.h>
 #include "../addresses.h"
 #include "sawyercoding.h"
 

src/util/sawyercoding.h

@@ -21,7 +21,6 @@
 #ifndef _SAWYERCODING_H_
 #define _SAWYERCODING_H_
 
-#include <stdio.h>
 #include "../common.h"
 
 typedef struct {

src/windows/about.c

@@ -18,8 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <windows.h>
-#include <string.h>
 #include "../addresses.h"
 #include "../localisation/localisation.h"
 #include "../sprites.h"

src/windows/banner.c

@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <string.h>
 #include "../addresses.h"
 #include "../game.h"
 #include "../config.h"

src/windows/cheats.c

@@ -18,9 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <windows.h>
-#include <string.h>
-#include <limits.h>
 #include "../addresses.h"
 #include "../game.h"
 #include "../interface/widget.h"

src/windows/dropdown.c

@@ -18,8 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <windows.h>
-#include <memory.h>
 #include "../addresses.h"
 #include "../input.h"
 #include "../interface/widget.h"

src/windows/editor_bottom_toolbar.c

@@ -18,7 +18,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *****************************************************************************/
 
-#include <stdbool.h>
 #include "../addresses.h"
 #include "../audio/audio.h"
 #include "../config.h"

src/windows/footpath.c

@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <string.h>
 #include "../addresses.h"
 #include "../audio/audio.h"
 #include "../game.h"

src/windows/game_bottom_toolbar.c

@@ -18,8 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <windows.h>
-#include <string.h>
 #include "../addresses.h"
 #include "../localisation/date.h"
 #include "../localisation/localisation.h"

src/windows/game_top_toolbar.c

@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <string.h>
 #include "../addresses.h"
 #include "../game.h"
 #include "../input.h"

src/windows/guest_list.c

@@ -18,8 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <string.h>
-#include <assert.h>
 #include "../addresses.h"
 #include "../game.h"
 #include "../interface/widget.h"

src/windows/map.c

@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <string.h>
 #include "../addresses.h"
 #include "../localisation/localisation.h"
 #include "../input.h"

src/windows/map_tooltip.c

@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <string.h>
 #include "../addresses.h"
 #include "../localisation/localisation.h"
 #include "../input.h"

src/windows/music_credits.c

@@ -18,8 +18,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *****************************************************************************/
 
-#include <windows.h>
-#include <string.h>
 #include "../addresses.h"
 #include "../localisation/localisation.h"
 #include "../sprites.h"

src/windows/new_campaign.c

@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <string.h>
 #include "../addresses.h"
 #include "../game.h"
 #include "../localisation/localisation.h"

src/windows/new_ride.c

@@ -18,7 +18,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *****************************************************************************/
 
-#include <string.h>
 #include "../addresses.h"
 #include "../audio/audio.h"
 #include "../game.h"

src/windows/news.c

@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <string.h>
 #include "../addresses.h"
 #include "../audio/audio.h"
 #include "../management/news_item.h"

src/windows/options.c

@@ -26,8 +26,6 @@
  *      Padding between the widgets and the window needs reducing, an artifact from originally being inside group boxes.
  */
 
-#include <stdint.h>
-
 #include "../addresses.h"
 #include "../audio/audio.h"
 #include "../audio/mixer.h"

src/windows/park.c

@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <string.h>
 #include "../addresses.h"
 #include "../config.h"
 #include "../game.h"

src/windows/publisher_credits.c

@@ -18,8 +18,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *****************************************************************************/
 
-#include <windows.h>
-#include <string.h>
 #include "../addresses.h"
 #include "../localisation/localisation.h"
 #include "../sprites.h"

src/windows/ride.c

@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <string.h>
 #include "../addresses.h"
 #include "../game.h"
 #include "../input.h"

src/windows/ride_list.c

@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <string.h>
 #include "../addresses.h"
 #include "../game.h"
 #include "../ride/ride.h"

src/windows/scenery.c

@@ -18,8 +18,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *****************************************************************************/
 
-#include <string.h>
-#include <stdbool.h>
 #include "../addresses.h"
 #include "../audio/audio.h"
 #include "../drawing/drawing.h"

src/windows/sign.c

@@ -18,7 +18,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *****************************************************************************/
 
-#include <string.h>
 #include "../addresses.h"
 #include "../game.h"
 #include "../config.h"

src/windows/staff_list.c

@@ -18,7 +18,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *****************************************************************************/
 
-#include <string.h>
 #include "../addresses.h"
 #include "../game.h"
 #include "../drawing/drawing.h"

src/windows/title_scenarioselect.c

@@ -18,7 +18,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *****************************************************************************/
 
-#include <string.h>
 #include "../addresses.h"
 #include "../audio/audio.h"
 #include "../localisation/date.h"

src/windows/tooltip.c

@@ -18,8 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <windows.h>
-#include <memory.h>
 #include "../addresses.h"
 #include "../drawing/drawing.h"
 #include "../localisation/localisation.h"

src/windows/track_list.c

@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <memory.h>
 #include "../addresses.h"
 #include "../audio/audio.h"
 #include "../editor.h"

src/windows/track_place.c

@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <string.h>
 #include "../addresses.h"
 #include "../audio/audio.h"
 #include "../game.h"

src/windows/viewport.c

@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <string.h>
 #include "../addresses.h"
 #include "../audio/audio.h"
 #include "../game.h"

src/world/park.c

@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <windows.h>
 #include "../addresses.h"
 #include "../interface/window.h"
 #include "../localisation/localisation.h"

src/world/sprite.c

@@ -18,10 +18,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-#include <string.h>
 #include "../addresses.h"
-#include "sprite.h"
 #include "../interface/viewport.h"
+#include "sprite.h"
 
 rct_sprite* g_sprite_list = RCT2_ADDRESS(RCT2_ADDRESS_SPRITE_LIST, rct_sprite);