mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 03:23:15 +01:00
Code Issues Releases Wiki Activity

Merge pull request #481 from marcotc/work

Browse Source 
Fix errors/warnings in VS build
This commit is contained in:
Ted John
2014-09-23 12:52:38 +01:00
parent 8017bc8d27 58cea29223
commit 2ff6d533e8
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/openrct2.vcxproj
View File

@@ -190,7 +190,7 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IncludePath>$(SolutionDir)..\lodepng;$(SolutionDir)..\sdl\include;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)..\lodepng;$(SolutionDir)..\sdl\include;$(SolutionDir)..\libspeex;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)..\sdl\lib\x86;$(LibraryPath)</LibraryPath>
<OutDir>$(SolutionDir)..\build\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)..\obj\$(Configuration)\</IntDir>

2
src/input.c
View File

@@ -1062,7 +1062,7 @@ static void input_mouseover(int x, int y, rct_window *w, int widgetIndex)
{
rct_windowclass windowClass = 255;
rct_windownumber windowNumber = 0;
rct_widget *widget;
rct_widget *widget = NULL;
if (w != NULL) {
windowClass = w->classification;

3
src/language.c
View File

@@ -134,7 +134,8 @@ static int language_open_file(const char *filename)
language_strings = calloc(STR_COUNT, sizeof(char*));
char *dst, *token;
char *dst = NULL;
char *token = NULL;
char tokenBuffer[64];
int i, stringIndex = 0, mode = 0, string_no;
for (i = 0; i < language_buffer_size; i++) {

2
src/park.c
View File

@@ -467,7 +467,7 @@ static void get_random_peep_spawn(rct2_peep_spawn *spawn)
static rct_peep *park_generate_new_guest()
{
rct_peep *peep;
rct_peep *peep = NULL;
rct2_peep_spawn spawn;
get_random_peep_spawn(&spawn);