diff options
Diffstat (limited to 'harddoomdev.c')
-rw-r--r-- | harddoomdev.c | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/harddoomdev.c b/harddoomdev.c index fc1f0e4..4a17001 100644 --- a/harddoomdev.c +++ b/harddoomdev.c @@ -194,68 +194,68 @@ void set_draw_params(struct doom_data *doom_data, uint8_t flags) } } -void fill_rect(struct surface_data *surface_data, struct doomdev_fill_rect rect) +void fill_rect(struct surface_data *surface_data, struct doomdev_fill_rect *rect) { set_surf_dst_pt(surface_data->doom_data, surface_data->page_table_dev); set_surf_dims(surface_data->doom_data, surface_data->width, surface_data->height); - set_xy_a(surface_data->doom_data, rect.pos_dst_x, rect.pos_dst_y); - set_fill_color(surface_data->doom_data, rect.color); + set_xy_a(surface_data->doom_data, rect->pos_dst_x, rect->pos_dst_y); + set_fill_color(surface_data->doom_data, rect->color); - send_command(surface_data->doom_data, HARDDOOM_CMD_FILL_RECT(rect.width, rect.height)); + send_command(surface_data->doom_data, HARDDOOM_CMD_FILL_RECT(rect->width, rect->height)); } -void draw_line(struct surface_data *surface_data, struct doomdev_line line) +void draw_line(struct surface_data *surface_data, struct doomdev_line *line) { set_surf_dst_pt(surface_data->doom_data, surface_data->page_table_dev); set_surf_dims(surface_data->doom_data, surface_data->width, surface_data->height); - set_xy_a(surface_data->doom_data, line.pos_a_x, line.pos_a_y); - set_xy_b(surface_data->doom_data, line.pos_b_x, line.pos_b_y); - set_fill_color(surface_data->doom_data, line.color); + set_xy_a(surface_data->doom_data, line->pos_a_x, line->pos_a_y); + set_xy_b(surface_data->doom_data, line->pos_b_x, line->pos_b_y); + set_fill_color(surface_data->doom_data, line->color); send_command(surface_data->doom_data, HARDDOOM_CMD_DRAW_LINE); } void copy_rect(struct surface_data *dst_data, struct surface_data *src_data, - struct doomdev_copy_rect rect) + struct doomdev_copy_rect *rect) { set_surf_dst_pt(dst_data->doom_data, dst_data->page_table_dev); set_surf_src_pt(dst_data->doom_data, src_data->page_table_dev); set_surf_dims(dst_data->doom_data, dst_data->width, dst_data->height); - set_xy_a(dst_data->doom_data, rect.pos_dst_x, rect.pos_dst_y); - set_xy_b(dst_data->doom_data, rect.pos_src_x, rect.pos_src_y); + set_xy_a(dst_data->doom_data, rect->pos_dst_x, rect->pos_dst_y); + set_xy_b(dst_data->doom_data, rect->pos_src_x, rect->pos_src_y); - send_command(dst_data->doom_data, HARDDOOM_CMD_COPY_RECT(rect.width, rect.height)); + send_command(dst_data->doom_data, HARDDOOM_CMD_COPY_RECT(rect->width, rect->height)); } void draw_column(struct surface_data *surface_data, - struct texture_data *texture_data, struct doomdev_column column, + struct texture_data *texture_data, struct doomdev_column *column, struct colors_data *colors_data, struct colors_data *trans_data, uint8_t flags, uint8_t trans_idx) { uint16_t y1, y2; - y1 = min(column.y1, column.y2); - y2 = max(column.y1, column.y2); + y1 = min(column->y1, column->y2); + y2 = max(column->y1, column->y2); set_surf_dst_pt(surface_data->doom_data, surface_data->page_table_dev); set_surf_dims(surface_data->doom_data, surface_data->width, surface_data->height); set_draw_params(surface_data->doom_data, flags); - set_xy_a(surface_data->doom_data, column.x, y1); - set_xy_b(surface_data->doom_data, column.x, y2); + set_xy_a(surface_data->doom_data, column->x, y1); + set_xy_b(surface_data->doom_data, column->x, y2); if (!(flags & HARDDOOM_DRAW_PARAMS_FUZZ)) { set_texture_pt(surface_data->doom_data, texture_data->page_table_dev); set_texture_dims(surface_data->doom_data, texture_data->size, texture_data->height); - set_ustart(surface_data->doom_data, column.ustart); - set_ustep(surface_data->doom_data, column.ustep); + set_ustart(surface_data->doom_data, column->ustart); + set_ustep(surface_data->doom_data, column->ustep); } if (flags & HARDDOOM_DRAW_PARAMS_FUZZ || flags & HARDDOOM_DRAW_PARAMS_COLORMAP) { set_colormap(surface_data->doom_data, colors_data->colors_dev + - HARDDOOM_COLORMAP_SIZE * column.colormap_idx); + HARDDOOM_COLORMAP_SIZE * column->colormap_idx); } if (flags & HARDDOOM_DRAW_PARAMS_TRANSLATE) { @@ -264,27 +264,27 @@ void draw_column(struct surface_data *surface_data, } send_command(surface_data->doom_data, - HARDDOOM_CMD_DRAW_COLUMN(column.texture_offset)); + HARDDOOM_CMD_DRAW_COLUMN(column->texture_offset)); } void draw_span(struct surface_data *surface_data, struct flat_data *flat_data, - struct doomdev_span span) + struct doomdev_span *span) { uint16_t x1, x2; - x1 = min(span.x1, span.x2); - x2 = max(span.x1, span.x2); + x1 = min(span->x1, span->x2); + x2 = max(span->x1, span->x2); set_surf_dst_pt(surface_data->doom_data, surface_data->page_table_dev); set_surf_dims(surface_data->doom_data, surface_data->width, surface_data->height); set_flat(surface_data->doom_data, flat_data->flat_dev); - set_xy_a(surface_data->doom_data, x1, span.y); - set_xy_b(surface_data->doom_data, x2, span.y); - set_ustart(surface_data->doom_data, span.ustart); - set_ustep(surface_data->doom_data, span.ustep); - set_vstart(surface_data->doom_data, span.vstart); - set_vstep(surface_data->doom_data, span.vstep); + set_xy_a(surface_data->doom_data, x1, span->y); + set_xy_b(surface_data->doom_data, x2, span->y); + set_ustart(surface_data->doom_data, span->ustart); + set_ustep(surface_data->doom_data, span->ustep); + set_vstart(surface_data->doom_data, span->vstart); + set_vstep(surface_data->doom_data, span->vstep); set_draw_params(surface_data->doom_data, 0); send_command(surface_data->doom_data, HARDDOOM_CMD_DRAW_SPAN); |