mirror of https://github.com/OpenRCT2/OpenRCT2.git
Tabs to spaces for sprite.cpp
This commit is contained in:
Ted John
parent
6ea4e4987d
commit
6a0f934a5f
|
|
@ -28,39 +28,39 @@ rct_gx g2;
|
||||||
rct_gx csg;
|
rct_gx csg;
|
||||||
|
|
||||||
#ifdef NO_RCT2
|
#ifdef NO_RCT2
|
||||||
rct_g1_element *g1Elements = NULL;
|
rct_g1_element *g1Elements = NULL;
|
||||||
#else
|
#else
|
||||||
rct_g1_element *g1Elements = RCT2_ADDRESS(RCT2_ADDRESS_G1_ELEMENTS, rct_g1_element);
|
rct_g1_element *g1Elements = RCT2_ADDRESS(RCT2_ADDRESS_G1_ELEMENTS, rct_g1_element);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static const uint32 fadeSprites[] = {
|
static const uint32 fadeSprites[] = {
|
||||||
SPR_NONE,
|
SPR_NONE,
|
||||||
SPR_FADE_1,
|
SPR_FADE_1,
|
||||||
SPR_FADE_2,
|
SPR_FADE_2,
|
||||||
SPR_FADE_3,
|
SPR_FADE_3,
|
||||||
SPR_FADE_4,
|
SPR_FADE_4,
|
||||||
SPR_FADE_5,
|
SPR_FADE_5,
|
||||||
SPR_FADE_6,
|
SPR_FADE_6,
|
||||||
SPR_FADE_7,
|
SPR_FADE_7,
|
||||||
};
|
};
|
||||||
|
|
||||||
static void read_and_convert_gxdat(SDL_RWops *file, size_t count, rct_g1_element *elements)
|
static void read_and_convert_gxdat(SDL_RWops *file, size_t count, rct_g1_element *elements)
|
||||||
{
|
{
|
||||||
rct_g1_element_32bit *g1Elements32 = calloc(count, sizeof(rct_g1_element_32bit));
|
rct_g1_element_32bit *g1Elements32 = calloc(count, sizeof(rct_g1_element_32bit));
|
||||||
SDL_RWread(file, g1Elements32, count * sizeof(rct_g1_element_32bit), 1);
|
SDL_RWread(file, g1Elements32, count * sizeof(rct_g1_element_32bit), 1);
|
||||||
for (size_t i = 0; i < count; i++) {
|
for (size_t i = 0; i < count; i++) {
|
||||||
/* Double cast to silence compiler warning about casting to
|
/* Double cast to silence compiler warning about casting to
|
||||||
* pointer from integer of mismatched length.
|
* pointer from integer of mismatched length.
|
||||||
*/
|
*/
|
||||||
elements[i].offset = (uint8*)(uintptr_t)g1Elements32[i].offset;
|
elements[i].offset = (uint8*)(uintptr_t)g1Elements32[i].offset;
|
||||||
elements[i].width = g1Elements32[i].width;
|
elements[i].width = g1Elements32[i].width;
|
||||||
elements[i].height = g1Elements32[i].height;
|
elements[i].height = g1Elements32[i].height;
|
||||||
elements[i].x_offset = g1Elements32[i].x_offset;
|
elements[i].x_offset = g1Elements32[i].x_offset;
|
||||||
elements[i].y_offset = g1Elements32[i].y_offset;
|
elements[i].y_offset = g1Elements32[i].y_offset;
|
||||||
elements[i].flags = g1Elements32[i].flags;
|
elements[i].flags = g1Elements32[i].flags;
|
||||||
elements[i].zoomed_offset = g1Elements32[i].zoomed_offset;
|
elements[i].zoomed_offset = g1Elements32[i].zoomed_offset;
|
||||||
}
|
}
|
||||||
free(g1Elements32);
|
free(g1Elements32);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -69,166 +69,166 @@ static void read_and_convert_gxdat(SDL_RWops *file, size_t count, rct_g1_element
|
||||||
*/
|
*/
|
||||||
bool gfx_load_g1()
|
bool gfx_load_g1()
|
||||||
{
|
{
|
||||||
log_verbose("loading g1 graphics");
|
log_verbose("loading g1 graphics");
|
||||||
|
|
||||||
SDL_RWops *file = SDL_RWFromFile(get_file_path(PATH_ID_G1), "rb");
|
SDL_RWops *file = SDL_RWFromFile(get_file_path(PATH_ID_G1), "rb");
|
||||||
if (file != NULL) {
|
if (file != NULL) {
|
||||||
rct_g1_header header;
|
rct_g1_header header;
|
||||||
if (SDL_RWread(file, &header, 8, 1) == 1) {
|
if (SDL_RWread(file, &header, 8, 1) == 1) {
|
||||||
/* number of elements is stored in g1.dat, but because the entry
|
/* number of elements is stored in g1.dat, but because the entry
|
||||||
* headers are static, this can't be variable until made into a
|
* headers are static, this can't be variable until made into a
|
||||||
* dynamic array.
|
* dynamic array.
|
||||||
*/
|
*/
|
||||||
header.num_entries = 29294;
|
header.num_entries = 29294;
|
||||||
|
|
||||||
// Read element headers
|
// Read element headers
|
||||||
#ifdef NO_RCT2
|
#ifdef NO_RCT2
|
||||||
g1Elements = calloc(324206, sizeof(rct_g1_element));
|
g1Elements = calloc(324206, sizeof(rct_g1_element));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
read_and_convert_gxdat(file, header.num_entries, g1Elements);
|
read_and_convert_gxdat(file, header.num_entries, g1Elements);
|
||||||
|
|
||||||
// Read element data
|
// Read element data
|
||||||
_g1Buffer = malloc(header.total_size);
|
_g1Buffer = malloc(header.total_size);
|
||||||
SDL_RWread(file, _g1Buffer, header.total_size, 1);
|
SDL_RWread(file, _g1Buffer, header.total_size, 1);
|
||||||
|
|
||||||
SDL_RWclose(file);
|
SDL_RWclose(file);
|
||||||
|
|
||||||
// Fix entry data offsets
|
// Fix entry data offsets
|
||||||
for (uint32 i = 0; i < header.num_entries; i++)
|
for (uint32 i = 0; i < header.num_entries; i++)
|
||||||
g1Elements[i].offset += (uintptr_t)_g1Buffer;
|
g1Elements[i].offset += (uintptr_t)_g1Buffer;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
SDL_RWclose(file);
|
SDL_RWclose(file);
|
||||||
}
|
}
|
||||||
|
|
||||||
log_fatal("Unable to load g1 graphics");
|
log_fatal("Unable to load g1 graphics");
|
||||||
if (!gOpenRCT2Headless) {
|
if (!gOpenRCT2Headless) {
|
||||||
platform_show_messagebox("Unable to load g1.dat. Your RollerCoaster Tycoon 2 path may be incorrectly set.");
|
platform_show_messagebox("Unable to load g1.dat. Your RollerCoaster Tycoon 2 path may be incorrectly set.");
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void gfx_unload_g1()
|
void gfx_unload_g1()
|
||||||
{
|
{
|
||||||
SafeFree(_g1Buffer);
|
SafeFree(_g1Buffer);
|
||||||
#ifdef NO_RCT2
|
#ifdef NO_RCT2
|
||||||
SafeFree(g1Elements);
|
SafeFree(g1Elements);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void gfx_unload_g2()
|
void gfx_unload_g2()
|
||||||
{
|
{
|
||||||
SafeFree(g2.elements);
|
SafeFree(g2.elements);
|
||||||
}
|
}
|
||||||
|
|
||||||
void gfx_unload_csg()
|
void gfx_unload_csg()
|
||||||
{
|
{
|
||||||
SafeFree(csg.elements);
|
SafeFree(csg.elements);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool gfx_load_g2()
|
bool gfx_load_g2()
|
||||||
{
|
{
|
||||||
log_verbose("loading g2 graphics");
|
log_verbose("loading g2 graphics");
|
||||||
|
|
||||||
char path[MAX_PATH];
|
char path[MAX_PATH];
|
||||||
|
|
||||||
platform_get_openrct_data_path(path, sizeof(path));
|
platform_get_openrct_data_path(path, sizeof(path));
|
||||||
safe_strcat_path(path, "g2.dat", MAX_PATH);
|
safe_strcat_path(path, "g2.dat", MAX_PATH);
|
||||||
SDL_RWops *file = SDL_RWFromFile(path, "rb");
|
SDL_RWops *file = SDL_RWFromFile(path, "rb");
|
||||||
if (file != NULL) {
|
if (file != NULL) {
|
||||||
if (SDL_RWread(file, &g2.header, 8, 1) == 1) {
|
if (SDL_RWread(file, &g2.header, 8, 1) == 1) {
|
||||||
// Read element headers
|
// Read element headers
|
||||||
g2.elements = malloc(g2.header.num_entries * sizeof(rct_g1_element));
|
g2.elements = malloc(g2.header.num_entries * sizeof(rct_g1_element));
|
||||||
|
|
||||||
read_and_convert_gxdat(file, g2.header.num_entries, g2.elements);
|
read_and_convert_gxdat(file, g2.header.num_entries, g2.elements);
|
||||||
|
|
||||||
// Read element data
|
// Read element data
|
||||||
g2.data = malloc(g2.header.total_size);
|
g2.data = malloc(g2.header.total_size);
|
||||||
SDL_RWread(file, g2.data, g2.header.total_size, 1);
|
SDL_RWread(file, g2.data, g2.header.total_size, 1);
|
||||||
|
|
||||||
SDL_RWclose(file);
|
SDL_RWclose(file);
|
||||||
|
|
||||||
// Fix entry data offsets
|
// Fix entry data offsets
|
||||||
for (uint32 i = 0; i < g2.header.num_entries; i++)
|
for (uint32 i = 0; i < g2.header.num_entries; i++)
|
||||||
g2.elements[i].offset += (uintptr_t)g2.data;
|
g2.elements[i].offset += (uintptr_t)g2.data;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
SDL_RWclose(file);
|
SDL_RWclose(file);
|
||||||
}
|
}
|
||||||
|
|
||||||
log_fatal("Unable to load g2 graphics");
|
log_fatal("Unable to load g2 graphics");
|
||||||
if (!gOpenRCT2Headless) {
|
if (!gOpenRCT2Headless) {
|
||||||
platform_show_messagebox("Unable to load g2.dat");
|
platform_show_messagebox("Unable to load g2.dat");
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool gfx_load_csg()
|
bool gfx_load_csg()
|
||||||
{
|
{
|
||||||
if (str_is_null_or_empty(gConfigGeneral.rct1_path)) {
|
if (str_is_null_or_empty(gConfigGeneral.rct1_path)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool success = false;
|
bool success = false;
|
||||||
log_verbose("loading csg graphics");
|
log_verbose("loading csg graphics");
|
||||||
|
|
||||||
char pathHeader[MAX_PATH];
|
char pathHeader[MAX_PATH];
|
||||||
safe_strcpy(pathHeader, gConfigGeneral.rct1_path, sizeof(pathHeader));
|
safe_strcpy(pathHeader, gConfigGeneral.rct1_path, sizeof(pathHeader));
|
||||||
safe_strcat_path(pathHeader, "Data", sizeof(pathHeader));
|
safe_strcat_path(pathHeader, "Data", sizeof(pathHeader));
|
||||||
safe_strcat_path(pathHeader, "csg1i.dat", sizeof(pathHeader));
|
safe_strcat_path(pathHeader, "csg1i.dat", sizeof(pathHeader));
|
||||||
|
|
||||||
char pathData[MAX_PATH];
|
char pathData[MAX_PATH];
|
||||||
safe_strcpy(pathData, gConfigGeneral.rct1_path, sizeof(pathData));
|
safe_strcpy(pathData, gConfigGeneral.rct1_path, sizeof(pathData));
|
||||||
safe_strcat_path(pathData, "Data", sizeof(pathData));
|
safe_strcat_path(pathData, "Data", sizeof(pathData));
|
||||||
safe_strcat_path(pathData, "csg1.1", sizeof(pathData));
|
safe_strcat_path(pathData, "csg1.1", sizeof(pathData));
|
||||||
|
|
||||||
SDL_RWops * fileHeader = SDL_RWFromFile(pathHeader, "rb");
|
SDL_RWops * fileHeader = SDL_RWFromFile(pathHeader, "rb");
|
||||||
SDL_RWops * fileData = SDL_RWFromFile(pathData, "rb");
|
SDL_RWops * fileData = SDL_RWFromFile(pathData, "rb");
|
||||||
if (fileHeader != NULL && fileData != NULL) {
|
if (fileHeader != NULL && fileData != NULL) {
|
||||||
SDL_RWseek(fileHeader, 0, RW_SEEK_END);
|
SDL_RWseek(fileHeader, 0, RW_SEEK_END);
|
||||||
SDL_RWseek(fileData, 0, RW_SEEK_END);
|
SDL_RWseek(fileData, 0, RW_SEEK_END);
|
||||||
size_t fileHeaderSize = SDL_RWtell(fileHeader);
|
size_t fileHeaderSize = SDL_RWtell(fileHeader);
|
||||||
size_t fileDataSize = SDL_RWtell(fileData);
|
size_t fileDataSize = SDL_RWtell(fileData);
|
||||||
SDL_RWseek(fileHeader, 0, RW_SEEK_SET);
|
SDL_RWseek(fileHeader, 0, RW_SEEK_SET);
|
||||||
SDL_RWseek(fileData, 0, RW_SEEK_SET);
|
SDL_RWseek(fileData, 0, RW_SEEK_SET);
|
||||||
|
|
||||||
csg.header.num_entries = (uint32)(fileHeaderSize / sizeof(rct_g1_element_32bit));
|
csg.header.num_entries = (uint32)(fileHeaderSize / sizeof(rct_g1_element_32bit));
|
||||||
csg.header.total_size = (uint32)fileDataSize;
|
csg.header.total_size = (uint32)fileDataSize;
|
||||||
|
|
||||||
// Read element headers
|
// Read element headers
|
||||||
csg.elements = malloc(csg.header.num_entries * sizeof(rct_g1_element));
|
csg.elements = malloc(csg.header.num_entries * sizeof(rct_g1_element));
|
||||||
read_and_convert_gxdat(fileHeader, csg.header.num_entries, csg.elements);
|
read_and_convert_gxdat(fileHeader, csg.header.num_entries, csg.elements);
|
||||||
|
|
||||||
// Read element data
|
// Read element data
|
||||||
csg.data = malloc(csg.header.total_size);
|
csg.data = malloc(csg.header.total_size);
|
||||||
SDL_RWread(fileData, csg.data, csg.header.total_size, 1);
|
SDL_RWread(fileData, csg.data, csg.header.total_size, 1);
|
||||||
|
|
||||||
// Fix entry data offsets
|
// Fix entry data offsets
|
||||||
for (uint32 i = 0; i < csg.header.num_entries; i++) {
|
for (uint32 i = 0; i < csg.header.num_entries; i++) {
|
||||||
csg.elements[i].offset += (uintptr_t)csg.data;
|
csg.elements[i].offset += (uintptr_t)csg.data;
|
||||||
// RCT1 used zoomed offsets that counted from the beginning of the file, rather than from the current sprite.
|
// RCT1 used zoomed offsets that counted from the beginning of the file, rather than from the current sprite.
|
||||||
csg.elements[i].zoomed_offset = i - (SPR_CSG_BEGIN + csg.elements[i].zoomed_offset);
|
csg.elements[i].zoomed_offset = i - (SPR_CSG_BEGIN + csg.elements[i].zoomed_offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
success = true;
|
success = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (fileHeader != NULL) {
|
if (fileHeader != NULL) {
|
||||||
SDL_RWclose(fileHeader);
|
SDL_RWclose(fileHeader);
|
||||||
}
|
}
|
||||||
if (fileData != NULL) {
|
if (fileData != NULL) {
|
||||||
SDL_RWclose(fileData);
|
SDL_RWclose(fileData);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (success) {
|
if (success) {
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
log_error("Unable to load csg graphics");
|
log_error("Unable to load csg graphics");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -237,14 +237,14 @@ bool gfx_load_csg()
|
||||||
*/
|
*/
|
||||||
void sub_68371D()
|
void sub_68371D()
|
||||||
{
|
{
|
||||||
for (sint32 i = 0; i < countof(fadeSprites); i++) {
|
for (sint32 i = 0; i < countof(fadeSprites); i++) {
|
||||||
const uint32 spriteId = fadeSprites[i];
|
const uint32 spriteId = fadeSprites[i];
|
||||||
if (spriteId == SPR_NONE) {
|
if (spriteId == SPR_NONE) {
|
||||||
unk_9E3CE4[i] = NULL;
|
unk_9E3CE4[i] = NULL;
|
||||||
} else {
|
} else {
|
||||||
unk_9E3CE4[i] = g1Elements[fadeSprites[i]].offset;
|
unk_9E3CE4[i] = g1Elements[fadeSprites[i]].offset;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -253,127 +253,127 @@ void sub_68371D()
|
||||||
* rct2: 0x0067A690
|
* rct2: 0x0067A690
|
||||||
*/
|
*/
|
||||||
static void FASTCALL 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, sint32 height, sint32 width, sint32 image_type){
|
static void FASTCALL 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, sint32 height, sint32 width, sint32 image_type){
|
||||||
uint16 zoom_level = dest_dpi->zoom_level;
|
uint16 zoom_level = dest_dpi->zoom_level;
|
||||||
uint8 zoom_amount = 1 << zoom_level;
|
uint8 zoom_amount = 1 << zoom_level;
|
||||||
uint32 dest_line_width = (dest_dpi->width / zoom_amount) + dest_dpi->pitch;
|
uint32 dest_line_width = (dest_dpi->width / zoom_amount) + dest_dpi->pitch;
|
||||||
uint32 source_line_width = source_image->width * zoom_amount;
|
uint32 source_line_width = source_image->width * zoom_amount;
|
||||||
|
|
||||||
// Image uses the palette pointer to remap the colours of the image
|
// Image uses the palette pointer to remap the colours of the image
|
||||||
if (image_type & IMAGE_TYPE_REMAP){
|
if (image_type & IMAGE_TYPE_REMAP){
|
||||||
assert(palette_pointer != NULL);
|
assert(palette_pointer != NULL);
|
||||||
|
|
||||||
//image with remaps
|
//image with remaps
|
||||||
for (; height > 0; height -= zoom_amount){
|
for (; height > 0; height -= zoom_amount){
|
||||||
uint8* next_source_pointer = source_pointer + source_line_width;
|
uint8* next_source_pointer = source_pointer + source_line_width;
|
||||||
uint8* next_dest_pointer = dest_pointer + dest_line_width;
|
uint8* next_dest_pointer = dest_pointer + dest_line_width;
|
||||||
for (sint32 no_pixels = width; no_pixels > 0; no_pixels -= zoom_amount, source_pointer += zoom_amount, dest_pointer++){
|
for (sint32 no_pixels = width; no_pixels > 0; no_pixels -= zoom_amount, source_pointer += zoom_amount, dest_pointer++){
|
||||||
uint8 pixel = *source_pointer;
|
uint8 pixel = *source_pointer;
|
||||||
pixel = palette_pointer[pixel];
|
pixel = palette_pointer[pixel];
|
||||||
if (pixel){
|
if (pixel){
|
||||||
*dest_pointer = pixel;
|
*dest_pointer = pixel;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
source_pointer = next_source_pointer;
|
source_pointer = next_source_pointer;
|
||||||
dest_pointer = next_dest_pointer;
|
dest_pointer = next_dest_pointer;
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Image is Transparent. It only uses source pointer for
|
//Image is Transparent. It only uses source pointer for
|
||||||
//telling if it needs to be drawn not for colour. Colour provided
|
//telling if it needs to be drawn not for colour. Colour provided
|
||||||
//by the palette pointer.
|
//by the palette pointer.
|
||||||
if (image_type & IMAGE_TYPE_TRANSPARENT){//Not tested
|
if (image_type & IMAGE_TYPE_TRANSPARENT){//Not tested
|
||||||
assert(palette_pointer != NULL);
|
assert(palette_pointer != NULL);
|
||||||
for (; height > 0; height -= zoom_amount){
|
for (; height > 0; height -= zoom_amount){
|
||||||
uint8* next_source_pointer = source_pointer + source_line_width;
|
uint8* next_source_pointer = source_pointer + source_line_width;
|
||||||
uint8* next_dest_pointer = dest_pointer + dest_line_width;
|
uint8* next_dest_pointer = dest_pointer + dest_line_width;
|
||||||
|
|
||||||
for (sint32 no_pixels = width; no_pixels > 0; no_pixels -= zoom_amount, source_pointer += zoom_amount, dest_pointer++){
|
for (sint32 no_pixels = width; no_pixels > 0; no_pixels -= zoom_amount, source_pointer += zoom_amount, dest_pointer++){
|
||||||
uint8 pixel = *source_pointer;
|
uint8 pixel = *source_pointer;
|
||||||
if (pixel){
|
if (pixel){
|
||||||
pixel = *dest_pointer;
|
pixel = *dest_pointer;
|
||||||
pixel = palette_pointer[pixel];
|
pixel = palette_pointer[pixel];
|
||||||
*dest_pointer = pixel;
|
*dest_pointer = pixel;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
source_pointer = next_source_pointer;
|
source_pointer = next_source_pointer;
|
||||||
dest_pointer = next_dest_pointer;
|
dest_pointer = next_dest_pointer;
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Basic bitmap no fancy stuff
|
//Basic bitmap no fancy stuff
|
||||||
if (!(source_image->flags & G1_FLAG_BMP)){//Not tested
|
if (!(source_image->flags & G1_FLAG_BMP)){//Not tested
|
||||||
for (; height > 0; height -= zoom_amount){
|
for (; height > 0; height -= zoom_amount){
|
||||||
uint8* next_source_pointer = source_pointer + source_line_width;
|
uint8* next_source_pointer = source_pointer + source_line_width;
|
||||||
uint8* next_dest_pointer = dest_pointer + dest_line_width;
|
uint8* next_dest_pointer = dest_pointer + dest_line_width;
|
||||||
|
|
||||||
for (sint32 no_pixels = width; no_pixels > 0; no_pixels -= zoom_amount, dest_pointer++, source_pointer += zoom_amount){
|
for (sint32 no_pixels = width; no_pixels > 0; no_pixels -= zoom_amount, dest_pointer++, source_pointer += zoom_amount){
|
||||||
*dest_pointer = *source_pointer;
|
*dest_pointer = *source_pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
dest_pointer = next_dest_pointer;
|
dest_pointer = next_dest_pointer;
|
||||||
source_pointer = next_source_pointer;
|
source_pointer = next_source_pointer;
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Basic bitmap with no draw pixels
|
//Basic bitmap with no draw pixels
|
||||||
for (; height > 0; height -= zoom_amount){
|
for (; height > 0; height -= zoom_amount){
|
||||||
uint8* next_source_pointer = source_pointer + source_line_width;
|
uint8* next_source_pointer = source_pointer + source_line_width;
|
||||||
uint8* next_dest_pointer = dest_pointer + dest_line_width;
|
uint8* next_dest_pointer = dest_pointer + dest_line_width;
|
||||||
|
|
||||||
for (sint32 no_pixels = width; no_pixels > 0; no_pixels -= zoom_amount, dest_pointer++, source_pointer += zoom_amount){
|
for (sint32 no_pixels = width; no_pixels > 0; no_pixels -= zoom_amount, dest_pointer++, source_pointer += zoom_amount){
|
||||||
uint8 pixel = *source_pointer;
|
uint8 pixel = *source_pointer;
|
||||||
if (pixel){
|
if (pixel){
|
||||||
*dest_pointer = pixel;
|
*dest_pointer = pixel;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
dest_pointer = next_dest_pointer;
|
dest_pointer = next_dest_pointer;
|
||||||
source_pointer = next_source_pointer;
|
source_pointer = next_source_pointer;
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint8* FASTCALL gfx_draw_sprite_get_palette(sint32 image_id, uint32 tertiary_colour) {
|
uint8* FASTCALL gfx_draw_sprite_get_palette(sint32 image_id, uint32 tertiary_colour) {
|
||||||
sint32 image_type = (image_id & 0xE0000000);
|
sint32 image_type = (image_id & 0xE0000000);
|
||||||
if (image_type == 0)
|
if (image_type == 0)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
if (!(image_type & IMAGE_TYPE_REMAP_2_PLUS)) {
|
if (!(image_type & IMAGE_TYPE_REMAP_2_PLUS)) {
|
||||||
uint8 palette_ref = (image_id >> 19) & 0xFF;
|
uint8 palette_ref = (image_id >> 19) & 0xFF;
|
||||||
if (!(image_type & IMAGE_TYPE_TRANSPARENT)) {
|
if (!(image_type & IMAGE_TYPE_TRANSPARENT)) {
|
||||||
palette_ref &= 0x7F;
|
palette_ref &= 0x7F;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint16 palette_offset = palette_to_g1_offset[palette_ref];
|
uint16 palette_offset = palette_to_g1_offset[palette_ref];
|
||||||
return g1Elements[palette_offset].offset;
|
return g1Elements[palette_offset].offset;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
uint8* palette_pointer = gPeepPalette;
|
uint8* palette_pointer = gPeepPalette;
|
||||||
|
|
||||||
uint32 primary_offset = palette_to_g1_offset[(image_id >> 19) & 0x1F];
|
uint32 primary_offset = palette_to_g1_offset[(image_id >> 19) & 0x1F];
|
||||||
uint32 secondary_offset = palette_to_g1_offset[(image_id >> 24) & 0x1F];
|
uint32 secondary_offset = palette_to_g1_offset[(image_id >> 24) & 0x1F];
|
||||||
|
|
||||||
if (!(image_type & IMAGE_TYPE_REMAP)) {
|
if (!(image_type & IMAGE_TYPE_REMAP)) {
|
||||||
palette_pointer = gOtherPalette;
|
palette_pointer = gOtherPalette;
|
||||||
#if defined(DEBUG_LEVEL_2) && DEBUG_LEVEL_2
|
#if defined(DEBUG_LEVEL_2) && DEBUG_LEVEL_2
|
||||||
assert(tertiary_colour < PALETTE_TO_G1_OFFSET_COUNT);
|
assert(tertiary_colour < PALETTE_TO_G1_OFFSET_COUNT);
|
||||||
#endif // DEBUG_LEVEL_2
|
#endif // DEBUG_LEVEL_2
|
||||||
uint32 tertiary_offset = palette_to_g1_offset[tertiary_colour];
|
uint32 tertiary_offset = palette_to_g1_offset[tertiary_colour];
|
||||||
rct_g1_element* tertiary_palette = &g1Elements[tertiary_offset];
|
rct_g1_element* tertiary_palette = &g1Elements[tertiary_offset];
|
||||||
memcpy(palette_pointer + 0x2E, &tertiary_palette->offset[0xF3], 12);
|
memcpy(palette_pointer + 0x2E, &tertiary_palette->offset[0xF3], 12);
|
||||||
}
|
}
|
||||||
rct_g1_element* primary_palette = &g1Elements[primary_offset];
|
rct_g1_element* primary_palette = &g1Elements[primary_offset];
|
||||||
rct_g1_element* secondary_palette = &g1Elements[secondary_offset];
|
rct_g1_element* secondary_palette = &g1Elements[secondary_offset];
|
||||||
|
|
||||||
memcpy(palette_pointer + 0xF3, &primary_palette->offset[0xF3], 12);
|
memcpy(palette_pointer + 0xF3, &primary_palette->offset[0xF3], 12);
|
||||||
memcpy(palette_pointer + 0xCA, &secondary_palette->offset[0xF3], 12);
|
memcpy(palette_pointer + 0xCA, &secondary_palette->offset[0xF3], 12);
|
||||||
|
|
||||||
return palette_pointer;
|
return palette_pointer;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -394,13 +394,13 @@ uint8* FASTCALL gfx_draw_sprite_get_palette(sint32 image_id, uint32 tertiary_col
|
||||||
*/
|
*/
|
||||||
void FASTCALL gfx_draw_sprite_software(rct_drawpixelinfo *dpi, sint32 image_id, sint32 x, sint32 y, uint32 tertiary_colour)
|
void FASTCALL gfx_draw_sprite_software(rct_drawpixelinfo *dpi, sint32 image_id, sint32 x, sint32 y, uint32 tertiary_colour)
|
||||||
{
|
{
|
||||||
uint8* palette_pointer = gfx_draw_sprite_get_palette(image_id, tertiary_colour);
|
uint8* palette_pointer = gfx_draw_sprite_get_palette(image_id, tertiary_colour);
|
||||||
if (image_id & IMAGE_TYPE_REMAP_2_PLUS) {
|
if (image_id & IMAGE_TYPE_REMAP_2_PLUS) {
|
||||||
image_id |= IMAGE_TYPE_REMAP;
|
image_id |= IMAGE_TYPE_REMAP;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
gfx_draw_sprite_palette_set_software(dpi, image_id, x, y, palette_pointer, NULL);
|
gfx_draw_sprite_palette_set_software(dpi, image_id, x, y, palette_pointer, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -414,142 +414,142 @@ void FASTCALL gfx_draw_sprite_software(rct_drawpixelinfo *dpi, sint32 image_id,
|
||||||
*/
|
*/
|
||||||
void FASTCALL gfx_draw_sprite_palette_set_software(rct_drawpixelinfo *dpi, sint32 image_id, sint32 x, sint32 y, uint8* palette_pointer, uint8* unknown_pointer)
|
void FASTCALL gfx_draw_sprite_palette_set_software(rct_drawpixelinfo *dpi, sint32 image_id, sint32 x, sint32 y, uint8* palette_pointer, uint8* unknown_pointer)
|
||||||
{
|
{
|
||||||
sint32 image_element = image_id & 0x7FFFF;
|
sint32 image_element = image_id & 0x7FFFF;
|
||||||
sint32 image_type = image_id & 0xE0000000;
|
sint32 image_type = image_id & 0xE0000000;
|
||||||
|
|
||||||
rct_g1_element *g1_source = gfx_get_g1_element(image_element);
|
rct_g1_element *g1_source = gfx_get_g1_element(image_element);
|
||||||
|
|
||||||
if (dpi->zoom_level != 0 && (g1_source->flags & G1_FLAG_HAS_ZOOM_SPRITE)) {
|
if (dpi->zoom_level != 0 && (g1_source->flags & G1_FLAG_HAS_ZOOM_SPRITE)) {
|
||||||
rct_drawpixelinfo zoomed_dpi = {
|
rct_drawpixelinfo zoomed_dpi = {
|
||||||
.bits = dpi->bits,
|
.bits = dpi->bits,
|
||||||
.x = dpi->x >> 1,
|
.x = dpi->x >> 1,
|
||||||
.y = dpi->y >> 1,
|
.y = dpi->y >> 1,
|
||||||
.height = dpi->height>>1,
|
.height = dpi->height>>1,
|
||||||
.width = dpi->width>>1,
|
.width = dpi->width>>1,
|
||||||
.pitch = dpi->pitch,
|
.pitch = dpi->pitch,
|
||||||
.zoom_level = dpi->zoom_level - 1
|
.zoom_level = dpi->zoom_level - 1
|
||||||
};
|
};
|
||||||
gfx_draw_sprite_palette_set_software(&zoomed_dpi, image_type | (image_element - g1_source->zoomed_offset), x >> 1, y >> 1, palette_pointer, unknown_pointer);
|
gfx_draw_sprite_palette_set_software(&zoomed_dpi, image_type | (image_element - g1_source->zoomed_offset), x >> 1, y >> 1, palette_pointer, unknown_pointer);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dpi->zoom_level != 0 && (g1_source->flags & G1_FLAG_NO_ZOOM_DRAW)) {
|
if (dpi->zoom_level != 0 && (g1_source->flags & G1_FLAG_NO_ZOOM_DRAW)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Its used super often so we will define it to a separate variable.
|
//Its used super often so we will define it to a separate variable.
|
||||||
sint32 zoom_level = dpi->zoom_level;
|
sint32 zoom_level = dpi->zoom_level;
|
||||||
sint32 zoom_mask = 0xFFFFFFFF << zoom_level;
|
sint32 zoom_mask = 0xFFFFFFFF << zoom_level;
|
||||||
|
|
||||||
if (zoom_level && g1_source->flags & G1_FLAG_RLE_COMPRESSION){
|
if (zoom_level && g1_source->flags & G1_FLAG_RLE_COMPRESSION){
|
||||||
x -= ~zoom_mask;
|
x -= ~zoom_mask;
|
||||||
y -= ~zoom_mask;
|
y -= ~zoom_mask;
|
||||||
}
|
}
|
||||||
|
|
||||||
//This will be the height of the drawn image
|
//This will be the height of the drawn image
|
||||||
sint32 height = g1_source->height;
|
sint32 height = g1_source->height;
|
||||||
//This is the start y coordinate on the destination
|
//This is the start y coordinate on the destination
|
||||||
sint16 dest_start_y = y + g1_source->y_offset;
|
sint16 dest_start_y = y + g1_source->y_offset;
|
||||||
|
|
||||||
// For whatever reason the RLE version does not use
|
// For whatever reason the RLE version does not use
|
||||||
// the zoom mask on the y coordinate but does on x.
|
// the zoom mask on the y coordinate but does on x.
|
||||||
if (g1_source->flags & G1_FLAG_RLE_COMPRESSION){
|
if (g1_source->flags & G1_FLAG_RLE_COMPRESSION){
|
||||||
dest_start_y -= dpi->y;
|
dest_start_y -= dpi->y;
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
dest_start_y = (dest_start_y&zoom_mask) - dpi->y;
|
dest_start_y = (dest_start_y&zoom_mask) - dpi->y;
|
||||||
}
|
}
|
||||||
//This is the start y coordinate on the source
|
//This is the start y coordinate on the source
|
||||||
sint32 source_start_y = 0;
|
sint32 source_start_y = 0;
|
||||||
|
|
||||||
if (dest_start_y < 0){
|
if (dest_start_y < 0){
|
||||||
//If the destination y is negative reduce the height of the
|
//If the destination y is negative reduce the height of the
|
||||||
//image as we will cut off the bottom
|
//image as we will cut off the bottom
|
||||||
height += dest_start_y;
|
height += dest_start_y;
|
||||||
//If the image is no longer visible nothing to draw
|
//If the image is no longer visible nothing to draw
|
||||||
if (height <= 0){
|
if (height <= 0){
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
//The source image will start a further up the image
|
//The source image will start a further up the image
|
||||||
source_start_y -= dest_start_y;
|
source_start_y -= dest_start_y;
|
||||||
//The destination start is now reset to 0
|
//The destination start is now reset to 0
|
||||||
dest_start_y = 0;
|
dest_start_y = 0;
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
if (g1_source->flags & G1_FLAG_RLE_COMPRESSION && zoom_level){
|
if (g1_source->flags & G1_FLAG_RLE_COMPRESSION && zoom_level){
|
||||||
source_start_y -= dest_start_y & ~zoom_mask;
|
source_start_y -= dest_start_y & ~zoom_mask;
|
||||||
height += dest_start_y & ~zoom_mask;
|
height += dest_start_y & ~zoom_mask;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sint32 dest_end_y = dest_start_y + height;
|
sint32 dest_end_y = dest_start_y + height;
|
||||||
|
|
||||||
if (dest_end_y > dpi->height){
|
if (dest_end_y > dpi->height){
|
||||||
//If the destination y is outside of the drawing
|
//If the destination y is outside of the drawing
|
||||||
//image reduce the height of the image
|
//image reduce the height of the image
|
||||||
height -= dest_end_y - dpi->height;
|
height -= dest_end_y - dpi->height;
|
||||||
}
|
}
|
||||||
//If the image no longer has anything to draw
|
//If the image no longer has anything to draw
|
||||||
if (height <= 0)return;
|
if (height <= 0)return;
|
||||||
|
|
||||||
dest_start_y >>= zoom_level;
|
dest_start_y >>= zoom_level;
|
||||||
|
|
||||||
//This will be the width of the drawn image
|
//This will be the width of the drawn image
|
||||||
sint32 width = g1_source->width;
|
sint32 width = g1_source->width;
|
||||||
//This is the source start x coordinate
|
//This is the source start x coordinate
|
||||||
sint32 source_start_x = 0;
|
sint32 source_start_x = 0;
|
||||||
//This is the destination start x coordinate
|
//This is the destination start x coordinate
|
||||||
sint16 dest_start_x = ((x + g1_source->x_offset + ~zoom_mask)&zoom_mask) - dpi->x;
|
sint16 dest_start_x = ((x + g1_source->x_offset + ~zoom_mask)&zoom_mask) - dpi->x;
|
||||||
|
|
||||||
if (dest_start_x < 0){
|
if (dest_start_x < 0){
|
||||||
//If the destination is negative reduce the width
|
//If the destination is negative reduce the width
|
||||||
//image will cut off the side
|
//image will cut off the side
|
||||||
width += dest_start_x;
|
width += dest_start_x;
|
||||||
//If there is no image to draw
|
//If there is no image to draw
|
||||||
if (width <= 0){
|
if (width <= 0){
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
//The source start will also need to cut off the side
|
//The source start will also need to cut off the side
|
||||||
source_start_x -= dest_start_x;
|
source_start_x -= dest_start_x;
|
||||||
//Reset the destination to 0
|
//Reset the destination to 0
|
||||||
dest_start_x = 0;
|
dest_start_x = 0;
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
if (g1_source->flags & G1_FLAG_RLE_COMPRESSION && zoom_level){
|
if (g1_source->flags & G1_FLAG_RLE_COMPRESSION && zoom_level){
|
||||||
source_start_x -= dest_start_x & ~zoom_mask;
|
source_start_x -= dest_start_x & ~zoom_mask;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sint32 dest_end_x = dest_start_x + width;
|
sint32 dest_end_x = dest_start_x + width;
|
||||||
|
|
||||||
if (dest_end_x > dpi->width){
|
if (dest_end_x > dpi->width){
|
||||||
//If the destination x is outside of the drawing area
|
//If the destination x is outside of the drawing area
|
||||||
//reduce the image width.
|
//reduce the image width.
|
||||||
width -= dest_end_x - dpi->width;
|
width -= dest_end_x - dpi->width;
|
||||||
//If there is no image to draw.
|
//If there is no image to draw.
|
||||||
if (width <= 0)return;
|
if (width <= 0)return;
|
||||||
}
|
}
|
||||||
|
|
||||||
dest_start_x >>= zoom_level;
|
dest_start_x >>= zoom_level;
|
||||||
|
|
||||||
uint8* dest_pointer = (uint8*)dpi->bits;
|
uint8* dest_pointer = (uint8*)dpi->bits;
|
||||||
//Move the pointer to the start point of the destination
|
//Move the pointer to the start point of the destination
|
||||||
dest_pointer += ((dpi->width >> zoom_level) + dpi->pitch) * dest_start_y + dest_start_x;
|
dest_pointer += ((dpi->width >> zoom_level) + dpi->pitch) * dest_start_y + dest_start_x;
|
||||||
|
|
||||||
if (g1_source->flags & G1_FLAG_RLE_COMPRESSION){
|
if (g1_source->flags & G1_FLAG_RLE_COMPRESSION){
|
||||||
//We have to use a different method to move the source pointer for
|
//We have to use a different method to move the source pointer for
|
||||||
//rle encoded sprites so that will be handled within this function
|
//rle encoded sprites so that will be handled within this function
|
||||||
gfx_rle_sprite_to_buffer(g1_source->offset, dest_pointer, palette_pointer, dpi, image_type, source_start_y, height, source_start_x, width);
|
gfx_rle_sprite_to_buffer(g1_source->offset, dest_pointer, palette_pointer, dpi, image_type, source_start_y, height, source_start_x, width);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
uint8* source_pointer = g1_source->offset;
|
uint8* source_pointer = g1_source->offset;
|
||||||
//Move the pointer to the start point of the source
|
//Move the pointer to the start point of the source
|
||||||
source_pointer += g1_source->width*source_start_y + source_start_x;
|
source_pointer += g1_source->width*source_start_y + source_start_x;
|
||||||
|
|
||||||
if (!(g1_source->flags & G1_FLAG_1)) {
|
if (!(g1_source->flags & G1_FLAG_1)) {
|
||||||
gfx_bmp_sprite_to_buffer(palette_pointer, unknown_pointer, source_pointer, dest_pointer, g1_source, dpi, height, width, image_type);
|
gfx_bmp_sprite_to_buffer(palette_pointer, unknown_pointer, source_pointer, dest_pointer, g1_source, dpi, height, width, image_type);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -560,68 +560,68 @@ void FASTCALL gfx_draw_sprite_palette_set_software(rct_drawpixelinfo *dpi, sint3
|
||||||
*/
|
*/
|
||||||
void FASTCALL gfx_draw_sprite_raw_masked_software(rct_drawpixelinfo *dpi, sint32 x, sint32 y, sint32 maskImage, sint32 colourImage)
|
void FASTCALL gfx_draw_sprite_raw_masked_software(rct_drawpixelinfo *dpi, sint32 x, sint32 y, sint32 maskImage, sint32 colourImage)
|
||||||
{
|
{
|
||||||
sint32 left, top, right, bottom, width, height;
|
sint32 left, top, right, bottom, width, height;
|
||||||
rct_g1_element *imgMask = &g1Elements[maskImage & 0x7FFFF];
|
rct_g1_element *imgMask = &g1Elements[maskImage & 0x7FFFF];
|
||||||
rct_g1_element *imgColour = &g1Elements[colourImage & 0x7FFFF];
|
rct_g1_element *imgColour = &g1Elements[colourImage & 0x7FFFF];
|
||||||
|
|
||||||
assert(imgMask->flags & G1_FLAG_BMP);
|
assert(imgMask->flags & G1_FLAG_BMP);
|
||||||
assert(imgColour->flags & G1_FLAG_BMP);
|
assert(imgColour->flags & G1_FLAG_BMP);
|
||||||
|
|
||||||
if (dpi->zoom_level != 0) {
|
if (dpi->zoom_level != 0) {
|
||||||
// TODO implement other zoom levels (probably not used though)
|
// TODO implement other zoom levels (probably not used though)
|
||||||
assert(false);
|
assert(false);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
width = min(imgMask->width, imgColour->width);
|
width = min(imgMask->width, imgColour->width);
|
||||||
height = min(imgMask->height, imgColour->height);
|
height = min(imgMask->height, imgColour->height);
|
||||||
|
|
||||||
x += imgMask->x_offset;
|
x += imgMask->x_offset;
|
||||||
y += imgMask->y_offset;
|
y += imgMask->y_offset;
|
||||||
|
|
||||||
left = max(dpi->x, x);
|
left = max(dpi->x, x);
|
||||||
top = max(dpi->y, y);
|
top = max(dpi->y, y);
|
||||||
right = min(dpi->x + dpi->width, x + width);
|
right = min(dpi->x + dpi->width, x + width);
|
||||||
bottom = min(dpi->y + dpi->height, y + height);
|
bottom = min(dpi->y + dpi->height, y + height);
|
||||||
|
|
||||||
width = right - left;
|
width = right - left;
|
||||||
height = bottom - top;
|
height = bottom - top;
|
||||||
if (width < 0 || height < 0)
|
if (width < 0 || height < 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
sint32 skipX = left - x;
|
sint32 skipX = left - x;
|
||||||
sint32 skipY = top - y;
|
sint32 skipY = top - y;
|
||||||
|
|
||||||
uint8 *maskSrc = imgMask->offset + (skipY * imgMask->width) + skipX;
|
uint8 *maskSrc = imgMask->offset + (skipY * imgMask->width) + skipX;
|
||||||
uint8 *colourSrc = imgColour->offset + (skipY * imgColour->width) + skipX;
|
uint8 *colourSrc = imgColour->offset + (skipY * imgColour->width) + skipX;
|
||||||
uint8 *dst = dpi->bits + (left - dpi->x) + ((top - dpi->y) * (dpi->width + dpi->pitch));
|
uint8 *dst = dpi->bits + (left - dpi->x) + ((top - dpi->y) * (dpi->width + dpi->pitch));
|
||||||
|
|
||||||
sint32 maskWrap = imgMask->width - width;
|
sint32 maskWrap = imgMask->width - width;
|
||||||
sint32 colourWrap = imgColour->width - width;
|
sint32 colourWrap = imgColour->width - width;
|
||||||
sint32 dstWrap = ((dpi->width + dpi->pitch) - width);
|
sint32 dstWrap = ((dpi->width + dpi->pitch) - width);
|
||||||
for (sint32 yy = top; yy < bottom; yy++) {
|
for (sint32 yy = top; yy < bottom; yy++) {
|
||||||
for (sint32 xx = left; xx < right; xx++) {
|
for (sint32 xx = left; xx < right; xx++) {
|
||||||
uint8 colour = (*colourSrc) & (*maskSrc);
|
uint8 colour = (*colourSrc) & (*maskSrc);
|
||||||
if (colour != 0) {
|
if (colour != 0) {
|
||||||
*dst = colour;
|
*dst = colour;
|
||||||
}
|
}
|
||||||
|
|
||||||
maskSrc++;
|
maskSrc++;
|
||||||
colourSrc++;
|
colourSrc++;
|
||||||
dst++;
|
dst++;
|
||||||
}
|
}
|
||||||
maskSrc += maskWrap;
|
maskSrc += maskWrap;
|
||||||
colourSrc += colourWrap;
|
colourSrc += colourWrap;
|
||||||
dst += dstWrap;
|
dst += dstWrap;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
rct_g1_element *gfx_get_g1_element(sint32 image_id) {
|
rct_g1_element *gfx_get_g1_element(sint32 image_id) {
|
||||||
if (image_id < SPR_G2_BEGIN) {
|
if (image_id < SPR_G2_BEGIN) {
|
||||||
return &g1Elements[image_id];
|
return &g1Elements[image_id];
|
||||||
}
|
}
|
||||||
if (image_id < SPR_CSG_BEGIN) {
|
if (image_id < SPR_CSG_BEGIN) {
|
||||||
return &g2.elements[image_id - SPR_G2_BEGIN];
|
return &g2.elements[image_id - SPR_G2_BEGIN];
|
||||||
}
|
}
|
||||||
return &csg.elements[image_id - SPR_CSG_BEGIN];
|
return &csg.elements[image_id - SPR_CSG_BEGIN];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue