summaryrefslogtreecommitdiff
blob: f06a2ac2a0db1b2d939b414e795f77fd51a24017 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
Bug: https://bugs.gentoo.org/show_bug.cgi?id=610974
Commit: https://github.com/brunonymous/tecnoballz/commit/29c5f137555897c8fb73b4780295524b214b24a2

--- a/include/tiles_background.h
+++ b/include/tiles_background.h
@@ -47,7 +47,7 @@
     static tiles_background* tiles_background_singleton;
     static Sint32 table_pos1[16];
     static Sint32 table_pos2[16];
-    static char couleurs[448];
+    static unsigned char couleurs[448];
     static const Sint32 TILES_32_WIDTH = 32;
     static const Sint32 TILES_32_HEIGHT = 32;
     static const Sint32 TILES_64_WIDTH = 64;
@@ -63,7 +63,7 @@
      * or TILES_32x32_WITH_4_COLORS */
     Uint32 type_of_tiles;
     /** 4 color palette index */
-    Uint32 palette_index;
+    Sint32 palette_index;
 
     bitmap_data *current_tiles;
     Uint32 *map_tiles;
--- a/src/tiles_background.cc
+++ b/src/tiles_background.cc
@@ -663,8 +663,8 @@
 
     }
   palette_index = pal_index;
-  char *color = &couleurs[0];
-  unsigned char *colPT = (unsigned char *) (color) + pal_index;
+  unsigned char *color = &couleurs[0];
+  unsigned char *colPT = (color) + pal_index;
   SDL_Color *pal = display->get_palette ();
   SDL_Color *lighted = pal + 1;
   SDL_Color *dark = lighted + 128;
@@ -702,7 +702,7 @@
  * 4 * 4    : 16 composantes by palette
  * 112 * 4  : 448 composantes
 */
-char
+unsigned char
 tiles_background::couleurs[448] = {
                                     0x00, 0x40, 0x20, 0x40, 0x00, 0x60, 0x40, 0x60, 0x00, 0x80, 0x60, 0x80,
                                     0x00, 0xA0, 0x80, 0xA0, 0x00, 0x00, 0x20, 0x40, 0x00, 0x20,