mirror of
https://github.com/OpenRCT2/OpenRCT2
synced 2026-01-15 11:03:00 +01:00
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
Conflicts: data/language/dutch.txt
This commit is contained in:
IntelOrca
@@ -1448,7 +1448,7 @@ STR_1446 :Kijkt naar decor
|
||||
STR_1447 :Verlaat het park
|
||||
STR_1448 :Kijkt naar bouw van nieuwe attractie
|
||||
STR_1449 :{SPRITE} {STRINGID}{NEWLINE}({STRINGID})
|
||||
STR_1450 :{INLINE_SPRITE}{MEDIUMFONT}{20}
|
||||
STR_1450 :{INLINE_SPRITE}{09}{20}{00}{00}{SPRITE} {STRINGID}{NEWLINE}({STRINGID})
|
||||
STR_1451 :{STRINGID}{NEWLINE}({STRINGID})
|
||||
STR_1452 :Naam bezoeker
|
||||
STR_1453 :Voer een naam in voor deze bezoeker:
|
||||
@@ -1710,10 +1710,10 @@ STR_1708 :{SMALLFONT}{BLACK}Set patrol area for this staff member
|
||||
STR_1709 :Werknemer ontslaan
|
||||
STR_1710 :Ja
|
||||
STR_1711 :{WINDOW_COLOUR_1}Weet je zeker dat je {STRINGID} wilt ontslaan?
|
||||
STR_1712 :{INLINE_SPRITE}{247}{19}
|
||||
STR_1713 :{INLINE_SPRITE}{248}{19}
|
||||
STR_1714 :{INLINE_SPRITE}{249}{19}
|
||||
STR_1715 :{INLINE_SPRITE}{250}{19}
|
||||
STR_1712 :{INLINE_SPRITE}{247}{19}{00}{00}{WINDOW_COLOUR_2}
|
||||
STR_1713 :{INLINE_SPRITE}{248}{19}{00}{00}{WINDOW_COLOUR_2}
|
||||
STR_1714 :{INLINE_SPRITE}{249}{19}{00}{00}{WINDOW_COLOUR_2}
|
||||
STR_1715 :{INLINE_SPRITE}{250}{19}{00}{00}{WINDOW_COLOUR_2}
|
||||
STR_1716 :Invalid name for park
|
||||
STR_1717 :Can't rename park...
|
||||
STR_1718 :Parknaam
|
||||
@@ -1777,17 +1777,17 @@ STR_1775 :Uit
|
||||
STR_1776 :Aan
|
||||
STR_1777 :{WINDOW_COLOUR_2}Muziek:
|
||||
STR_1778 :{STRINGID} - -
|
||||
STR_1779 :{INLINE_SPRITE}{254}{19}
|
||||
STR_1780 :{INLINE_SPRITE}{255}{19}
|
||||
STR_1781 :{INLINE_SPRITE}
|
||||
STR_1782 :{INLINE_SPRITE}{MOVE_X}{20}
|
||||
STR_1783 :{INLINE_SPRITE}{2}{20}
|
||||
STR_1784 :{INLINE_SPRITE}{3}{20}
|
||||
STR_1785 :{INLINE_SPRITE}{4}{20}
|
||||
STR_1786 :{INLINE_SPRITE}{NEWLINE}{20}
|
||||
STR_1787 :{INLINE_SPRITE}{6}{20}
|
||||
STR_1788 :{INLINE_SPRITE}{TINYFONT}{20}
|
||||
STR_1789 :{INLINE_SPRITE}{BIGFONT}{20}
|
||||
STR_1779 :{INLINE_SPRITE}{254}{19}{00}{00} Panda costume
|
||||
STR_1780 :{INLINE_SPRITE}{255}{19}{00}{00} Tigre costume
|
||||
STR_1781 :{INLINE_SPRITE}{00}{20}{00}{00} Elephant costume
|
||||
STR_1782 :{INLINE_SPRITE}{01}{20}{00}{00} Roman costume
|
||||
STR_1783 :{INLINE_SPRITE}{02}{20}{00}{00} Gorilla costume
|
||||
STR_1784 :{INLINE_SPRITE}{03}{20}{00}{00} Snowman costume
|
||||
STR_1785 :{INLINE_SPRITE}{04}{20}{00}{00} Knight costume
|
||||
STR_1786 :{INLINE_SPRITE}{05}{20}{00}{00} Astronaut costume
|
||||
STR_1787 :{INLINE_SPRITE}{06}{20}{00}{00} Bandit costume
|
||||
STR_1788 :{INLINE_SPRITE}{07}{20}{00}{00} Sheriff costume
|
||||
STR_1789 :{INLINE_SPRITE}{08}{20}{00}{00} Pirate costume
|
||||
STR_1790 :{SMALLFONT}{BLACK}Selecteer de uniformkleur voor dit type werknemer
|
||||
STR_1791 :{WINDOW_COLOUR_2}Uniformkleur:
|
||||
STR_1792 :Gaat naar {STRINGID} voor een reparatie
|
||||
@@ -1874,8 +1874,8 @@ STR_1872 :{COMMA16}
|
||||
STR_1873 :{WINDOW_COLOUR_2}Inkomsten: {BLACK}{CURRENCY} per uur
|
||||
STR_1874 :{WINDOW_COLOUR_2}Winst: {BLACK}{CURRENCY} per uur
|
||||
STR_1875 :{BLACK} {SPRITE}{BLACK} {STRINGID}
|
||||
STR_1876 :{WINDOW_COLOUR_2}{INLINE_SPRITE}{251}{19}
|
||||
STR_1877 :{WINDOW_COLOUR_2}{INLINE_SPRITE}{252}{19}
|
||||
STR_1876 :{WINDOW_COLOUR_2}{INLINE_SPRITE}{251}{19}{00}{00}Inspect Rides
|
||||
STR_1877 :{WINDOW_COLOUR_2}{INLINE_SPRITE}{252}{19}{00}{00}Fix Rides
|
||||
STR_1878 :{WINDOW_COLOUR_2}Inspectie:
|
||||
STR_1879 :Elke 10 minuten
|
||||
STR_1880 :Elke 20 minutes
|
||||
|
||||
@@ -1451,7 +1451,7 @@ STR_1446 :Looking at scenery
|
||||
STR_1447 :Leaving the park
|
||||
STR_1448 :Watching new ride being constructed
|
||||
STR_1449 :{SPRITE} {STRINGID}{NEWLINE}({STRINGID})
|
||||
STR_1450 :{INLINE_SPRITE}{MEDIUMFONT}{20}
|
||||
STR_1450 :{INLINE_SPRITE}{09}{20}{00}{00}{SPRITE} {STRINGID}{NEWLINE}({STRINGID})
|
||||
STR_1451 :{STRINGID}{NEWLINE}({STRINGID})
|
||||
STR_1452 :Guest's name
|
||||
STR_1453 :Enter name for this guest:-
|
||||
@@ -1713,10 +1713,10 @@ STR_1708 :{SMALLFONT}{BLACK}Set patrol area for this staff member
|
||||
STR_1709 :Sack staff
|
||||
STR_1710 :Yes
|
||||
STR_1711 :{WINDOW_COLOUR_1}Are you sure you want to sack {STRINGID}?
|
||||
STR_1712 :{INLINE_SPRITE}{247}{19}
|
||||
STR_1713 :{INLINE_SPRITE}{248}{19}
|
||||
STR_1714 :{INLINE_SPRITE}{249}{19}
|
||||
STR_1715 :{INLINE_SPRITE}{250}{19}
|
||||
STR_1712 :{INLINE_SPRITE}{247}{19}{00}{00}{WINDOW_COLOUR_2}Sweep footpaths
|
||||
STR_1713 :{INLINE_SPRITE}{248}{19}{00}{00}{WINDOW_COLOUR_2}Water gardens
|
||||
STR_1714 :{INLINE_SPRITE}{249}{19}{00}{00}{WINDOW_COLOUR_2}Empty litter bins
|
||||
STR_1715 :{INLINE_SPRITE}{250}{19}{00}{00}{WINDOW_COLOUR_2}Mow grass
|
||||
STR_1716 :Invalid name for park
|
||||
STR_1717 :Can't rename park...
|
||||
STR_1718 :Park Name
|
||||
@@ -1780,17 +1780,17 @@ STR_1775 :Off
|
||||
STR_1776 :On
|
||||
STR_1777 :{WINDOW_COLOUR_2}Music:
|
||||
STR_1778 :{STRINGID} - -
|
||||
STR_1779 :{INLINE_SPRITE}{254}{19}
|
||||
STR_1780 :{INLINE_SPRITE}{255}{19}
|
||||
STR_1781 :{INLINE_SPRITE}
|
||||
STR_1782 :{INLINE_SPRITE}{MOVE_X}{20}
|
||||
STR_1783 :{INLINE_SPRITE}{ADJUST_PALETTE}{20}
|
||||
STR_1784 :{INLINE_SPRITE}{3}{20}
|
||||
STR_1785 :{INLINE_SPRITE}{4}{20}
|
||||
STR_1786 :{INLINE_SPRITE}{NEWLINE}{20}
|
||||
STR_1787 :{INLINE_SPRITE}{NEWLINE_SMALLER}{20}
|
||||
STR_1788 :{INLINE_SPRITE}{TINYFONT}{20}
|
||||
STR_1789 :{INLINE_SPRITE}{BIGFONT}{20}
|
||||
STR_1779 :{INLINE_SPRITE}{254}{19}{00}{00} Panda costume
|
||||
STR_1780 :{INLINE_SPRITE}{255}{19}{00}{00} Tigre costume
|
||||
STR_1781 :{INLINE_SPRITE}{00}{20}{00}{00} Elephant costume
|
||||
STR_1782 :{INLINE_SPRITE}{01}{20}{00}{00} Roman costume
|
||||
STR_1783 :{INLINE_SPRITE}{02}{20}{00}{00} Gorilla costume
|
||||
STR_1784 :{INLINE_SPRITE}{03}{20}{00}{00} Snowman costume
|
||||
STR_1785 :{INLINE_SPRITE}{04}{20}{00}{00} Knight costume
|
||||
STR_1786 :{INLINE_SPRITE}{05}{20}{00}{00} Astronaut costume
|
||||
STR_1787 :{INLINE_SPRITE}{06}{20}{00}{00} Bandit costume
|
||||
STR_1788 :{INLINE_SPRITE}{07}{20}{00}{00} Sheriff costume
|
||||
STR_1789 :{INLINE_SPRITE}{08}{20}{00}{00} Pirate costume
|
||||
STR_1790 :{SMALLFONT}{BLACK}Select uniform colour for this type of staff
|
||||
STR_1791 :{WINDOW_COLOUR_2}Uniform colour:
|
||||
STR_1792 :Responding to {STRINGID} breakdown call
|
||||
@@ -1877,8 +1877,8 @@ STR_1872 :{COMMA16}
|
||||
STR_1873 :{WINDOW_COLOUR_2}Income: {BLACK}{CURRENCY} per hour
|
||||
STR_1874 :{WINDOW_COLOUR_2}Profit: {BLACK}{CURRENCY} per hour
|
||||
STR_1875 :{BLACK} {SPRITE}{BLACK} {STRINGID}
|
||||
STR_1876 :{WINDOW_COLOUR_2}{INLINE_SPRITE}{251}{19}
|
||||
STR_1877 :{WINDOW_COLOUR_2}{INLINE_SPRITE}{252}{19}
|
||||
STR_1876 :{WINDOW_COLOUR_2}{INLINE_SPRITE}{251}{19}{00}{00}Inspect Rides
|
||||
STR_1877 :{WINDOW_COLOUR_2}{INLINE_SPRITE}{252}{19}{00}{00}Fix Rides
|
||||
STR_1878 :{WINDOW_COLOUR_2}Inspection:
|
||||
STR_1879 :Every 10 minutes
|
||||
STR_1880 :Every 20 minutes
|
||||
|
||||
@@ -1451,7 +1451,7 @@ STR_1446 :Looking at scenery
|
||||
STR_1447 :Leaving the park
|
||||
STR_1448 :Watching new ride being constructed
|
||||
STR_1449 :{SPRITE} {STRINGID}{NEWLINE}({STRINGID})
|
||||
STR_1450 :{INLINE_SPRITE}{MEDIUMFONT}{20}
|
||||
STR_1450 :{INLINE_SPRITE}{09}{20}{00}{00}{SPRITE} {STRINGID}{NEWLINE}({STRINGID})
|
||||
STR_1451 :{STRINGID}{NEWLINE}({STRINGID})
|
||||
STR_1452 :Guest's name
|
||||
STR_1453 :Enter name for this guest:-
|
||||
@@ -1713,10 +1713,10 @@ STR_1708 :{SMALLFONT}{BLACK}Set patrol area for this staff member
|
||||
STR_1709 :Sack staff
|
||||
STR_1710 :Yes
|
||||
STR_1711 :{WINDOW_COLOUR_1}Are you sure you want to sack {STRINGID}?
|
||||
STR_1712 :{INLINE_SPRITE}{247}{19}
|
||||
STR_1713 :{INLINE_SPRITE}{248}{19}
|
||||
STR_1714 :{INLINE_SPRITE}{249}{19}
|
||||
STR_1715 :{INLINE_SPRITE}{250}{19}
|
||||
STR_1712 :{INLINE_SPRITE}{247}{19}{00}{00}{WINDOW_COLOUR_2}Sweep footpaths
|
||||
STR_1713 :{INLINE_SPRITE}{248}{19}{00}{00}{WINDOW_COLOUR_2}Water gardens
|
||||
STR_1714 :{INLINE_SPRITE}{249}{19}{00}{00}{WINDOW_COLOUR_2}Empty litter bins
|
||||
STR_1715 :{INLINE_SPRITE}{250}{19}{00}{00}{WINDOW_COLOUR_2}Mow grass
|
||||
STR_1716 :Invalid name for park
|
||||
STR_1717 :Can't rename park...
|
||||
STR_1718 :Park Name
|
||||
@@ -1780,17 +1780,17 @@ STR_1775 :Off
|
||||
STR_1776 :On
|
||||
STR_1777 :{WINDOW_COLOUR_2}Music:
|
||||
STR_1778 :{STRINGID} - -
|
||||
STR_1779 :{INLINE_SPRITE}{254}{19}
|
||||
STR_1780 :{INLINE_SPRITE}{255}{19}
|
||||
STR_1781 :{INLINE_SPRITE}
|
||||
STR_1782 :{INLINE_SPRITE}{MOVE_X}{20}
|
||||
STR_1783 :{INLINE_SPRITE}{ADJUST_PALETTE}{20}
|
||||
STR_1784 :{INLINE_SPRITE}{3}{20}
|
||||
STR_1785 :{INLINE_SPRITE}{4}{20}
|
||||
STR_1786 :{INLINE_SPRITE}{NEWLINE}{20}
|
||||
STR_1787 :{INLINE_SPRITE}{NEWLINE_SMALLER}{20}
|
||||
STR_1788 :{INLINE_SPRITE}{TINYFONT}{20}
|
||||
STR_1789 :{INLINE_SPRITE}{BIGFONT}{20}
|
||||
STR_1779 :{INLINE_SPRITE}{254}{19}{00}{00} Panda costume
|
||||
STR_1780 :{INLINE_SPRITE}{255}{19}{00}{00} Tigre costume
|
||||
STR_1781 :{INLINE_SPRITE}{00}{20}{00}{00} Elephant costume
|
||||
STR_1782 :{INLINE_SPRITE}{01}{20}{00}{00} Roman costume
|
||||
STR_1783 :{INLINE_SPRITE}{02}{20}{00}{00} Gorilla costume
|
||||
STR_1784 :{INLINE_SPRITE}{03}{20}{00}{00} Snowman costume
|
||||
STR_1785 :{INLINE_SPRITE}{04}{20}{00}{00} Knight costume
|
||||
STR_1786 :{INLINE_SPRITE}{05}{20}{00}{00} Astronaut costume
|
||||
STR_1787 :{INLINE_SPRITE}{06}{20}{00}{00} Bandit costume
|
||||
STR_1788 :{INLINE_SPRITE}{07}{20}{00}{00} Sheriff costume
|
||||
STR_1789 :{INLINE_SPRITE}{08}{20}{00}{00} Pirate costume
|
||||
STR_1790 :{SMALLFONT}{BLACK}Select uniform color for this type of staff
|
||||
STR_1791 :{WINDOW_COLOUR_2}Uniform color:
|
||||
STR_1792 :Responding to {STRINGID} breakdown call
|
||||
@@ -1877,8 +1877,8 @@ STR_1872 :{COMMA16}
|
||||
STR_1873 :{WINDOW_COLOUR_2}Income: {BLACK}{CURRENCY} per hour
|
||||
STR_1874 :{WINDOW_COLOUR_2}Profit: {BLACK}{CURRENCY} per hour
|
||||
STR_1875 :{BLACK} {SPRITE}{BLACK} {STRINGID}
|
||||
STR_1876 :{WINDOW_COLOUR_2}{INLINE_SPRITE}{251}{19}
|
||||
STR_1877 :{WINDOW_COLOUR_2}{INLINE_SPRITE}{252}{19}
|
||||
STR_1876 :{WINDOW_COLOUR_2}{INLINE_SPRITE}{251}{19}{00}{00}Inspect Rides
|
||||
STR_1877 :{WINDOW_COLOUR_2}{INLINE_SPRITE}{252}{19}{00}{00}Fix Rides
|
||||
STR_1878 :{WINDOW_COLOUR_2}Inspection:
|
||||
STR_1879 :Every 10 minutes
|
||||
STR_1880 :Every 20 minutes
|
||||
|
||||
@@ -1451,7 +1451,7 @@ STR_1446 :Looking at scenery
|
||||
STR_1447 :Leaving the park
|
||||
STR_1448 :Watching new ride being constructed
|
||||
STR_1449 :{SPRITE} {STRINGID}{NEWLINE}({STRINGID})
|
||||
STR_1450 :{INLINE_SPRITE}{MEDIUMFONT}{20}
|
||||
STR_1450 :{INLINE_SPRITE}{09}{20}{00}{00}{SPRITE} {STRINGID}{NEWLINE}({STRINGID})
|
||||
STR_1451 :{STRINGID}{NEWLINE}({STRINGID})
|
||||
STR_1452 :Guest's name
|
||||
STR_1453 :Enter name for this guest:-
|
||||
@@ -1713,10 +1713,10 @@ STR_1708 :{SMALLFONT}{BLACK}Set patrol area for this staff member
|
||||
STR_1709 :Sack staff
|
||||
STR_1710 :Yes
|
||||
STR_1711 :{WINDOW_COLOUR_1}Are you sure you want to sack {STRINGID}?
|
||||
STR_1712 :{INLINE_SPRITE}{247}{19}
|
||||
STR_1713 :{INLINE_SPRITE}{248}{19}
|
||||
STR_1714 :{INLINE_SPRITE}{249}{19}
|
||||
STR_1715 :{INLINE_SPRITE}{250}{19}
|
||||
STR_1712 :{INLINE_SPRITE}{247}{19}{00}{00}{WINDOW_COLOUR_2}Sweep footpaths
|
||||
STR_1713 :{INLINE_SPRITE}{248}{19}{00}{00}{WINDOW_COLOUR_2}Water gardens
|
||||
STR_1714 :{INLINE_SPRITE}{249}{19}{00}{00}{WINDOW_COLOUR_2}Empty litter bins
|
||||
STR_1715 :{INLINE_SPRITE}{250}{19}{00}{00}{WINDOW_COLOUR_2}Mow grass
|
||||
STR_1716 :Invalid name for park
|
||||
STR_1717 :Can't rename park...
|
||||
STR_1718 :Park Name
|
||||
@@ -1780,17 +1780,17 @@ STR_1775 :Off
|
||||
STR_1776 :On
|
||||
STR_1777 :{WINDOW_COLOUR_2}Music:
|
||||
STR_1778 :{STRINGID} - -
|
||||
STR_1779 :{INLINE_SPRITE}{254}{19}
|
||||
STR_1780 :{INLINE_SPRITE}{255}{19}
|
||||
STR_1781 :{INLINE_SPRITE}
|
||||
STR_1782 :{INLINE_SPRITE}{MOVE_X}{20}
|
||||
STR_1783 :{INLINE_SPRITE}{ADJUST_PALETTE}{20}
|
||||
STR_1784 :{INLINE_SPRITE}{3}{20}
|
||||
STR_1785 :{INLINE_SPRITE}{4}{20}
|
||||
STR_1786 :{INLINE_SPRITE}{NEWLINE}{20}
|
||||
STR_1787 :{INLINE_SPRITE}{NEWLINE_SMALLER}{20}
|
||||
STR_1788 :{INLINE_SPRITE}{TINYFONT}{20}
|
||||
STR_1789 :{INLINE_SPRITE}{BIGFONT}{20}
|
||||
STR_1779 :{INLINE_SPRITE}{254}{19}{00}{00} Panda costume
|
||||
STR_1780 :{INLINE_SPRITE}{255}{19}{00}{00} Tigre costume
|
||||
STR_1781 :{INLINE_SPRITE}{00}{20}{00}{00} Elephant costume
|
||||
STR_1782 :{INLINE_SPRITE}{01}{20}{00}{00} Roman costume
|
||||
STR_1783 :{INLINE_SPRITE}{02}{20}{00}{00} Gorilla costume
|
||||
STR_1784 :{INLINE_SPRITE}{03}{20}{00}{00} Snowman costume
|
||||
STR_1785 :{INLINE_SPRITE}{04}{20}{00}{00} Knight costume
|
||||
STR_1786 :{INLINE_SPRITE}{05}{20}{00}{00} Astronaut costume
|
||||
STR_1787 :{INLINE_SPRITE}{06}{20}{00}{00} Bandit costume
|
||||
STR_1788 :{INLINE_SPRITE}{07}{20}{00}{00} Sheriff costume
|
||||
STR_1789 :{INLINE_SPRITE}{08}{20}{00}{00} Pirate costume
|
||||
STR_1790 :{SMALLFONT}{BLACK}Select uniform color for this type of staff
|
||||
STR_1791 :{WINDOW_COLOUR_2}Uniform color:
|
||||
STR_1792 :Responding to {STRINGID} breakdown call
|
||||
@@ -1877,8 +1877,8 @@ STR_1872 :{COMMA16}
|
||||
STR_1873 :{WINDOW_COLOUR_2}Income: {BLACK}{CURRENCY} per hour
|
||||
STR_1874 :{WINDOW_COLOUR_2}Profit: {BLACK}{CURRENCY} per hour
|
||||
STR_1875 :{BLACK} {SPRITE}{BLACK} {STRINGID}
|
||||
STR_1876 :{WINDOW_COLOUR_2}{INLINE_SPRITE}{251}{19}
|
||||
STR_1877 :{WINDOW_COLOUR_2}{INLINE_SPRITE}{252}{19}
|
||||
STR_1876 :{WINDOW_COLOUR_2}{INLINE_SPRITE}{251}{19}{00}{00}Inspect Rides
|
||||
STR_1877 :{WINDOW_COLOUR_2}{INLINE_SPRITE}{252}{19}{00}{00}Fix Rides
|
||||
STR_1878 :{WINDOW_COLOUR_2}Inspection:
|
||||
STR_1879 :Every 10 minutes
|
||||
STR_1880 :Every 20 minutes
|
||||
|
||||
@@ -135,10 +135,10 @@
|
||||
<None Include="..\openrct2.exe" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Text Include="..\data\language\english.txt">
|
||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
</DeploymentContent>
|
||||
</Text>
|
||||
<Text Include="..\data\language\dutch.txt" />
|
||||
<Text Include="..\data\language\english_uk.txt" />
|
||||
<Text Include="..\data\language\english_us.txt" />
|
||||
<Text Include="..\data\language\french.txt" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{D24D94F6-2A74-480C-B512-629C306CE92F}</ProjectGuid>
|
||||
|
||||
@@ -372,7 +372,16 @@
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Text Include="..\data\language\english.txt">
|
||||
<Text Include="..\data\language\dutch.txt">
|
||||
<Filter>Data\Language</Filter>
|
||||
</Text>
|
||||
<Text Include="..\data\language\english_uk.txt">
|
||||
<Filter>Data\Language</Filter>
|
||||
</Text>
|
||||
<Text Include="..\data\language\english_us.txt">
|
||||
<Filter>Data\Language</Filter>
|
||||
</Text>
|
||||
<Text Include="..\data\language\french.txt">
|
||||
<Filter>Data\Language</Filter>
|
||||
</Text>
|
||||
</ItemGroup>
|
||||
|
||||
111
src/gfx.c
111
src/gfx.c
@@ -690,6 +690,7 @@ void gfx_fill_rect_inset(rct_drawpixelinfo* dpi, short left, short top, short ri
|
||||
*/
|
||||
void gfx_bmp_sprite_to_buffer(uint8* palette_pointer, uint8* unknown_pointer, uint8* source_pointer, uint8* dest_pointer, rct_g1_element* source_image, rct_drawpixelinfo *dest_dpi, int height, int width, int image_type){
|
||||
uint8 zoom_level = dest_dpi->zoom_level;
|
||||
uint8 zoom_amount = 1 << zoom_level;
|
||||
//Requires use of palette?
|
||||
if (image_type & IMAGE_TYPE_USE_PALETTE){
|
||||
|
||||
@@ -697,12 +698,12 @@ void gfx_bmp_sprite_to_buffer(uint8* palette_pointer, uint8* unknown_pointer, ui
|
||||
if (unknown_pointer!= NULL){ //Not tested. I can't actually work out when this code runs.
|
||||
unknown_pointer += source_pointer - source_image->offset;// RCT2_GLOBAL(0x9E3CE0, uint32);
|
||||
|
||||
for (; height > 0; height -= (1<<zoom_level)){
|
||||
uint8* next_source_pointer = source_pointer + (uint32)(source_image->width << zoom_level);
|
||||
uint8* next_unknown_pointer = unknown_pointer + (uint32)(source_image->width << zoom_level);
|
||||
uint8* next_dest_pointer = dest_pointer + (dest_dpi->width >> zoom_level) + dest_dpi->pitch;
|
||||
for (; height > 0; height -= zoom_amount){
|
||||
uint8* next_source_pointer = source_pointer + (uint32)(source_image->width * zoom_amount);
|
||||
uint8* next_unknown_pointer = unknown_pointer + (uint32)(source_image->width * zoom_amount);
|
||||
uint8* next_dest_pointer = dest_pointer + (dest_dpi->width / zoom_amount) + dest_dpi->pitch;
|
||||
|
||||
for (int no_pixels = width; no_pixels > 0; no_pixels -= (1<<zoom_level), source_pointer+=(1<<zoom_level), unknown_pointer+=(1<<zoom_level), dest_pointer++){
|
||||
for (int no_pixels = width; no_pixels > 0; no_pixels -= zoom_amount, source_pointer += zoom_amount, unknown_pointer += zoom_amount, dest_pointer++){
|
||||
uint8 pixel = *source_pointer;
|
||||
pixel = palette_pointer[pixel];
|
||||
pixel &= *unknown_pointer;
|
||||
@@ -718,10 +719,10 @@ void gfx_bmp_sprite_to_buffer(uint8* palette_pointer, uint8* unknown_pointer, ui
|
||||
}
|
||||
|
||||
//image colour adjusted?
|
||||
for (; height > 0; height -= (1<<zoom_level)){
|
||||
uint8* next_source_pointer = source_pointer + (uint32)(source_image->width<<zoom_level);
|
||||
uint8* next_dest_pointer = dest_pointer + (dest_dpi->width >> zoom_level) + dest_dpi->pitch;
|
||||
for (int no_pixels = width; no_pixels > 0; no_pixels -= (1<<zoom_level), source_pointer+= (1<<zoom_level), dest_pointer++){
|
||||
for (; height > 0; height -= zoom_amount){
|
||||
uint8* next_source_pointer = source_pointer + (uint32)(source_image->width * zoom_amount);
|
||||
uint8* next_dest_pointer = dest_pointer + (dest_dpi->width / zoom_amount) + dest_dpi->pitch;
|
||||
for (int no_pixels = width; no_pixels > 0; no_pixels -= zoom_amount, source_pointer += zoom_amount, dest_pointer++){
|
||||
uint8 pixel = *source_pointer;
|
||||
pixel = palette_pointer[pixel];
|
||||
if (pixel){
|
||||
@@ -738,11 +739,11 @@ void gfx_bmp_sprite_to_buffer(uint8* palette_pointer, uint8* unknown_pointer, ui
|
||||
//Mix with background. It only uses source pointer for
|
||||
//telling if it needs to be drawn not for colour.
|
||||
if (image_type & IMAGE_TYPE_MIX_BACKGROUND){//Not tested
|
||||
for (; height > 0; height -= (1<<zoom_level)){
|
||||
uint8* next_source_pointer = source_pointer + (uint32)(source_image->width << zoom_level);
|
||||
uint8* next_dest_pointer = dest_pointer + (dest_dpi->width >> zoom_level) + dest_dpi->pitch;
|
||||
for (; height > 0; height -= zoom_amount){
|
||||
uint8* next_source_pointer = source_pointer + (uint32)(source_image->width * zoom_amount);
|
||||
uint8* next_dest_pointer = dest_pointer + (dest_dpi->width / zoom_amount) + dest_dpi->pitch;
|
||||
|
||||
for (int no_pixels = width; no_pixels > 0; no_pixels -= (1<<zoom_level), source_pointer += (1<<zoom_level), dest_pointer++){
|
||||
for (int no_pixels = width; no_pixels > 0; no_pixels -= zoom_amount, source_pointer += zoom_amount, dest_pointer++){
|
||||
uint8 pixel = *source_pointer;
|
||||
if (pixel){
|
||||
pixel = *dest_pointer;
|
||||
@@ -759,11 +760,11 @@ void gfx_bmp_sprite_to_buffer(uint8* palette_pointer, uint8* unknown_pointer, ui
|
||||
|
||||
//Basic bitmap no fancy stuff
|
||||
if (!(source_image->flags & G1_FLAG_BMP)){//Not tested
|
||||
for (; height > 0; height-=(1<<zoom_level)){
|
||||
uint8* next_source_pointer = source_pointer + (uint32)(source_image->width << zoom_level);
|
||||
uint8* next_dest_pointer = dest_pointer + (dest_dpi->width >> zoom_level) + dest_dpi->pitch;
|
||||
for (; height > 0; height -= zoom_amount){
|
||||
uint8* next_source_pointer = source_pointer + (uint32)(source_image->width * zoom_amount);
|
||||
uint8* next_dest_pointer = dest_pointer + (dest_dpi->width / zoom_amount) + dest_dpi->pitch;
|
||||
|
||||
for (int no_pixels = width; no_pixels > 0; no_pixels -= (1<<zoom_level), dest_pointer++, source_pointer += (1<<zoom_level)){
|
||||
for (int no_pixels = width; no_pixels > 0; no_pixels -= zoom_amount, dest_pointer++, source_pointer += zoom_amount){
|
||||
*dest_pointer = *source_pointer;
|
||||
}
|
||||
|
||||
@@ -776,12 +777,12 @@ void gfx_bmp_sprite_to_buffer(uint8* palette_pointer, uint8* unknown_pointer, ui
|
||||
if (RCT2_GLOBAL(0x9E3CDC, uint32) != 0){//Not tested. I can't actually work out when this code runs.
|
||||
unknown_pointer += source_pointer - source_image->offset;
|
||||
|
||||
for (; height > 0; height -= (1<<zoom_level)){
|
||||
uint8* next_source_pointer = source_pointer + (uint32)(source_image->width << zoom_level);
|
||||
uint8* next_unknown_pointer = unknown_pointer + (uint32)(source_image->width << zoom_level);
|
||||
uint8* next_dest_pointer = dest_pointer + (dest_dpi->width >> zoom_level) + dest_dpi->pitch;
|
||||
for (; height > 0; height -= zoom_amount){
|
||||
uint8* next_source_pointer = source_pointer + (uint32)(source_image->width * zoom_amount);
|
||||
uint8* next_unknown_pointer = unknown_pointer + (uint32)(source_image->width * zoom_amount);
|
||||
uint8* next_dest_pointer = dest_pointer + (dest_dpi->width / zoom_amount) + dest_dpi->pitch;
|
||||
|
||||
for (int no_pixels = width; no_pixels > 0; no_pixels -= (1<<zoom_level), dest_pointer++, source_pointer += (1<<zoom_level), unknown_pointer += (1<<zoom_level)){
|
||||
for (int no_pixels = width; no_pixels > 0; no_pixels -= zoom_amount, dest_pointer++, source_pointer += zoom_amount, unknown_pointer += zoom_amount){
|
||||
uint8 pixel = *source_pointer;
|
||||
pixel &= *unknown_pointer;
|
||||
if (pixel){
|
||||
@@ -795,11 +796,11 @@ void gfx_bmp_sprite_to_buffer(uint8* palette_pointer, uint8* unknown_pointer, ui
|
||||
}
|
||||
|
||||
//Basic bitmap with no draw pixels
|
||||
for (; height > 0; height -= (1<<zoom_level)){
|
||||
uint8* next_source_pointer = source_pointer + (uint32)(source_image->width << zoom_level);
|
||||
uint8* next_dest_pointer = dest_pointer + (dest_dpi->width >> zoom_level) + dest_dpi->pitch;
|
||||
for (; height > 0; height -= zoom_amount){
|
||||
uint8* next_source_pointer = source_pointer + (uint32)(source_image->width * zoom_amount);
|
||||
uint8* next_dest_pointer = dest_pointer + (dest_dpi->width / zoom_amount) + dest_dpi->pitch;
|
||||
|
||||
for (int no_pixels = width; no_pixels > 0; no_pixels -= (1<<zoom_level), dest_pointer++, source_pointer += (1<<zoom_level)){
|
||||
for (int no_pixels = width; no_pixels > 0; no_pixels -= zoom_amount, dest_pointer++, source_pointer += zoom_amount){
|
||||
uint8 pixel = *source_pointer;
|
||||
if (pixel){
|
||||
*dest_pointer = pixel;
|
||||
@@ -818,11 +819,12 @@ void gfx_bmp_sprite_to_buffer(uint8* palette_pointer, uint8* unknown_pointer, ui
|
||||
*/
|
||||
void gfx_rle_sprite_to_buffer(uint8* source_bits_pointer, uint8* dest_bits_pointer, uint8* palette_pointer, rct_drawpixelinfo *dpi, int image_type, int source_y_start, int height, int source_x_start, int width){
|
||||
int zoom_level = dpi->zoom_level;
|
||||
int zoom_amount = 1 << zoom_level;
|
||||
uint8* next_source_pointer;
|
||||
uint8* next_dest_pointer = dest_bits_pointer;
|
||||
|
||||
//For every line in the image
|
||||
for (int y = source_y_start; y < (height + source_y_start); y += (1<<zoom_level)){
|
||||
for (int y = source_y_start; y < (height + source_y_start); y += zoom_amount){
|
||||
|
||||
//The first part of the source pointer is a list of offsets to different lines
|
||||
//This will move the pointer to the correct source line.
|
||||
@@ -852,7 +854,7 @@ void gfx_rle_sprite_to_buffer(uint8* source_bits_pointer, uint8* dest_bits_point
|
||||
if (x_start > 0){
|
||||
//Since the start is positive
|
||||
//We need to move the drawing surface to the correct position
|
||||
dest_pointer += x_start >> zoom_level;
|
||||
dest_pointer += x_start / zoom_amount;
|
||||
}
|
||||
else{
|
||||
//If the start is negative we require to remove part of the image.
|
||||
@@ -879,7 +881,7 @@ void gfx_rle_sprite_to_buffer(uint8* source_bits_pointer, uint8* dest_bits_point
|
||||
//Finally after all those checks, copy the image onto the drawing surface
|
||||
//If the image type is not a basic one we require to mix the pixels
|
||||
if (image_type & IMAGE_TYPE_USE_PALETTE){//In the .exe these are all unraveled loops
|
||||
for (; no_pixels > 0; no_pixels -= (1<<zoom_level), source_pointer += (1<<zoom_level), dest_pointer++){
|
||||
for (; no_pixels > 0; no_pixels -= zoom_amount, source_pointer += zoom_amount, dest_pointer++){
|
||||
uint8 al = *source_pointer;
|
||||
uint8 ah = *dest_pointer;
|
||||
if (image_type & IMAGE_TYPE_MIX_BACKGROUND)
|
||||
@@ -893,7 +895,7 @@ void gfx_rle_sprite_to_buffer(uint8* source_bits_pointer, uint8* dest_bits_point
|
||||
//Doesnt use source pointer ??? mix with background only?
|
||||
//Not Tested
|
||||
|
||||
for (; no_pixels > 0; no_pixels -= (1<<zoom_level), dest_pointer++){
|
||||
for (; no_pixels > 0; no_pixels -= zoom_amount, dest_pointer++){
|
||||
uint8 pixel = *dest_pointer;
|
||||
pixel = palette_pointer[pixel];
|
||||
*dest_pointer = pixel;
|
||||
@@ -901,14 +903,14 @@ void gfx_rle_sprite_to_buffer(uint8* source_bits_pointer, uint8* dest_bits_point
|
||||
}
|
||||
else
|
||||
{
|
||||
for (; no_pixels > 0; no_pixels -= (1<<zoom_level), source_pointer += (1<<zoom_level), dest_pointer++){
|
||||
for (; no_pixels > 0; no_pixels -= zoom_amount, source_pointer += zoom_amount, dest_pointer++){
|
||||
*dest_pointer = *source_pointer;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//Add a line to the drawing surface pointer
|
||||
next_dest_pointer += (int)(dpi->width >> zoom_level) + (int)dpi->pitch;
|
||||
next_dest_pointer += dpi->width / zoom_amount + dpi->pitch;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1022,7 +1024,7 @@ void gfx_draw_sprite_palette_set(rct_drawpixelinfo *dpi, int image_id, int x, in
|
||||
|
||||
rct_g1_element* g1_source = &(RCT2_ADDRESS(RCT2_ADDRESS_G1_ELEMENTS, rct_g1_element)[image_element]);
|
||||
|
||||
//Zooming code has been integrated into main code but is not working.
|
||||
//Zooming code has been integrated into main code.
|
||||
//if (dpi->zoom_level >= 1){ //These have not been tested
|
||||
// //something to do with zooming
|
||||
// if (dpi->zoom_level == 1){
|
||||
@@ -1053,17 +1055,19 @@ void gfx_draw_sprite_palette_set(rct_drawpixelinfo *dpi, int image_id, int x, in
|
||||
if ( dpi->zoom_level && (g1_source->flags & (1<<5)) ){
|
||||
return;
|
||||
}
|
||||
|
||||
//Its used super often so we will define it to a seperate variable.
|
||||
int zoom_level = dpi->zoom_level;
|
||||
uint16 zoom_mask = 0xFFFF << zoom_level;
|
||||
int zoom_amount = 1 << zoom_level;
|
||||
int zoom_mask = 0xFFFFFFFF << zoom_level;
|
||||
|
||||
//This will be the height of the drawn image
|
||||
int height = g1_source->height >> zoom_level;
|
||||
int height = g1_source->height;
|
||||
//This is the start y coordinate on the destination
|
||||
sint16 dest_start_y = ((sint16)y + g1_source->y_offset - dpi->y) >> zoom_level;
|
||||
sint16 dest_start_y = ((y + g1_source->y_offset)&zoom_mask) - dpi->y;
|
||||
//This is the start y coordinate on the source
|
||||
int source_start_y = 0;
|
||||
|
||||
|
||||
if (dest_start_y < 0){
|
||||
//If the destination y is negative reduce the height of the
|
||||
//image as we will cut off the bottom
|
||||
@@ -1073,29 +1077,31 @@ void gfx_draw_sprite_palette_set(rct_drawpixelinfo *dpi, int image_id, int x, in
|
||||
return;
|
||||
}
|
||||
//The source image will start a further up the image
|
||||
source_start_y -= dest_start_y<<zoom_level;
|
||||
source_start_y -= dest_start_y;
|
||||
//The destination start is now reset to 0
|
||||
dest_start_y = 0;
|
||||
}
|
||||
|
||||
|
||||
int dest_end_y = dest_start_y + height;
|
||||
|
||||
if (dest_end_y > (dpi->height >> zoom_level)){
|
||||
if (dest_end_y > dpi->height){
|
||||
//If the destination y is outside of the drawing
|
||||
//image reduce the height of the image
|
||||
height -= dest_end_y - (dpi->height >> zoom_level);
|
||||
height -= dest_end_y - dpi->height;
|
||||
}
|
||||
//If the image no longer has anything to draw
|
||||
if (height <= 0)return;
|
||||
|
||||
dest_start_y /= zoom_amount;
|
||||
dest_end_y /= zoom_amount;
|
||||
|
||||
//This will be the width of the drawn image
|
||||
int width = g1_source->width >> zoom_level;
|
||||
int width = g1_source->width;
|
||||
//This is the source start x coordinate
|
||||
int source_start_x = 0;
|
||||
//This is the destination start x coordinate
|
||||
sint16 dest_start_x = ((sint16)x + g1_source->x_offset - dpi->x) >> zoom_level;
|
||||
|
||||
sint16 dest_start_x = ((x + g1_source->x_offset) & zoom_mask) - dpi->x;
|
||||
|
||||
if (dest_start_x < 0){
|
||||
//If the destination is negative reduce the width
|
||||
//image will cut off the side
|
||||
@@ -1105,29 +1111,28 @@ void gfx_draw_sprite_palette_set(rct_drawpixelinfo *dpi, int image_id, int x, in
|
||||
return;
|
||||
}
|
||||
//The source start will also need to cut off the side
|
||||
source_start_x -= dest_start_x<<zoom_level;
|
||||
source_start_x -= dest_start_x;
|
||||
//Reset the destination to 0
|
||||
dest_start_x = 0;
|
||||
}
|
||||
|
||||
int dest_end_x = dest_start_x + width;
|
||||
|
||||
if (dest_end_x > (dpi->width>>zoom_level)){
|
||||
if (dest_end_x > dpi->width){
|
||||
//If the destination x is outside of the drawing area
|
||||
//reduce the image width.
|
||||
width -= dest_end_x - (dpi->width >> zoom_level);
|
||||
width -= dest_end_x - dpi->width;
|
||||
//If there is no image to draw.
|
||||
if (width <= 0)return;
|
||||
}
|
||||
|
||||
|
||||
dest_start_x /= zoom_amount;
|
||||
dest_end_x /= zoom_amount;
|
||||
|
||||
uint8* dest_pointer = (uint8*)dpi->bits;
|
||||
//Move the pointer to the start point of the destination
|
||||
dest_pointer += ((dpi->width >> zoom_level) + dpi->pitch)*dest_start_y + dest_start_x;
|
||||
|
||||
height <<= zoom_level;
|
||||
width <<= zoom_level;
|
||||
|
||||
dest_pointer += ((dpi->width / zoom_amount) + dpi->pitch)*dest_start_y + dest_start_x;
|
||||
|
||||
if (g1_source->flags & G1_FLAG_RLE_COMPRESSION){
|
||||
//We have to use a different method to move the source pointer for
|
||||
//rle encoded sprites so that will be handled within this function
|
||||
|
||||
Reference in New Issue
Block a user