aboutsummaryrefslogtreecommitdiff
path: root/sky/screen.cpp
diff options
context:
space:
mode:
authorMax Horn2003-03-06 02:37:37 +0000
committerMax Horn2003-03-06 02:37:37 +0000
commit32b84fe2baa72e3bdf08ca8b0b215be9f12f6948 (patch)
tree20c08cd1924438cb7837262ec34e5d43be65d791 /sky/screen.cpp
parentb525feba246b69f8770365288fd5ac0e8c2dd925 (diff)
downloadscummvm-rg350-32b84fe2baa72e3bdf08ca8b0b215be9f12f6948.tar.gz
scummvm-rg350-32b84fe2baa72e3bdf08ca8b0b215be9f12f6948.tar.bz2
scummvm-rg350-32b84fe2baa72e3bdf08ca8b0b215be9f12f6948.zip
indention fixed
svn-id: r6704
Diffstat (limited to 'sky/screen.cpp')
-rw-r--r--sky/screen.cpp96
1 files changed, 48 insertions, 48 deletions
diff --git a/sky/screen.cpp b/sky/screen.cpp
index 81f3d29223..4cebc3fb63 100644
--- a/sky/screen.cpp
+++ b/sky/screen.cpp
@@ -8,7 +8,7 @@
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
@@ -25,73 +25,73 @@
#include "sky/skydefs.h"
#include "sky/sky.h"
-#define fade_jump 2
-#define scroll_jump 16
+#define fade_jump 2
+#define scroll_jump 16
-#define vga_colours 256
-#define game_colours 240
+#define vga_colours 256
+#define game_colours 240
uint8 top_16_colours[] =
{
- 0, 0, 0,
- 38, 38, 38,
- 63, 63, 63,
- 0, 0, 0,
- 0, 0, 0,
- 0, 0, 0,
- 0, 0, 0,
- 54, 54, 54,
- 45, 47, 49,
- 32, 31, 41,
- 29, 23, 37,
- 23, 18, 30,
- 49, 11, 11,
- 39, 5, 5,
- 29, 1, 1,
- 63, 63, 63
+ 0, 0, 0,
+ 38, 38, 38,
+ 63, 63, 63,
+ 0, 0, 0,
+ 0, 0, 0,
+ 0, 0, 0,
+ 0, 0, 0,
+ 54, 54, 54,
+ 45, 47, 49,
+ 32, 31, 41,
+ 29, 23, 37,
+ 23, 18, 30,
+ 49, 11, 11,
+ 39, 5, 5,
+ 29, 1, 1,
+ 63, 63, 63
};
void SkyState::initialise_screen(void)
{
- int i;
- uint8 tmp_pal[1024];
-
- _system->init_size(full_screen_width, full_screen_height);
- _backscreen = (uint8 *)malloc(full_screen_width*full_screen_height);
- _game_grid = (uint8 *)malloc(GRID_X*GRID_Y*2);
- _work_palette = (uint8 *)malloc(vga_colours*3);
+ int i;
+ uint8 tmp_pal[1024];
+
+ _system->init_size(full_screen_width, full_screen_height);
+ _backscreen = (uint8 *)malloc(full_screen_width*full_screen_height);
+ _game_grid = (uint8 *)malloc(GRID_X*GRID_Y*2);
+ _work_palette = (uint8 *)malloc(vga_colours*3);
- //blank the first 240 colors of the palette
- memset(tmp_pal, 0, game_colours * 4);
+ //blank the first 240 colors of the palette
+ memset(tmp_pal, 0, game_colours * 4);
- //set the remaining colors
- for (i=0; i<(vga_colours-game_colours); i++) {
- tmp_pal[game_colours+i*4] = (top_16_colours[i*3] << 2) + (top_16_colours[i*3] & 3);
- tmp_pal[game_colours+i*4+1] = (top_16_colours[i*3+1] << 2) + (top_16_colours[i*3+1] & 3);
- tmp_pal[game_colours+i*4+2] = (top_16_colours[i*3+2] << 2) + (top_16_colours[i*3+2] & 3);
- tmp_pal[game_colours+i*4+3] = 0x00;
- }
+ //set the remaining colors
+ for (i = 0; i < (vga_colours-game_colours); i++) {
+ tmp_pal[game_colours+i*4] = (top_16_colours[i*3] << 2) + (top_16_colours[i*3] & 3);
+ tmp_pal[game_colours+i*4+1] = (top_16_colours[i*3+1] << 2) + (top_16_colours[i*3+1] & 3);
+ tmp_pal[game_colours+i*4+2] = (top_16_colours[i*3+2] << 2) + (top_16_colours[i*3+2] & 3);
+ tmp_pal[game_colours+i*4+3] = 0x00;
+ }
- //set the palette
- _system->set_palette(tmp_pal, 0, 256);
+ //set the palette
+ _system->set_palette(tmp_pal, 0, 256);
}
//set a new palette, pal is a pointer to dos vga rgb components 0..63
void SkyState::set_palette(uint8 *pal)
{
- convert_palette(pal, _palette);
- _system->set_palette(_palette, 0, 256);
+ convert_palette(pal, _palette);
+ _system->set_palette(_palette, 0, 256);
}
void SkyState::convert_palette(uint8 *inpal, uint8* outpal) //convert 3 byte 0..63 rgb to 4byte 0..255 rgbx
{
- int i;
+ int i;
- for (i = 0; i < vga_colours; i++) {
- outpal[4*i] = (inpal[3*i] << 2) + (inpal[3*i] & 3);
- outpal[4*i+1] = (inpal[3*i+1] << 2) + (inpal[3*i+1] & 3);
- outpal[4*i+2] = (inpal[3*i+2] << 2) + (inpal[3*i+2] & 3);
- outpal[4*i+3] = 0x00;
- }
+ for (i = 0; i < vga_colours; i++) {
+ outpal[4*i] = (inpal[3*i] << 2) + (inpal[3*i] & 3);
+ outpal[4*i+1] = (inpal[3*i+1] << 2) + (inpal[3*i+1] & 3);
+ outpal[4*i+2] = (inpal[3*i+2] << 2) + (inpal[3*i+2] & 3);
+ outpal[4*i+3] = 0x00;
+ }
}