Merge branch 'master' of https://github.com/adrian17/OpenRCT2 into adrian17-master

This commit is contained in:
IntelOrca 2014-05-25 23:18:47 +01:00
commit bfc35511f2
3 changed files with 1 additions and 5 deletions

View File

@ -39,7 +39,6 @@
<ClInclude Include="..\src\sawyercoding.h" />
<ClInclude Include="..\src\scenario.h" />
<ClInclude Include="..\src\screenshot.h" />
<ClInclude Include="..\src\settings.h" />
<ClInclude Include="..\src\sprite.h" />
<ClInclude Include="..\src\sprites.h" />
<ClInclude Include="..\src\string_ids.h" />

View File

@ -126,9 +126,6 @@
<ClInclude Include="..\src\screenshot.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\settings.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\finance.h">
<Filter>Header Files</Filter>
</ClInclude>

View File

@ -126,7 +126,7 @@ typedef struct rct_window {
sint16 var_484; // viewport target y
sint16 var_486; // viewport target z
sint16 var_488; // viewport rotation << 8
sint16 page; // 0x49A
sint16 page; // 0x48A
sint16 var_48C;
sint16 var_48E;
sint16 var_490;