dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r23446) -Codechange: move _cur_palette and it's related first/count dirty variables into a single structure

Browse Source
This commit is contained in:
rubidium
2011-12-08 18:13:29 +00:00
parent 1e38f50be1
commit a531ec1899
17 changed files with 80 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/os/macosx/osx_stdafx.h
View File

@@ -42,14 +42,17 @@
#define Rect OTTDRect
#define Point OTTDPoint
#define WindowClass OTTDWindowClass
#define ScriptOrder OTTDScriptOrder
#define ScriptOrder OTTDScriptOrder
#define Palette OTTDPalette
#include <CoreServices/CoreServices.h>
#include <ApplicationServices/ApplicationServices.h>
#undef Rect
#undef Point
#undef WindowClass
#undef ScriptOrder
#undef Palette
/* remove the variables that CoreServices defines, but we define ourselves too */
#undef bool

20
src/os/macosx/splash.cpp
View File

@@ -136,19 +136,19 @@ void DisplaySplashImage()
}
for (int i = 0; i < num_palette; i++) {
_cur_palette[i].a = i == 0 ? 0 : 0xff;
_cur_palette[i].r = palette[i].red;
_cur_palette[i].g = palette[i].green;
_cur_palette[i].b = palette[i].blue;
_cur_palette.palette[i].a = i == 0 ? 0 : 0xff;
_cur_palette.palette[i].r = palette[i].red;
_cur_palette.palette[i].g = palette[i].green;
_cur_palette.palette[i].b = palette[i].blue;
}
_cur_palette[0xff].a = 0xff;
_cur_palette[0xff].r = 0;
_cur_palette[0xff].g = 0;
_cur_palette[0xff].b = 0;
_cur_palette.palette[0xff].a = 0xff;
_cur_palette.palette[0xff].r = 0;
_cur_palette.palette[0xff].g = 0;
_cur_palette.palette[0xff].b = 0;
_pal_first_dirty = 0;
_pal_count_dirty = 256;
_cur_palette.first_dirty = 0;
_cur_palette.count_dirty = 256;
break;
}
case 32: {