mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: [OSX] Replace #define with modern code.

pull/8672/head
Michael Lutz 2021-02-11 22:54:43 +01:00
parent 88f6c7a9f3
commit 13134f9d64
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/video/cocoa/cocoa_v.h
View File

@ -32,9 +32,10 @@ private:
void *pixel_buffer; ///< used for direct pixel access void *pixel_buffer; ///< used for direct pixel access
void *window_buffer; ///< Colour translation from palette to screen void *window_buffer; ///< Colour translation from palette to screen
# define MAX_DIRTY_RECTS 100 static const int MAX_DIRTY_RECTS = 100;
Rect dirty_rects[MAX_DIRTY_RECTS]; ///< dirty rectangles Rect dirty_rects[MAX_DIRTY_RECTS]; ///< dirty rectangles
int num_dirty_rects = MAX_DIRTY_RECTS; ///< Number of dirty rectangles uint num_dirty_rects; ///< Number of dirty rectangles
uint32 palette[256]; ///< Colour Palette uint32 palette[256]; ///< Colour Palette
public: public:

12
src/video/cocoa/cocoa_v.mm
View File

@ -92,7 +92,7 @@ VideoDriver_Cocoa::VideoDriver_Cocoa()
this->color_space = nullptr; this->color_space = nullptr;
this->cgcontext = nullptr; this->cgcontext = nullptr;
this->num_dirty_rects = MAX_DIRTY_RECTS; this->num_dirty_rects = lengthof(this->dirty_rects);
} }
/** /**
@ -164,7 +164,7 @@ const char *VideoDriver_Cocoa::Start(const StringList &parm)
*/ */
void VideoDriver_Cocoa::MakeDirty(int left, int top, int width, int height) void VideoDriver_Cocoa::MakeDirty(int left, int top, int width, int height)
{ {
if (this->num_dirty_rects < MAX_DIRTY_RECTS) { if (this->num_dirty_rects < lengthof(this->dirty_rects)) {
dirty_rects[this->num_dirty_rects].left = left; dirty_rects[this->num_dirty_rects].left = left;
dirty_rects[this->num_dirty_rects].top = top; dirty_rects[this->num_dirty_rects].top = top;
dirty_rects[this->num_dirty_rects].right = left + width; dirty_rects[this->num_dirty_rects].right = left + width;
@ -539,7 +539,7 @@ void VideoDriver_Cocoa::Draw(bool force_update)
/* Check if we need to do anything */ /* Check if we need to do anything */
if (this->num_dirty_rects == 0 || [ this->window isMiniaturized ]) return; if (this->num_dirty_rects == 0 || [ this->window isMiniaturized ]) return;
if (this->num_dirty_rects >= MAX_DIRTY_RECTS) { if (this->num_dirty_rects >= lengthof(this->dirty_rects)) {
this->num_dirty_rects = 1; this->num_dirty_rects = 1;
this->dirty_rects[0].left = 0; this->dirty_rects[0].left = 0;
this->dirty_rects[0].top = 0; this->dirty_rects[0].top = 0;
@ -548,7 +548,7 @@ void VideoDriver_Cocoa::Draw(bool force_update)
} }
/* Build the region of dirty rectangles */ /* Build the region of dirty rectangles */
for (int i = 0; i < this->num_dirty_rects; i++) { for (uint i = 0; i < this->num_dirty_rects; i++) {
/* We only need to blit in indexed mode since in 32bpp mode the game draws directly to the image. */ /* We only need to blit in indexed mode since in 32bpp mode the game draws directly to the image. */
if (this->buffer_depth == 8) { if (this->buffer_depth == 8) {
BlitIndexedToView32( BlitIndexedToView32(
@ -586,7 +586,7 @@ void VideoDriver_Cocoa::UpdatePalette(uint first_color, uint num_colors)
this->palette[i] = clr; this->palette[i] = clr;
} }
this->num_dirty_rects = MAX_DIRTY_RECTS; this->num_dirty_rects = lengthof(this->dirty_rects);
} }
bool VideoDriver_Cocoa::ChangeResolution(int w, int h, int bpp) bool VideoDriver_Cocoa::ChangeResolution(int w, int h, int bpp)
@ -692,7 +692,7 @@ bool VideoDriver_Cocoa::WindowResized()
this->GameSizeChanged(); this->GameSizeChanged();
/* Redraw screen */ /* Redraw screen */
this->num_dirty_rects = MAX_DIRTY_RECTS; this->num_dirty_rects = lengthof(this->dirty_rects);
return true; return true;
} }