// Now with VESA2 support!
// Also, support routines for video hardware emulation are included
//
-// by James L. Hammons
+// by James Hammons
//
// (C) 2003 Underground Software
//
-// JLH = James L. Hammons <jlhamm@acm.org>
+// JLH = James Hammons <jlhamm@acm.org>
//
// Who When What
-// --- ---------- ------------------------------------------------------------
-// JLH 03/12/2003 Ported this crud to Simple Directmedia Layer
+// --- ---------- -----------------------------------------------------------
+// JLH 03/12/2003 Ported this steaming pile of crap from VESA to SDL
//
#include "screen.h"
#include <stdlib.h>
#include <string> // For memset()
#include "gui.h"
+#include "video.h"
// Private function prototypes
-void DrawSprites(uint8 priority);
+void DrawSprites(uint8_t priority);
int FindPCXName(void);
+//static void DrawChar(uint8_t * chr, uint8_t * ram, uint8_t sx, uint8_t sy, uint16_t scp, uint32_t baseAddr, uint32_t scrollOffset, bool transparent = true);
+static void DrawChar(uint8_t * chr, uint8_t * ram, uint8_t sx, uint8_t sy, uint16_t scp, uint32_t baseAddr, uint32_t xScroll = 0, uint32_t yScroll = 0, bool transparent = true);
+void Sprite(uint32_t sprnum, uint16_t x, uint16_t y, uint8_t flip, uint8_t horiz_bl, uint8_t vert_bl);
// Private global variables
-uint8 my_scr[0x14000]; // Screen buffer...
-uint8 palette[768]; // Screen palette
-uint8 ccolor[256][8]; // Character colors
-uint8 scolor[128][16]; // Sprite colors
-bool charbase; // Character base pointer...
-uint8 hScrollOffset; // Horizontal scroll offset
-uint8 vScrollOffset; // Vertical scroll offset
-uint8 spr_color_index; // Sprite color index
-uint32 offsets[8] = { 0, 1, 2, 3, 4, 5, 6, 7 }; // Scroll offsets...
-uint32 voffsets[8] = { 0, 320, 640, 960, 1280, 1600, 1920, 2240 };
+uint8_t my_scr[0x14000]; // Screen buffer...
+//uint8_t palette[768]; // Screen palette
+uint32_t palette[256]; // Screen palette
+uint8_t ccolor[256][8]; // Character colors
+uint8_t scolor[128][16]; // Sprite colors
+bool charbase; // Character base pointer...
+uint8_t hScrollOffset; // Horizontal scroll offset
+uint8_t vScrollOffset; // Vertical scroll offset
+uint8_t spr_color_index; // Sprite color index
+uint32_t hoffsets[8] = { 0, 1, 2, 3, 4, 5, 6, 7 };// Scroll offsets...
+//uint32_t voffsets[8] = { 0, 320, 640, 960, 1280, 1600, 1920, 2240 };
+uint32_t voffsets[8] = { 288*0, 288*1, 288*2, 288*3, 288*4, 288*5, 288*6, 288*7 };
+//n.b.: 320 = $140
+// $000, $140, $280, $3C0, $500, $640, $780, $8C0
+
+extern bool show_text; // Whether or not to show text
+extern bool show_scr; // Whether or not to show screen
-extern bool show_text; // Whether or not to show text
-extern bool show_scr; // Whether or not to show screen
//
// Render the NAMCO screen
//
-void BlitChar(SDL_Surface * scr, uint8 * chr, uint8 * ram)
+void BlitChar(SDL_Surface * scr, uint8_t * chr, uint8_t * ram)
{
+ // Screen structure:
+ // Screen is 288 x 224 pixels, with character and independent sprites.
+ // Tiles are 36 x 28. There are four tile planes, three of them affected by
+ // the h/vscroll values, the last one is a static display (also has highest
+ // priority). Screens are 128 bytes wide by 32 bytes high.
+
if (show_scr)
{
- int sx, sy;
- uint32 sc_base = ((ram[0x9000] << 8) | ram[0x9001]) + 4; // Adjust hscroll val
- hScrollOffset = sc_base & 0x07; // Horiz. scroll offset
- sc_base = (sc_base & 0xFFF8) >> 2; // Skip odds..
- uint8 vsc_base = ((ram[0x9002] + 1) & 0xF8) >> 3;// Vertical scroll addr adjust
- vScrollOffset = ((ram[0x9002] + 1) & 0x07); // Vertical fine scroll amount
- uint32 scp1 = 0x0180 | ((sc_base + 0x04) & 0x7F); /*0x0188;*/
- uint32 scp2 = 0x1180 | ((sc_base + 0x04) & 0x7F); /*0x1188;*/
- uint32 scp3 = 0x2180 | ((sc_base + 0x04) & 0x7F); /*0x2188;*/
- uint32 scp = 0x3208;
+ uint32_t sc_base = ((ram[0x9000] << 8) | ram[0x9001]) + 4; // Adjust hscroll val
+ hScrollOffset = sc_base & 0x07; // Horiz. fine scroll offset
+ sc_base = (sc_base & 0xFFF8) >> 2; // Skip odds..
+ uint8_t vsc_base = ((ram[0x9002] + 1) & 0xF8) >> 3;// Vertical scroll addr adjust
+ vScrollOffset = ((ram[0x9002] + 1) & 0x07); // Vertical fine scroll amount
+
+ uint32_t scp0 = 0x0180 | ((sc_base + 0x04) & 0x7F); /*0x0188;*/
+ uint32_t scp1 = 0x1180 | ((sc_base + 0x04) & 0x7F); /*0x1188;*/
+ uint32_t scp2 = 0x2180 | ((sc_base + 0x04) & 0x7F); /*0x2188;*/
+ uint32_t scp3 = 0x3208;
+
+ scp0 += vsc_base * 0x80;
+ scp0 &= 0x0FFF; // Set vertical scroll addr
scp1 += vsc_base * 0x80;
- scp1 &= 0x0FFF; // Set vertical scroll addr
+ scp1 = 0x1000 | (scp1 & 0x0FFF); // Set vertical scroll addr
scp2 += vsc_base * 0x80;
- scp2 = 0x1000 | (scp2 & 0x0FFF); // Set vertical scroll addr
- scp3 += vsc_base * 0x80;
- scp3 = 0x2000 | (scp3 & 0x0FFF); // Set vertical scroll addr
-
- uint32 chBaseOffset = (charbase ? 0x20000 : 0x00000);
+ scp2 = 0x2000 | (scp2 & 0x0FFF); // Set vertical scroll addr
- for(sy=0; sy<29; sy++)
+ // Layer 0 (bottom layer)
+ for(uint8_t sy=0; sy<29; sy++)
{
- for(sx=0; sx<37; sx++)
- {
- uint8 scp_lo = (scp1 + (sx << 1)) & 0x7F;// Let LO byte wrap only...
- uint16 sp2 = (scp1 & 0xFF80) | scp_lo;
- uint8 tile = ram[sp2++];
- uint8 index = ram[sp2] & 0x03;
- uint8 color = ram[sp2];
- uint32 chind = chBaseOffset + (((index << 8) + tile) * 64);
- uint32 sc_addr = (sx * 8) + (sy * 2560); // Start addr in my_scr[]
-
- for(int y=0; y<8; y++)
- {
- for(int x=0; x<8; x++)
- my_scr[sc_addr++] = ccolor[color][chr[chind++]];
-
- sc_addr += 312; // Do next line...
- }
- }
-
- scp1 += 0x80;
- scp1 = 0x0000 | (scp1 & 0x0FFF);
+ for(uint8_t sx=0; sx<37; sx++)
+#if 0
+ DrawChar(chr, ram, sx, sy, scp0, (charbase ? 0x20000 : 0x00000), 0, false);
+#else
+ DrawChar(chr, ram, sx, sy, scp0, (charbase ? 0x20000 : 0x00000), hScrollOffset, vScrollOffset, false);
+#endif
+
+ scp0 += 0x80;
+ scp0 = 0x0000 | (scp0 & 0x0FFF);
}
- DrawSprites(0x40); // Draw sprites at lowest layer...
+ // Draw sprites at lowest layer...
+ DrawSprites(0x40);
- chBaseOffset = (charbase ? 0x30000 : 0x10000);
-
- for(sy=0; sy<29; sy++)
+ // Layer 1
+ for(uint8_t sy=0; sy<29; sy++)
{
- for(sx=0; sx<37; sx++)
- {
- uint8 scp_lo = (scp2 + (sx << 1)) & 0x7F; // Let LO byte wrap only...
- uint16 sp2 = (scp2 & 0xFF80) | scp_lo;
- uint8 tile = ram[sp2++];
- uint8 index = ram[sp2] & 0x03;
- uint8 color = ram[sp2];
- uint32 chind = chBaseOffset + (((index << 8) + tile) * 64);
- uint32 sc_addr = (sx * 8) + (sy * 2560); // Start addr in my_scr[]
-
- for(int y=0; y<8; y++)
- {
- for(int x=0; x<8; x++)
- {
- if (chr[chind] != 7)
- my_scr[sc_addr] = ccolor[color][chr[chind]];
-
- sc_addr++;
- chind++;
- }
-
- sc_addr += 312; // Do next line...
- }
- }
+ for(uint8_t sx=0; sx<37; sx++)
+#if 0
+ DrawChar(chr, ram, sx, sy, scp1, (charbase ? 0x30000 : 0x10000), 0);
+#else
+ DrawChar(chr, ram, sx, sy, scp1, (charbase ? 0x30000 : 0x10000), hScrollOffset, vScrollOffset);
+#endif
- scp2 += 0x80;
- scp2 = 0x1000 | (scp2 & 0x0FFF);
+ scp1 += 0x80;
+ scp1 = 0x1000 | (scp1 & 0x0FFF);
}
- DrawSprites(0x80); // Draw sprites under layer #2...
+ // Draw sprites under layer #2...
+ DrawSprites(0x80);
- for(sy=0; sy<29; sy++)
+ // Layer 2
+ for(uint8_t sy=0; sy<29; sy++)
{
- for(sx=0; sx<37; sx++)
- {
- uint8 scp_lo = (scp3 + (sx << 1)) & 0x7F; // Let LO byte wrap only...
- uint16 sp2 = (scp3 & 0xFF80) | scp_lo;
- uint8 tile = ram[sp2++];
- uint8 index = ram[sp2] & 0x03;
- uint8 color = ram[sp2];
- uint32 chind = 0x40000 + (((index << 8) + tile) * 64);
- uint32 sc_addr = (sx * 8) + (sy * 2560); // Start addr in my_scr[]
-
- for(int y=0; y<8; y++)
- {
- for(int x=0; x<8; x++)
- {
- if (chr[chind] != 7)
- my_scr[sc_addr] = ccolor[color][chr[chind]];
+ for(uint8_t sx=0; sx<37; sx++)
+#if 0
+ DrawChar(chr, ram, sx, sy, scp2, 0x40000, 0);
+#else
+ DrawChar(chr, ram, sx, sy, scp2, 0x40000, hScrollOffset, vScrollOffset);
+#endif
- sc_addr++;
- chind++;
- }
-
- sc_addr += 312; // Do next line...
- }
- }
-
- scp3 += 0x80; scp3 = 0x2000|(scp3&0x0FFF);
+ scp2 += 0x80;
+ scp2 = 0x2000 | (scp2 & 0x0FFF);
}
- DrawSprites(0xC0); // Draw highest priority sprites...
+ // Draw highest priority sprites...
+ DrawSprites(0xC0);
- for(sy=0; sy<28; sy++)
+ // Layer 3 (top layer)
+ for(uint8_t sy=0; sy<28; sy++)
{
- for(sx=0; sx<36; sx++)
- {
- uint16 sp2 = scp + (sx << 1);
- uint8 tile = ram[sp2++];
- uint8 index = ram[sp2] & 0x03;
- uint8 color = ram[sp2];
- uint32 chind = 0x50000 + (((index << 8) + tile) * 64);
- uint32 sc_addr = (sx * 8) + (sy * 2560) + hScrollOffset + voffsets[vScrollOffset]; // Start addr in my_scr[]
-
- for(int y=0; y<8; y++)
- {
- for(int x=0; x<8; x++)
- {
- if (chr[chind] != 7)
- my_scr[sc_addr] = ccolor[color][chr[chind]];
-
- sc_addr++;
- chind++;
- }
-
- sc_addr += 312; // Do next line of char...
- }
- }
-
- scp += 0x80;
+ for(uint8_t sx=0; sx<36; sx++)
+#if 0
+ DrawChar(chr, ram, sx, sy, scp3, 0x50000, hScrollOffset + voffsets[vScrollOffset]);
+#else
+ DrawChar(chr, ram, sx, sy, scp3, 0x50000);
+#endif
+
+ scp3 += 0x80;
}
}
+ // Draw a msg if needed...
if (show_text)
- DrawText(); // Draw a msg if needed...
+ DrawText();
+ // Show GUI if active...
if (ShowGUI())
- DrawGUI(); // Show GUI if active...
+ DrawGUI();
+#if 0
if (SDL_LockSurface(scr) < 0)
{
// fprintf(stderr, "Couldn't lock the display surface: %s\n", SDL_GetError());
// exit(2);
}
+#endif
- // Screen size is 288 x 224
+ // Rolling Thunder screen size is 288 x 224. Virtual is this, real may not be...
- // Fast blit
-/* for(int i=0; i<224; i++)
- {
- memcpy((char *)scr->pixels + scr->pitch * i,
- my_scr + (uint32)(offsets[hScrollOffset]+voffsets[vScrollOffset]) + i * 320, 320);
- }//*/
+ uint32_t src = 0;//(uint32_t)(hoffsets[hScrollOffset] + voffsets[vScrollOffset]);
+// uint32_t srcAdd = 320 - VIRTUAL_SCREEN_WIDTH;
- // Doubled pixel blit (should be faster now!)
- uint8 * pMem = (uint8 *)scr->pixels + ((scr->pitch * 8 + 16) * 2);
- uint32 src = (uint32)(offsets[hScrollOffset] + voffsets[vScrollOffset]),
- dst1 = 0, dst2 = scr->pitch;
- uint32 srcAdd = 320 - 288, dstAdd = (scr->pitch * 2) - (288 * 2);
-
- for(int i=0; i<224; i++)
+ for(int i=0; i<VIRTUAL_SCREEN_HEIGHT; i++)
{
- for (int j=0; j<288; j++)
+ for (int j=0; j<VIRTUAL_SCREEN_WIDTH; j++)
{
- pMem[dst1] = pMem[dst1 + 1] = pMem[dst2] = pMem[dst2 + 1] = my_scr[src++];
- dst1 += 2;
- dst2 += 2;
+ scrBuffer[(i * VIRTUAL_SCREEN_WIDTH) + j] = palette[my_scr[src++]];
}
- src += srcAdd;
- dst1 += dstAdd;
- dst2 += dstAdd;
- }//*/
+// src += srcAdd;
+ }
- // Scanlined pixel blit
-/* uint8 * pMem = (uint8 *)scr->pixels + ((scr->pitch * 8 + 16) * 2);
- uint32 src = (uint32)(offsets[hScrollOffset] + voffsets[vScrollOffset]),
- dst1 = 0, dst2 = scr->pitch;
- uint32 srcAdd = 320 - 288, dstAdd = (scr->pitch * 2) - (288 * 2);
+ RenderScreenBuffer();
+}
- for(int i=0; i<224; i++)
+
+//
+// Draw character on screen
+//
+//static inline void DrawChar(uint8_t * chr, uint8_t * ram, uint8_t sx, uint8_t sy, uint16_t scp, uint32_t baseAddr, uint32_t scrollOffset, bool transparent/*= true*/)
+static inline void DrawChar(uint8_t * chr, uint8_t * ram, uint8_t sx, uint8_t sy, uint16_t scp, uint32_t baseAddr, uint32_t xScroll/*= 0*/, uint32_t yScroll/*= 0*/, bool transparent/*= true*/)
+{
+ uint8_t scp_lo = (scp + (sx << 1)) & 0x7F;// Let LO byte wrap only...
+ uint16_t sp2 = (scp & 0xFF80) | scp_lo;
+ uint8_t tile = ram[sp2++];
+ uint8_t index = ram[sp2] & 0x03;
+ uint8_t color = ram[sp2];
+ uint32_t chind = baseAddr + (((index << 8) + tile) * 64);
+// uint32_t sc_addr = (sx * 8) + (sy * 2560) + scrollOffset; // Start addr in my_scr[]
+// uint32_t sc_addr = (sx * 8) + (sy * 288 * 8);// + scrollOffset;
+
+ int xStart = (int)(sx * 8) - xScroll;
+ int yStart = (int)(sy * 8) - yScroll;
+
+// int32_t sc_addr = ((sx * 8) - xScroll) + ((sy * 8 * 288) - (yScroll * 288));
+ int32_t sc_addr = xStart + (yStart * 288);
+
+ for(int y=0; y<8; y++)
{
- for (int j=0; j<288; j++)
+ for(int x=0; x<8; x++)
{
- pMem[dst1] = pMem[dst1 + 1] = pMem[dst2] = my_scr[src++];
- dst1 += 2;
- dst2 += 2;
- }
+ if (((xStart + x) < 0) || ((xStart + x) >= 288)
+ || ((yStart + y) < 0) || ((yStart + y) >= 224))
+ {
+ sc_addr++;
+ chind++;
+ continue;
+ }
- src += srcAdd;
- dst1 += dstAdd;
- dst2 += dstAdd;
- }//*/
+ if (transparent)
+ {
+ if (chr[chind] != 7)
+ my_scr[sc_addr] = ccolor[color][chr[chind]];
+ }
+ else
+ my_scr[sc_addr] = ccolor[color][chr[chind]];
- SDL_UnlockSurface(scr);
- SDL_UpdateRect(scr, 0, 0, 0, 0);
+ sc_addr++;
+ chind++;
+ }
+
+ sc_addr += (288 - 8); // Do next line of char...
+ }
}
+
//
// Draw sprites at priority level (new code)
//
-void DrawSprites(uint8 priority)
+void DrawSprites(uint8_t priority)
{
- extern uint8 * gram1; // Game RAM space
-
- for(uint16 i=0x5800; i<0x6000; i+=0x10)
+// Sprite blocks:
+//
+// Offset Note
+// ------ --------------------------------------------------------------------
+// 4 h.fb .nnn (f = horz. flip, h = horz. expand, b = sprite offset lo
+// bit, nnn = upper bits of sprite #)
+// 5 Lower 7 bits of sprite #
+// 6 Sprite color index (top 7 bits only), bottom bit is bit 8 of X
+// position
+// 7 Sprite X position (bits 0-7)
+// 8 Top two bits are sprite priority, bits 4 & 2 are sprite offset hi
+// bit, vert. expand
+// 9 Sprite Y position (192 - value)
+
+ extern uint8_t gram1[]; // Game RAM space
+
+ for(uint16_t i=0x5800; i<0x6000; i+=0x10)
{
- if ((gram1[i + 8] & 0xC0) == priority) // Check for correct layer...
+ if ((gram1[i + 8] & 0xC0) == priority) // Check for correct layer...
{
- spr_color_index = gram1[i + 6] >> 1; // Set color...
- uint16 x = ((gram1[i + 6] & 0x01) << 8) | gram1[i + 7];
+ spr_color_index = gram1[i + 6] >> 1; // Set color...
+ uint16_t x = ((gram1[i + 6] & 0x01) << 8) | gram1[i + 7];
if (x > 512 - 32)
- x -= 512; // Handle neg x values
+ x -= 512; // Handle neg x values
- uint16 y = 192 - gram1[i + 9];
- uint16 hdr = (gram1[i + 4] & 0x90) << 8 | (gram1[i + 8] & 0x14);
- uint8 flip = gram1[i + 4] & 0x20; // Horizontal flip
- uint32 spr_num = ((gram1[i + 4] & 0x07) << 9) | ((gram1[i + 5] & 0x7F) << 2);
+ uint16_t y = 192 - gram1[i + 9];
+ uint8_t flip = gram1[i + 4] & 0x20; // Horizontal flip
+ uint32_t spr_num = ((gram1[i + 4] & 0x07) << 9)
+ | ((gram1[i + 5] & 0x7F) << 2)
+ | ((gram1[i + 4] & 0x10) >> 4)
+ | ((gram1[i + 8] & 0x10) >> 3);
- Sprite(spr_num, x, y, flip, hdr); // Draw sprite...
+ // Draw sprite...
+ Sprite(spr_num, x, y, flip, gram1[i + 4] & 0x80, gram1[i + 8] & 0x04);
}
}
}
-//
-// Sprite handler
-//
-void Sprite(uint32 sprnum, uint16 x, uint16 y, uint8 flip, uint16 spr_id)
-{
- extern uint8 * spr_rom;
- // To show or not to show a 16x16 block in the 4x4 grid...
- bool horiz_bl = false, vert_bl = false;
- uint32 sc_addr;
- x += hScrollOffset; // Adjust x-coord
- y += vScrollOffset; // Adjust y-coord
+static inline void DrawSpriteBlock(uint32_t & sprnum, uint16_t x, uint16_t y, uint16_t xStart, uint16_t xEnd, int16_t xInc)
+{
+ extern uint8_t spr_rom[];
+// uint32_t sc_addr;
- if (spr_id == 0x8004)
- {
- horiz_bl = true; vert_bl = true;
- }
- if (spr_id == 0x8000)
- {
- horiz_bl = true; y += 16;
- }
- if (spr_id == 0x8010)
- {
- horiz_bl = true; y += 16; sprnum += 2;
- }
- if (spr_id == 0x0004)
- {
- vert_bl = true;
- }
- if (spr_id == 0x1004)
- {
- vert_bl = true; sprnum++;
- }
- if (spr_id == 0x0000)
- {
- y += 16;
- }
- if (spr_id == 0x1000)
- {
- y += 16; sprnum++;
- }
- if (spr_id == 0x0010)
+ for(uint16_t sy=0; sy<16; sy++)
{
- y += 16; sprnum += 2;
+// for(uint16_t sx=0; sx<16; sx+=2)
+ for(uint16_t sx=xStart; sx<xEnd; sx+=xInc)
+ {
+ uint8_t b1 = spr_rom[sprnum] >> 4, b2 = spr_rom[sprnum++] & 0x0F;
+ uint16_t spy = y + sy, spx = x + sx; // Need to optimize this clipping! [eh?]
+
+ // This handles negative values, by casting as unsigned
+ uint32_t sc_addr = ((spy >= 224) || (spx >= 288) ? 0x13FFE : spx + (spy * 288));
+
+ if (b1 != 15)
+ my_scr[sc_addr] = scolor[spr_color_index][b1]; // Store it
+
+ sc_addr++;
+
+ if (b2 != 15)
+ my_scr[sc_addr] = scolor[spr_color_index][b2]; // Store it
+ }
}
- if (spr_id == 0x1010)
+}
+
+
+static inline void DrawSpriteBlock2(uint32_t & sprnum, uint16_t x, uint16_t y, uint16_t xStart, uint16_t xEnd, int16_t xInc)
+{
+ extern uint8_t spr_rom[];
+// uint32_t sc_addr;
+
+ for(uint16_t sy=0; sy<16; sy++)
{
- y += 16; sprnum += 3;
+// for(uint16_t sx=0; sx<16; sx+=2)
+ for(uint16_t sx=xStart; sx!=xEnd; sx+=xInc)
+ {
+ uint8_t b1 = spr_rom[sprnum] >> 4, b2 = spr_rom[sprnum++] & 0x0F;
+ uint16_t spy = y + sy, spx = x + sx; // Need to optimize this clipping! [eh?]
+
+ // This handles negative values, by casting as unsigned
+ uint32_t sc_addr = ((spy >= 224) || (spx >= 288) ? 0x13FFE : spx + (spy * 288));
+
+ if (b2 != 15)
+ my_scr[sc_addr] = scolor[spr_color_index][b2]; // Store it
+
+ sc_addr++;
+
+ if (b1 != 15)
+ my_scr[sc_addr] = scolor[spr_color_index][b1]; // Store it
+ }
}
+}
+
- sprnum <<= 7; // 128 bytes per sprite
+//
+// Sprite handler
+//
+void Sprite(uint32_t sprnum, uint16_t x, uint16_t y, uint8_t flip,
+ uint8_t horiz_bl, uint8_t vert_bl)
+{
+ extern uint8_t spr_rom[];
+ uint32_t sc_addr;
+ sprnum <<= 7; // 128 bytes per sprite
+
+ if (!vert_bl)
+ y += 16;
if (!flip)
{
- for(uint16 sy=0; sy<16; sy++)
+#if 0
+ for(uint16_t sy=0; sy<16; sy++)
{
- for(uint16 sx=0; sx<16; sx+=2)
+ for(uint16_t sx=0; sx<16; sx+=2)
{
- uint8 b1 = spr_rom[sprnum] >> 4, b2 = spr_rom[sprnum++] & 0x0F;
- uint16 spy = y + sy, spx = x + sx; // Need to optimize this clipping!
+ uint8_t b1 = spr_rom[sprnum] >> 4, b2 = spr_rom[sprnum++] & 0x0F;
+ uint16_t spy = y + sy, spx = x + sx; // Need to optimize this clipping!
- if (spy > 223 || spx > 299)
+ // This handles negative values, by casting as unsigned
+#if 0
+// if (spy > 223 || spx > 299)
+ if (spy >= 224 || spx >= 288)
sc_addr = 0x13FFE;
else
- sc_addr = spx + spy * 320;
-
+// sc_addr = spx + spy * 320;
+ sc_addr = spx + (spy * 288);
+#else
+ sc_addr = ((spy >= 224) || (spx >= 288) ? 0x13FFE : spx + (spy * 288));
+#endif
if (b1 != 15)
my_scr[sc_addr] = scolor[spr_color_index][b1]; // Store it
my_scr[sc_addr] = scolor[spr_color_index][b2]; // Store it
}
}
+#else
+ DrawSpriteBlock(sprnum, x, y, 0, 16, 2);
+#endif
if (horiz_bl)
{
- for(uint16 sy=0; sy<16; sy++)
+#if 0
+ for(uint16_t sy=0; sy<16; sy++)
{
- for(uint16 sx=16; sx<32; sx+=2)
+ for(uint16_t sx=16; sx<32; sx+=2)
{
- uint8 b1 = spr_rom[sprnum] >> 4, b2 = spr_rom[sprnum++] & 0x0F;
- uint16 spy = y + sy, spx = x + sx;
+ uint8_t b1 = spr_rom[sprnum] >> 4, b2 = spr_rom[sprnum++] & 0x0F;
+ uint16_t spy = y + sy, spx = x + sx;
- if (spy > 223 || spx > 299)
+// if (spy > 223 || spx > 299)
+ if (spy > 223 || spx > 287)
sc_addr = 0x13FFE;
else
- sc_addr = spx + spy * 320;
+// sc_addr = spx + spy * 320;
+ sc_addr = spx + (spy * 288);
if (b1 != 15)
my_scr[sc_addr] = scolor[spr_color_index][b1]; // Store it
my_scr[sc_addr] = scolor[spr_color_index][b2]; // Store it
}
}
+#else
+ DrawSpriteBlock(sprnum, x, y, 16, 32, 2);
+#endif
}
else
sprnum += 128; // Advance to next...
{
y += 16; // Do next row...
- for(uint16 sy=0; sy<16; sy++)
+#if 0
+ for(uint16_t sy=0; sy<16; sy++)
{
- for(uint16 sx=0; sx<16; sx+=2)
+ for(uint16_t sx=0; sx<16; sx+=2)
{
- uint8 b1 = spr_rom[sprnum] >> 4, b2 = spr_rom[sprnum++] & 0x0F;
- uint16 spy = y + sy, spx = x + sx;
+ uint8_t b1 = spr_rom[sprnum] >> 4, b2 = spr_rom[sprnum++] & 0x0F;
+ uint16_t spy = y + sy, spx = x + sx;
- if (spy > 223 || spx > 299)
+// if (spy > 223 || spx > 299)
+ if (spy > 223 || spx > 287)
sc_addr = 0x13FFE;
else
- sc_addr = spx + spy * 320;
+// sc_addr = spx + spy * 320;
+ sc_addr = spx + (spy * 288);
if (b1 != 15)
my_scr[sc_addr] = scolor[spr_color_index][b1]; // Store it
my_scr[sc_addr] = scolor[spr_color_index][b2]; // Store it
}
}
+#else
+ DrawSpriteBlock(sprnum, x, y, 0, 16, 2);
+#endif
if (horiz_bl)
{
- for(uint16 sy=0; sy<16; sy++)
+#if 0
+ for(uint16_t sy=0; sy<16; sy++)
{
- for(uint16 sx=16; sx<32; sx+=2)
+ for(uint16_t sx=16; sx<32; sx+=2)
{
- uint8 b1 = spr_rom[sprnum] >> 4, b2 = spr_rom[sprnum++] & 0x0F;
- uint16 spy = y + sy, spx = x + sx;
+ uint8_t b1 = spr_rom[sprnum] >> 4, b2 = spr_rom[sprnum++] & 0x0F;
+ uint16_t spy = y + sy, spx = x + sx;
- if (spy > 223 || spx > 299)
+// if (spy > 223 || spx > 299)
+ if (spy > 223 || spx > 287)
sc_addr = 0x13FFE;
else
- sc_addr = spx + spy * 320;
+// sc_addr = spx + spy * 320;
+ sc_addr = spx + (spy * 288);
if (b1 != 15)
my_scr[sc_addr] = scolor[spr_color_index][b1]; // Store it
my_scr[sc_addr] = scolor[spr_color_index][b2]; // Store it
}
}
+#else
+ DrawSpriteBlock(sprnum, x, y, 16, 32, 2);
+#endif
}
}
}
else // Flip
{
- if (horiz_bl)
- {
- for(uint16 sy=0; sy<16; sy++)
- {
- for(uint16 sx=30; sx!=14; sx-=2)
- {
- uint8 b1 = spr_rom[sprnum]>>4, b2 = spr_rom[sprnum++]&0x0F;
- uint16 spy = y+sy, spx = x+sx;
- if ((spy>223) || (spx>299))
- sc_addr = 0x13FFE;
- else
- sc_addr = spx+spy*320;
- if (b2 != 15)
- my_scr[sc_addr] = scolor[spr_color_index][b2]; // Store it
- sc_addr++;
- if (b1 != 15)
- my_scr[sc_addr] = scolor[spr_color_index][b1]; // Store it
- }
- }
- }
- for(uint16 sy=0; sy<16; sy++)
- {
- for(uint16 sx=14; sx!=0xFFFE; sx-=2)
- {
- uint8 b1 = spr_rom[sprnum]>>4, b2 = spr_rom[sprnum++]&0x0F;
- uint16 spy = y+sy, spx = x+sx;
- if ((spy>223) || (spx>299))
- sc_addr = 0x13FFE;
- else
- sc_addr = spx+spy*320;
- if (b2 != 15)
- my_scr[sc_addr] = scolor[spr_color_index][b2]; // Store it
- sc_addr++;
- if (b1 != 15)
- my_scr[sc_addr] = scolor[spr_color_index][b1]; // Store it
- }
- }
- if (!horiz_bl) sprnum += 128; // If single, skip sprite...
- if (vert_bl)
- {
- y += 16; // Adjust Y coord...
- if (horiz_bl)
- {
- for(uint16 sy=0; sy<16; sy++)
- {
- for(uint16 sx=30; sx!=14; sx-=2)
- {
- uint8 b1 = spr_rom[sprnum]>>4, b2 = spr_rom[sprnum++]&0x0F;
- uint16 spy = y+sy, spx = x+sx;
- if ((spy>223) || (spx>299))
- sc_addr = 0x13FFE;
- else
- sc_addr = spx+spy*320;
- if (b2 != 15)
- my_scr[sc_addr] = scolor[spr_color_index][b2]; // Store it
- sc_addr++;
- if (b1 != 15)
- my_scr[sc_addr] = scolor[spr_color_index][b1]; // Store it
- }
- }
- }
- for(uint16 sy=0; sy<16; sy++)
- {
- for(uint16 sx=14; sx!=0xFFFE; sx-=2)
- {
- uint8 b1 = spr_rom[sprnum]>>4, b2 = spr_rom[sprnum++]&0x0F;
- uint16 spy = y+sy, spx = x+sx;
- if ((spy>223) || (spx>299))
- sc_addr = 0x13FFE;
- else
- sc_addr = spx+spy*320;
- if (b2 != 15)
- my_scr[sc_addr] = scolor[spr_color_index][b2]; // Store it
- sc_addr++;
- if (b1 != 15)
- my_scr[sc_addr] = scolor[spr_color_index][b1]; // Store it
- }
- }
- }
- }
+ if (horiz_bl)
+ {
+#if 0
+ for(uint16_t sy=0; sy<16; sy++)
+ {
+ for(uint16_t sx=30; sx!=14; sx-=2)
+ {
+ uint8_t b1 = spr_rom[sprnum] >> 4, b2 = spr_rom[sprnum++] & 0x0F;
+ uint16_t spy = y + sy, spx = x + sx;
+
+// if ((spy > 223) || (spx > 299))
+ if ((spy > 223) || (spx > 287))
+ sc_addr = 0x13FFE;
+ else
+// sc_addr = spx + spy * 320;
+ sc_addr = spx + (spy * 288);
+
+ if (b2 != 15)
+ my_scr[sc_addr] = scolor[spr_color_index][b2]; // Store it
+
+ sc_addr++;
+
+ if (b1 != 15)
+ my_scr[sc_addr] = scolor[spr_color_index][b1]; // Store it
+ }
+ }
+#else
+ DrawSpriteBlock2(sprnum, x, y, 30, 14, -2);
+#endif
+ }
+
+#if 0
+ for(uint16_t sy=0; sy<16; sy++)
+ {
+ for(uint16_t sx=14; sx!=0xFFFE; sx-=2)
+ {
+ uint8_t b1 = spr_rom[sprnum] >> 4, b2 = spr_rom[sprnum++] & 0x0F;
+ uint16_t spy = y + sy, spx = x + sx;
+
+// if ((spy > 223) || (spx > 299))
+ if ((spy > 223) || (spx > 287))
+ sc_addr = 0x13FFE;
+ else
+// sc_addr = spx + spy * 320;
+ sc_addr = spx + (spy * 288);
+
+ if (b2 != 15)
+ my_scr[sc_addr] = scolor[spr_color_index][b2]; // Store it
+
+ sc_addr++;
+
+ if (b1 != 15)
+ my_scr[sc_addr] = scolor[spr_color_index][b1]; // Store it
+ }
+ }
+#else
+ DrawSpriteBlock2(sprnum, x, y, 14, 0xFFFE, -2);
+#endif
+
+ if (!horiz_bl)
+ sprnum += 128; // If single, skip sprite...
+
+ if (vert_bl)
+ {
+ y += 16; // Adjust Y coord...
+
+ if (horiz_bl)
+ {
+#if 0
+ for(uint16_t sy=0; sy<16; sy++)
+ {
+ for(uint16_t sx=30; sx!=14; sx-=2)
+ {
+ uint8_t b1 = spr_rom[sprnum] >> 4, b2 = spr_rom[sprnum++] & 0x0F;
+ uint16_t spy = y + sy, spx = x + sx;
+
+// if ((spy > 223) || (spx > 299))
+ if ((spy > 223) || (spx > 287))
+ sc_addr = 0x13FFE;
+ else
+// sc_addr = spx + spy * 320;
+ sc_addr = spx + (spy * 288);
+
+ if (b2 != 15)
+ my_scr[sc_addr] = scolor[spr_color_index][b2]; // Store it
+
+ sc_addr++;
+
+ if (b1 != 15)
+ my_scr[sc_addr] = scolor[spr_color_index][b1]; // Store it
+ }
+ }
+#else
+ DrawSpriteBlock2(sprnum, x, y, 30, 14, -2);
+#endif
+ }
+
+#if 0
+ for(uint16_t sy=0; sy<16; sy++)
+ {
+ for(uint16_t sx=14; sx!=0xFFFE; sx-=2)
+ {
+ uint8_t b1 = spr_rom[sprnum] >> 4, b2 = spr_rom[sprnum++] & 0x0F;
+ uint16_t spy = y + sy, spx = x + sx;
+
+// if ((spy > 223) || (spx > 299))
+ if ((spy > 223) || (spx > 287))
+ sc_addr = 0x13FFE;
+ else
+// sc_addr = spx + spy * 320;
+ sc_addr = spx + (spy * 288);
+
+ if (b2 != 15)
+ my_scr[sc_addr] = scolor[spr_color_index][b2]; // Store it
+
+ sc_addr++;
+
+ if (b1 != 15)
+ my_scr[sc_addr] = scolor[spr_color_index][b1]; // Store it
+ }
+ }
+#else
+ DrawSpriteBlock2(sprnum, x, y, 14, 0xFFFE, -2);
+#endif
+ }
+ }
}
-int FindPCXName()
+
+int FindPCXName(void)
{
- static int pcxNum = -1; // This needs to go elsewhere... (or does it?)
+ static int pcxNum = -1; // This needs to go elsewhere... (or does it?)
char filename[30];
FILE * fr;
{
sprintf(filename, "thnd%04i.pcx", pcxNum);
+ // file does not exist - we can create it
if ((fr = fopen(filename, "r")) == NULL)
- return pcxNum; // file does not exist - we can create it
+ return pcxNum;
pcxNum++;
}
return -1;
}
+
void SnapPCX(SDL_Surface * scr)
{
char filename[30];
int YMax = 223;
int bytesPerLine = 320;
+ // Return if failed...
if ((i = FindPCXName()) < 0)
- return; // failed...
+ return;
sprintf(filename, "thnd%04i.pcx", i);
fputc(0x5, fw); // version 5
fputc(0x1, fw); // RLE encoding
fputc(0x8, fw); // bits per pixel
- fputc(0, fw); fputc(0, fw); fputc(0, fw); fputc(0, fw); // XMin=0,YMin=0
- fputc(XMax&0xFF, fw); fputc(XMax>>8, fw);
- fputc(YMax&0xFF, fw); fputc(YMax>>8, fw);
- fputc(0, fw); fputc(0, fw); fputc(0, fw); fputc(0,fw); // unknown DPI
- for (i=0; i<48; i++) fputc(0, fw); // EGA color palette
+ fputc(0, fw);
+ fputc(0, fw);
+ fputc(0, fw);
+ fputc(0, fw); // XMin=0,YMin=0
+ fputc(XMax & 0xFF, fw);
+ fputc(XMax >> 8, fw);
+ fputc(YMax & 0xFF, fw);
+ fputc(YMax >> 8, fw);
+ fputc(0, fw);
+ fputc(0, fw);
+ fputc(0, fw);
+ fputc(0,fw); // unknown DPI
+
+ for (i=0; i<48; i++)
+ fputc(0, fw); // EGA color palette
+
fputc(0, fw); // reserved
fputc(1, fw); // number of bit planes
- fputc(bytesPerLine&0xFF, fw); fputc(bytesPerLine>>8, fw);
- fputc(1, fw); fputc(0, fw); // palette info - unused
- fputc((XMax+1)&0xFF, fw); fputc((XMax+1)>>8, fw);
- fputc((YMax+1)&0xFF, fw); fputc((YMax+1)>>8, fw); // screen resolution
- for (i=0; i<54; i++) fputc(0, fw); // unused
+ fputc(bytesPerLine & 0xFF, fw);
+ fputc(bytesPerLine >> 8, fw);
+ fputc(1, fw);
+ fputc(0, fw); // palette info - unused
+ fputc((XMax + 1) & 0xFF, fw);
+ fputc((XMax + 1) >> 8, fw);
+ fputc((YMax + 1) & 0xFF, fw);
+ fputc((YMax + 1) >> 8, fw); // screen resolution
+
+ for (i=0; i<54; i++)
+ fputc(0, fw); // unused
// Instead of using the screen, we should use our internal buffer...
SDL_LockSurface(scr);
- uint32 mem = scr->pitch * 8; // Skip first line... WAS:320*8;
+ uint32_t mem = scr->pitch * 8; // Skip first line... WAS:320*8;
+
for (line=0; line<=YMax; line++)
{
int count;
int last;
int xpos;
- uint8 * pMem = (uint8 *)scr->pixels;
+ uint8_t * pMem = (uint8_t *)scr->pixels;
xpos = 0;
+
while (xpos < bytesPerLine)
{
last = pMem[mem++];
xpos++;
count = 1;
+
while (pMem[mem] == last && xpos < bytesPerLine && count < 63)
{
- mem++; count++; xpos++;
+ mem++;
+ count++;
+ xpos++;
}
- if (count > 1 || (last&0xC0) == 0xC0)
+ if (count > 1 || (last & 0xC0) == 0xC0)
{
- fputc(0xC0 | (count & 0x3F), fw); fputc(last & 0xFF, fw);
+ fputc(0xC0 | (count & 0x3F), fw);
+ fputc(last & 0xFF, fw);
}
- else fputc(last & 0xFF, fw);
+ else
+ fputc(last & 0xFF, fw);
}
+
mem += (scr->pitch - 320); // Handle non-standard line lengths...
}
SDL_UnlockSurface(scr);
// Write the palette
-
fputc(0x0C, fw);
+
for (i=0; i<768; i++)
fputc(palette[i], fw);
fclose(fw); // success!
}
+