Rev 18 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 18 | Rev 20 | ||
|---|---|---|---|
| Line 1... | Line 1... | ||
| 1 | #include "flicplay.h" |
1 | #include "flicplay.h" |
| 2 | #include "brender.h" |
2 | #include "brender/brender.h" |
| 3 | #include "displays.h" |
3 | #include "displays.h" |
| 4 | #include "drmem.h" |
4 | #include "drmem.h" |
| 5 | #include "errors.h" |
5 | #include "errors.h" |
| 6 | #include "globvars.h" |
6 | #include "globvars.h" |
| 7 | #include "graphics.h" |
7 | #include "graphics.h" |
| Line 734... | Line 734... | ||
| 734 | MemSkipBytes(&pFlic_info->data, 2); |
734 | MemSkipBytes(&pFlic_info->data, 2); |
| 735 | claimed_speed = MemReadU16(&pFlic_info->data); |
735 | claimed_speed = MemReadU16(&pFlic_info->data); |
| 736 | MemSkipBytes(&pFlic_info->data, 0x6e); |
736 | MemSkipBytes(&pFlic_info->data, 0x6e); |
| 737 | pFlic_info->the_pixelmap = pDest_pixelmap; |
737 | pFlic_info->the_pixelmap = pDest_pixelmap; |
| 738 | 738 | ||
| 739 | if (pX_offset |
739 | if (pX_offset == -1) { |
| 740 | pFlic_info->x_offset = pX_offset; |
- | |
| 741 |
|
740 | if (pDest_pixelmap != NULL) { |
| 742 | pFlic_info->x_offset = (pDest_pixelmap->width - pFlic_info->width) / 2; |
741 | pFlic_info->x_offset = (pDest_pixelmap->width - pFlic_info->width) / 2; |
| - | 742 | } else { |
|
| - | 743 | pFlic_info->x_offset = 0; |
|
| - | 744 | } |
|
| 743 | } else { |
745 | } else { |
| 744 | pFlic_info->x_offset = |
746 | pFlic_info->x_offset = pX_offset; |
| 745 | } |
747 | } |
| 746 | if (pY_offset |
748 | if (pY_offset == -1) { |
| 747 | pFlic_info->y_offset = pY_offset; |
- | |
| 748 |
|
749 | if (pDest_pixelmap != NULL) { |
| 749 | pFlic_info->y_offset = (pDest_pixelmap->height - pFlic_info->height) / 2; |
750 | pFlic_info->y_offset = (pDest_pixelmap->height - pFlic_info->height) / 2; |
| - | 751 | } else { |
|
| - | 752 | pFlic_info->y_offset = 0; |
|
| - | 753 | } |
|
| 750 | } else { |
754 | } else { |
| 751 | pFlic_info->y_offset = |
755 | pFlic_info->y_offset = pY_offset; |
| 752 | } |
756 | } |
| 753 | 757 | ||
| 754 | if (pFrame_rate != 0) { |
758 | if (pFrame_rate != 0) { |
| 755 | pFlic_info->frame_period = 1000 / pFrame_rate; |
759 | pFlic_info->frame_period = 1000 / pFrame_rate; |
| 756 | } else { |
760 | } else { |