Merge with master

2018-12-20 22:53:08 +01:00
parent 7dcb614cca 6ef9671718
commit ecee02816d
323 changed files with 74857 additions and 128444 deletions
--- a/src/window.c
+++ b/src/window.c
@@ -674,7 +674,7 @@ void BlitBitmapRectToWindow4BitTo8Bit(u8 windowId, const u8 *pixels, u16 srcX, u
    struct Bitmap sourceRect;
    struct Bitmap destRect;

-    sourceRect.pixels = pixels;
+    sourceRect.pixels = (u8*) pixels;
    sourceRect.width = srcWidth;
    sourceRect.height = srcHeight;