mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Reverted old dutch language file, more object stuff 

Implemented paint_water_entry
This commit is contained in:
Gericom 2015-02-25 15:24:01 +01:00
parent ac6fa31292
commit b070ffa08f
2 changed files with 3497 additions and 3451 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6898
data/language/dutch.txt
View File

File diff suppressed because it is too large Load Diff

50
src/object.c
View File

@ -484,6 +484,54 @@ int paint_path_entry(int eax, int ebx, int ecx, int edx, int edi, int esi, int e
}
}
int paint_water_entry(int eax, int ebx, int ecx, int edx, int edi, int esi, int ebp)
{
if ((eax & 0xFF) != 3)
{
if ((eax & 0xFF) != 1)
{
if ((eax & 0xFF) <= 1)//0
{
uint8_t* ebp = esi + 0x10;
((rct_string_id*)esi)[0] = object_get_localised_text(&ebp, ecx, ebx, 0);
int a = sub_6A9ED1(&ebp);
((uint32_t*)(esi + 2))[0] = a;
a++;
((uint32_t*)(esi + 6))[0] = a;
a += 3;
((uint32_t*)(esi + 0xA))[0] = a;
if (RCT2_GLOBAL(0x9ADAF4, uint32_t) != 0xFFFFFFFF) RCT2_GLOBAL(0x9ADAF4, uint16_t*)[0] = 0;
if (RCT2_GLOBAL(0x9ADAFD, uint8_t) == 0)
{
load_palette();
gfx_invalidate_screen();
}
return eax;
}
else
{
return 0;
}
}
else
{
((rct_string_id*)esi)[0] = 0;
((uint32_t*)(esi + 2))[0] = 0;
((uint32_t*)(esi + 6))[0] = 0;
((uint32_t*)(esi + 0xA))[0] = 0;
return eax;
}
}
else
{
if (!((eax >> 8) & 0xFF))
{
gfx_draw_string_centred(edi, 3326, ecx, edx, 0, esi);
}
return eax;
}
}
//0x0066B355
int paint_stex_entry(int eax, int ebx, int ecx, int edx, int edi, int esi, int ebp)
{
@ -543,6 +591,8 @@ int object_paint(int type, int eax, int ebx, int ecx, int edx, int esi, int edi,
{
case OBJECT_TYPE_PATHS:
return paint_path_entry(eax, ebx, ecx, edx, edi, esi, ebp);
case OBJECT_TYPE_WATER:
return paint_water_entry(eax, ebx, ecx, edx, edi, esi, ebp);
case OBJECT_TYPE_SCENARIO_TEXT:
return paint_stex_entry(eax, ebx, ecx, edx, edi, esi, ebp);
default: