- unsigned char *dst = buf + dsty * 800*4 + (x + xpos + slot->bitmap_left)*4;
- unsigned char *src = bm->buffer + y * bm->width;
+ unsigned char *dst = buf + dsty * screen_width*4 + (x + xpos + slot->bitmap_left)*4;
+#if SCREEN_LCD
+ unsigned char *src = bm->buffer + y * bm->pitch;
+ int width = (x + xpos + slot->bitmap_left + bm->width/3 >= signed(screen_width)) ? ((screen_width-1) - x - xpos - slot->bitmap_left) : bm->width/3;
+#else
+ unsigned char *src = bm->buffer + y * bm->pitch;
+ int width = (x + xpos + slot->bitmap_left + bm->width >= signed(screen_width)) ? ((screen_width-1) - x - xpos - slot->bitmap_left) : bm->width;
+#endif