mirror of https://github.com/OpenRCT2/OpenRCT2.git
Added newlines at end of files
This commit is contained in:
parent
eab3e15182
commit
e6f771ec90
|
@ -13,4 +13,4 @@
|
|||
"DVTSourceControlWorkspaceBlueprintNameKey" : "OpenRCT2",
|
||||
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
|
||||
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "OpenRCT2.xcodeproj"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
version: 0.0.3.{build}
|
||||
build_script:
|
||||
- set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
|
||||
- .\build.bat
|
||||
- .\build.bat
|
||||
|
|
|
@ -1 +1 @@
|
|||
msbuild .\projects\openrct2.sln /p:Configuration=Release /p:Platform=Win32
|
||||
msbuild .\projects\openrct2.sln /p:Configuration=Release /p:Platform=Win32
|
||||
|
|
|
@ -1 +1 @@
|
|||
.\build\release\openrct2.exe sprite build "data\g2.dat" "resources\g2"
|
||||
.\build\release\openrct2.exe sprite build "data\g2.dat" "resources\g2"
|
||||
|
|
|
@ -3,4 +3,4 @@ Release version: 0.0.3-1-beta
|
|||
* Some sounds play at their maximum volume irrespective of the sound volume control.
|
||||
* Scenario editor object selection window will show object names in the selected language at the time of building the object cache. (Deleting plugin.dat in Documents/OpenRCT2 will fix this)
|
||||
|
||||
Some bugs or limitations present in the original game have not yet been fixed or lifted.
|
||||
Some bugs or limitations present in the original game have not yet been fixed or lifted.
|
||||
|
|
|
@ -65,4 +65,4 @@
|
|||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -159,4 +159,4 @@ Licences for sub-libraries used by the above may vary. For more information, vis
|
|||
|
||||
9.0) Credits
|
||||
---- -------
|
||||
For the full list of contributors to OpenRCT2, see the file 'contributors.md'.
|
||||
For the full list of contributors to OpenRCT2, see the file 'contributors.md'.
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
$path = Split-Path $Script:MyInvocation.MyCommand.Path
|
||||
Write-Output "Building Windows Installer (NSIS script)";
|
||||
makensis /DVERSION_INCLUDE=$path\win32.txt $path\install.nsi > $path\win32.log;
|
||||
makensis /DVERSION_INCLUDE=$path\win32.txt $path\install.nsi > $path\win32.log;
|
||||
|
|
|
@ -3,4 +3,4 @@ This directory contains the script and resources for the Windows installer. The
|
|||
|
||||
As there is currently only a 32 bit version of OpenRCT2 available, the architecture and windows version checks have been disabled. These will be re-enabled once OpenRCT2 is a stand alone executable.
|
||||
|
||||
Code based on [OpenTTD](http://openttd.org) installer.
|
||||
Code based on [OpenTTD](http://openttd.org) installer.
|
||||
|
|
|
@ -2,4 +2,4 @@
|
|||
!define EXTRA_VERSION "Vista, 7, 8.1 and 10"
|
||||
!define APPARCH "win32" ; Define the application architecture
|
||||
!define BINARY_DIR "${PATH_ROOT}build\Release"
|
||||
InstallDir "$PROGRAMFILES32\OpenRCT2\"
|
||||
InstallDir "$PROGRAMFILES32\OpenRCT2\"
|
||||
|
|
|
@ -41,4 +41,4 @@ using (FileStream fs = new FileStream(outputPath, FileMode.Create)) {
|
|||
}
|
||||
bw.Write(dataStream.ToArray());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -35,4 +35,4 @@ extern int gNetworkStartPort;
|
|||
int cmdline_run(const char **argv, int argc);
|
||||
int cmdline_for_sprite(const char **argv, int argc);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -530,4 +530,4 @@ unsigned char hand_closed_cursor_mask[32 * 4] = {
|
|||
0x07, 0x1F, 0xFF, 0xF0, 0x0F, 0x9F, 0xFF, 0xF0, 0x0F, 0xFF, 0xFF, 0xF0, 0x0F, 0xFF, 0xFF, 0xF0,
|
||||
0x0F, 0xFF, 0xFF, 0xF0, 0x07, 0xFF, 0xFF, 0xF8, 0x07, 0xFF, 0xFF, 0xF8, 0x03, 0xFF, 0xFF, 0xF8,
|
||||
0x00, 0x7F, 0xFF, 0xFC, 0x00, 0x01, 0xFF, 0xFC, 0x00, 0x00, 0xFF, 0xF8, 0x00, 0x00, 0x7F, 0xE0,
|
||||
};
|
||||
};
|
||||
|
|
|
@ -182,4 +182,4 @@ extern unsigned char hand_closed_cursor_mask[32 * 4];
|
|||
#define HAND_CLOSED_CURSOR_HOTX 5
|
||||
#define HAND_CLOSED_CURSOR_HOTY 1
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -226,4 +226,4 @@ static void draw_heavy_rain(int left, int top, int width, int height)
|
|||
y_start += top;
|
||||
|
||||
gfx_draw_rain(left, top, width, height, x_start, y_start);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -5,4 +5,4 @@
|
|||
|
||||
bool wooden_a_supports_paint_setup(int supportType, int special, int height, uint32 imageColourFlags);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -34,4 +34,4 @@ enum REGISTER_ARGS {
|
|||
|
||||
void addhook(int address, int newaddress, int stacksize, int registerargs[], int registersreturned, int eaxDestinationRegister);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -55,4 +55,4 @@ void store_mouse_input(int state);
|
|||
|
||||
void input_window_position_begin(rct_window *w, int widgetIndex, int x, int y);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -18,4 +18,4 @@ void chat_history_add(const char *src);
|
|||
void chat_input(int c);
|
||||
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -81,4 +81,4 @@ extern rct_colour_map_b *ColourMapB;
|
|||
|
||||
void colours_init_maps();
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -26,4 +26,4 @@ void console_clear_line();
|
|||
void console_refresh_caret();
|
||||
void console_scroll(int delta);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -173,4 +173,4 @@ void graph_draw_money32(rct_drawpixelinfo *dpi, money32 *history, int count, int
|
|||
graph_draw_months_money32(dpi, history, count, baseX, baseY);
|
||||
graph_draw_line_a_money32(dpi, history, count, baseX, baseY, modifier, offset);
|
||||
graph_draw_line_b_money32(dpi, history, count, baseX, baseY, modifier, offset);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -27,4 +27,4 @@
|
|||
void graph_draw_uint8(rct_drawpixelinfo *dpi, uint8 *history, int count, int baseX, int baseY);
|
||||
void graph_draw_money32(rct_drawpixelinfo *dpi, money32 *history, int count, int baseX, int baseY, int modifier, int offset);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -26,4 +26,4 @@ void keyboard_shortcut_handle(int key);
|
|||
void keyboard_shortcut_handle_command(int shortcutIndex);
|
||||
void keyboard_shortcut_format_string(char *buffer, uint16 shortcutKey);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -27,4 +27,4 @@ int screenshot_dump();
|
|||
void screenshot_giant();
|
||||
int cmdline_for_screenshot(const char **argv, int argc);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -61,4 +61,4 @@ void theme_delete_preset(int preset);
|
|||
void theme_rename_preset(int preset, const char *newName);
|
||||
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -65,4 +65,4 @@ void title_sequence_delete_command(int preset, int index);
|
|||
void title_sequence_move_down_command(int preset, int index);
|
||||
void title_sequence_move_up_command(int preset, int index);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -57,4 +57,4 @@ bool award_is_positive(int type);
|
|||
void award_reset();
|
||||
void award_update_all();
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -54,4 +54,4 @@ void marketing_start_campaign(int type, int rideOrItem, int numWeeks);
|
|||
void game_command_start_campaign(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp);
|
||||
bool marketing_is_campaign_type_applicable(int campaignType);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -7,4 +7,4 @@ extern bool gTwitchEnable;
|
|||
|
||||
void twitch_update();
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -66,4 +66,4 @@ int mechanic_is_location_in_patrol(rct_peep *mechanic, int x, int y);
|
|||
void staff_reset_stats();
|
||||
bool staff_is_patrol_area_set(int staffIndex, int x, int y);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -26,4 +26,4 @@
|
|||
|
||||
void ride_ratings_update_all();
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -29,4 +29,4 @@ void ride_update_station(rct_ride *ride, int stationIndex);
|
|||
rct_map_element *ride_get_station_start_track_element(rct_ride *ride, int stationIndex);
|
||||
rct_map_element *ride_get_station_exit_element(rct_ride *ride, int x, int y, int z);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -10,4 +10,4 @@ TRACK_PAINT_FUNCTION get_track_paint_function_topspin(int trackType, int directi
|
|||
TRACK_PAINT_FUNCTION get_track_paint_function_shop(int trackType, int direction);
|
||||
TRACK_PAINT_FUNCTION get_track_paint_function_facility(int trackType, int direction);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -285,4 +285,4 @@ rct_ride_type_vehicle *vehicle_get_vehicle_entry(rct_vehicle *vehicle);
|
|||
/** Helper macro until rides are stored in this module. */
|
||||
#define GET_VEHICLE(sprite_index) &(g_sprite_list[sprite_index].vehicle)
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -40,4 +40,4 @@ void tutorial_start(int type)
|
|||
void tutorial_stop()
|
||||
{
|
||||
RCT2_CALLPROC_EBPSAFE(0x0066EE25);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -243,4 +243,4 @@ uint32 util_rand() {
|
|||
srand2 = srand3;
|
||||
srand3 = srand3 ^ (srand3 >> 19) ^ temp ^ (temp >> 8);
|
||||
return srand3;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -97,4 +97,4 @@ void window_editor_main_open()
|
|||
static void window_editor_main_paint(rct_window *w, rct_drawpixelinfo *dpi)
|
||||
{
|
||||
viewport_render(dpi, w->viewport, dpi->x, dpi->y, dpi->x + dpi->width, dpi->y + dpi->height);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -181,4 +181,4 @@ static void window_error_paint(rct_window *w, rct_drawpixelinfo *dpi)
|
|||
l = w->x + (w->width + 1) / 2 - 1;
|
||||
t = w->y + 1;
|
||||
draw_string_centred_raw(dpi, l, t, _window_error_num_lines, _window_error_text);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -25,4 +25,4 @@
|
|||
|
||||
void window_error_open(rct_string_id title, rct_string_id message);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -152,4 +152,4 @@ static void window_map_tooltip_paint(rct_window *w, rct_drawpixelinfo *dpi)
|
|||
return;
|
||||
|
||||
gfx_draw_string_centred_wrapped(dpi, (void*)RCT2_ADDRESS_MAP_TOOLTIP_ARGS, w->x + (w->width / 2), w->y + (w->height / 2), w->width, 1162, 0);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -173,4 +173,4 @@ static void window_music_credits_scrollpaint(rct_window *w, rct_drawpixelinfo *d
|
|||
string += 1;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -184,4 +184,4 @@ static void window_publisher_credits_scrollpaint(rct_window *w, rct_drawpixelinf
|
|||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -278,4 +278,4 @@ static void window_save_prompt_callback(int result)
|
|||
if (result == MODAL_RESULT_OK) {
|
||||
game_load_or_quit_no_save_prompt();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -123,4 +123,4 @@ static void window_shortcut_change_paint(rct_window *w, rct_drawpixelinfo *dpi)
|
|||
|
||||
RCT2_GLOBAL(0x13CE952, uint16) = ShortcutStringIds[RCT2_GLOBAL(0x009DE511, uint8)];
|
||||
gfx_draw_string_centred_wrapped(dpi, (void*)0x013CE952, x, y, 242, 2785, RCT2_GLOBAL(0x9DEB8D, uint8));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -144,4 +144,4 @@ static void window_title_logo_draw_expansion_packs(rct_drawpixelinfo *dpi)
|
|||
packs = packs >> 1;
|
||||
names += 128;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -28,4 +28,4 @@ void window_tooltip_show(rct_string_id id, int x, int y);
|
|||
void window_tooltip_open(rct_window *widgetWindow, int widgetIndex, int x, int y);
|
||||
void window_tooltip_close();
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -30,4 +30,4 @@ typedef struct {
|
|||
uint8 text_height; // 0x07
|
||||
} rct_entrance_type;
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -442,4 +442,4 @@ static void jumping_fountain_create_next(rct_jumping_fountain *jumpingFountain,
|
|||
JUMPING_FOUNTAIN_TYPE_WATER;
|
||||
|
||||
jumping_fountain_create(type, x, y, z, direction >> 1, flags, jumpingFountain->iteration);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -57,4 +57,4 @@ extern rct_map_animation *gAnimatedObjects;
|
|||
void map_animation_create(int type, int x, int y, int z);
|
||||
void map_animation_invalidate_all();
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -322,4 +322,4 @@ int map_smooth_wavy(int l, int t, int r, int b)
|
|||
}
|
||||
|
||||
return raisedLand;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -23,4 +23,4 @@
|
|||
|
||||
int map_smooth(int l, int t, int r, int b);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -43,4 +43,4 @@ void mapgen_generate_blank(mapgen_settings *settings);
|
|||
void mapgen_generate(mapgen_settings *settings);
|
||||
void mapgen_generate_custom_simplex(mapgen_settings *settings);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -192,4 +192,4 @@ void scenery_remove_ghost_tool_placement(){
|
|||
0,
|
||||
0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -187,4 +187,4 @@ void scenery_set_default_placement_configuration();
|
|||
void scenery_remove_ghost_tool_placement();
|
||||
void scenery_set_default_placement_configuration();
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -31,4 +31,4 @@ typedef struct {
|
|||
uint16 var_0E;
|
||||
} rct_water_type;
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
2
test.bat
2
test.bat
|
@ -1,2 +1,2 @@
|
|||
msbuild .\projects\openrct2.sln "/p:Configuration=Release with Tests" /p:Platform=Win32
|
||||
.\build\Release\openrct2.exe test
|
||||
.\build\Release\openrct2.exe test
|
||||
|
|
|
@ -27,4 +27,4 @@ void test_finance_setup(CuTest* tc);
|
|||
void test_finance_loan_increase(CuTest* tc);
|
||||
void test_finance_loan_pay_back(CuTest* tc);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -35,4 +35,4 @@ void test_ride_ratings(CuTest* tc) {
|
|||
}
|
||||
|
||||
free(rideRatings);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6,4 +6,4 @@
|
|||
void test_ride_ratings_setup(CuTest* tc);
|
||||
void test_ride_ratings(CuTest* tc);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -40,4 +40,4 @@ static void test_load_scenario(CuTest* tc, const char* file_name) {
|
|||
scenario_load_and_play(scenario);
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue