Add iRTG implementation for BlitTemplate, clean up BlitTemplate RTG code

[pistorm] / platforms / amiga / rtg / rtg.h

diff --git a/platforms/amiga/rtg/rtg.h b/platforms/amiga/rtg/rtg.h
index 51ef2b955d64993a630ad0330a64d2a5cf815844..5875e1418578898ce8ae0c79aa55ff9199cc7d47 100644 (file)
--- a/platforms/amiga/rtg/rtg.h
+++ b/platforms/amiga/rtg/rtg.h
@@ -56,11 +56,14 @@ void rtg_p2d (int16_t sx, int16_t sy, int16_t dx, int16_t dy, int16_t w, int16_t
        dptr += pitch;
 
 #define TEMPLATE_LOOPX \
-    tmpl_x++; \
-    cur_byte = (invert) ? sptr[tmpl_x] ^ 0xFF : sptr[tmpl_x]; \
+    if (sptr)   { cur_byte = sptr[tmpl_x]; } \
+    else        { cur_byte = ps_read_8(src_addr + tmpl_x); } \
+    if (invert) { cur_byte ^= 0xFF; } \
+    tmpl_x++;
 
 #define TEMPLATE_LOOPY \
     sptr += t_pitch; \
+    src_addr += t_pitch; \
     dptr += pitch; \
     tmpl_x = offset_x / 8; \
     cur_bit = base_bit;