// JLH 04/17/2014 Removed a metric fuck-tonne of cruft, added YM2151 & MCU
//
-#define THUNDER_VERSION "1.1.0"
+#define THUNDER_VERSION "1.2.0"
#include <SDL2/SDL.h>
-#include <iostream>
-#include <iomanip>
-#include <fstream>
#include <string>
-#include <new>
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include "ym2151.h"
-using namespace std;
-
-
#define ROM1 "rt3-1b.9c"
#define ROM2 "rt3-2b.12c"
#define ROM3 "rt3-3.12d"
// Global defines
-SDL_Surface * screen;
-
-uint8_t * gram, * grom; // Allocate RAM & ROM pointers
-// Actual memory
-uint8_t gram1[0x10000], gram2[0x10000], grom1[0x10000], grom2[0x10000];
+uint8_t gram1[0x10000], grom1[0x10000], grom2[0x10000];
uint8_t grom3[0x8000], data_rom[0x40000], spr_rom[0x80000], voice_rom[0x20000];
-uint8_t chr_rom[0x60000]; // Character ROM pointer
+uint8_t charROM[0x60000]; // Character ROM
uint8_t mcuMem[0x10000]; // 64K for MCU
-V6809REGS cpu1, cpu2; // CPU execution contexts
+// CPU execution contexts
+V6809REGS cpu1, cpu2;
V63701REGS mcu;
-bool trace1 = false; // ditto...
-bool looking_at_rom = true; // true = R1, false = R2
-uint32_t banksw1, banksw2; // Bank switch addresses
-uint16_t game_over_switch; // Game over delay
-uint16_t dpc; // Debug pc reg...
-bool show_scr = true; // Whether or not to show background
-bool enable_cpu = true; // Whether or not to enable CPUs
-bool irqGoA = true; // IRQ switch for CPU #1
-bool irqGoB = true; // IRQ switch for CPU #2
-
-uint16_t refresh_ = 0; // Crappy global screen stuff...
-bool refresh2 = true;
-
-uint32_t psg_lens[16] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-uint8_t * psg_adrs[16];
+// Bank switch addresses
+uint32_t banksw1, banksw2;
+// MCU inputs
Byte input1, input2, input3, input4, input5;
-fstream tr; // Tracelog hook
-uint16_t pcx; // Where we at?
-
// Function prototypes
uint8_t MCUReadMemory(uint16_t address);
void MCUWriteMemory(uint16_t address, uint8_t data);
//
// Read a byte from memory
//
-uint8_t RdMem(uint16_t addr)
+uint8_t MainReadMemory(uint16_t addr)
{
uint8_t b;
// Memory shared with MCU (CPU #1 only! CPU #2 does not)
if ((addr >= 0x4000) && (addr <= 0x43FF))
return mcuMem[addr - 0x3000];
-// if ((addr >= 0x4000) && (addr <= 0x41FF))
-// return MCUReadMemory(addr - 0x3000);
-// if ((addr >= 0x4200) && (addr <= 0x43FF))
-// return mcuMem[addr - 0x3000];
if (addr >= 0x6000)
return data_rom[banksw1 + (addr - 0x6000)]; // Get char data
- else
- return gram1[addr];
+
+ return gram1[addr];
}
return grom1[addr];
//
// Write a byte to memory
//
-void WrMem(uint16_t address, uint8_t data)
+void MainWriteMemory(uint16_t address, uint8_t data)
{
extern bool disasm;
- extern bool charbase; // Needed for screen. Extern it in it??
-#if 0
- if (address == 0x4182)
- {
- WriteLog("\nWriteMem: CPU #1 writing $%02X to $4182!\n\n", b);
- }
-#endif
-#if 0
-if (((address >= 0x4180) && (address <= 0x4191)) || (address == 0x4380))
- printf("WriteMem: CPU #1 writing $%02X to $%04X...\n", b, address);
-#endif
if (address == 0x6000)
-{
-//printf("Spawning VOICE channel #1: $6000=$%02X, $6200=$%02X\n", b, gram1[0x6200]);
SpawnSound(GAMESOUND, gram1[0x6200], 0); // Do voice chan 1
-}
if (address == 0x6400)
-{
-//printf("Spawning VOICE channel #2: $6400=$%02X, $6600=$%02X\n", b, gram1[0x6600]);
SpawnSound(GAMESOUND, gram1[0x6600], 1); // Do voice chan 2
-}
if (address == 0x6800)
banksw1 = (uint32_t)data << 13; // Set char data bankswitch base address
- if (address > 0x4284 && address < 0x42A5 && data)
- SpawnSound(PSGSOUND, address - 0x4285); // Do PSG sound on chans 2, 3
-//if ((address >= 0x4284) && (address < 0x42A5))
-//{
-// printf("WrMem: Wrote $%02X to PSG address $%04X...\n", data, address);
-//}
// Memory shared with MCU (CPU #1 only! CPU #2 does not)
if ((address >= 0x4000) && (address <= 0x43FF))
mcuMem[address - 0x3000] = data;
-// if ((address >= 0x4000) && (address <= 0x41FF))
-// MCUWriteMemory(address - 0x3000, data);
-// if ((address >= 0x4200) && (address <= 0x43FF))
-// mcuMem[address - 0x3000] = data;
else
gram1[address] = data;
+ if (address == 0x5FF2)
+ CopySprites();
if (address == 0x8800)
- charbase = false; // Char banksw1
+ charBankSwitch = false; // Char banksw1
if (address == 0x8C00)
- charbase = true; // Char banksw2
- if (address == 0x8400) // Frame go strobe? VBlank acknowledge?
+ charBankSwitch = true; // Char banksw2
+ if (address == 0x8400) // Frame go strobe? VBlank acknowledge?
{
- BlitChar(screen, chr_rom, gram1);
+// BlitChar(charROM, gram1);
- // IRQ Ack (may also be frame go...
+ // IRQ Ack (may also be frame go...)
ClearLineOfCurrentV6809(V6809_ASSERT_LINE_IRQ);
#if 1
if (disasm)
//
// Read a byte from memory (2nd processor)
//
-uint8_t RdMemB(uint16_t address)
+uint8_t SubReadMemory(uint16_t address)
{
if (address < 0x8000)
{
//
// Write a byte to memory (2nd processor)
//
-void WrMemB(uint16_t address, uint8_t data)
+void SubWriteMemory(uint16_t address, uint8_t data)
{
extern bool disasm;
- extern bool charbase;
// Set sprite data bank switch
if (address == 0xD803)
if ((address >= 0x2000) && (address < 0x6000))
gram1[address - 0x2000] = data;
+ if (address == 0x1FF2)
+ CopySprites();
+
if (address == 0x8800)
{
// IRQ Ack (may also be frame go...)
if (address < 0x20)
return InternalRegisterRead(address);
else if ((address >= 0x1000) && (address <= 0x113F))
-// else if ((address >= 0x1000) && (address <= 0x11FF))
return ReadPSG(address - 0x1000);
else if ((address >= 0x2000) && (address <= 0x2001))
return YMReadReg(0);
|| (address >= 0xF000))
return;
else if ((address >= 0x1000) && (address <= 0x113F))
-// else if ((address >= 0x1000) && (address <= 0x11FF))
{
WritePSG(address - 0x1000, data);
return;
//
bool ReadColorPROMs(void)
{
- fstream ff1, ff2;
- // uint8_t ch;
- char ch;
- extern uint32_t palette[256]; // Screen physical palette
- extern uint8_t ccolor[256][8]; // Character color PROM values
- extern uint8_t scolor[128][16]; // Sprite color PROM values
-
- ff1.open("./ROMs/"PROM3, ios::binary | ios::in);
+ FILE * file1 = fopen("./ROMs/"PROM3, "rb");
- if (ff1)
+ if (file1)
{
for(int i=0; i<256; i++) // Load char pallete with PROM values
- {
for(int j=0; j<8; j++)
- {
- ff1.get(ch);
- ccolor[i][j] = (uint8_t)ch;
- }
- }
+ ccolor[i][j] = (uint8_t)fgetc(file1);
- ff1.close();
+ fclose(file1);
}
- ff1.open("./ROMs/"PROM4, ios::binary | ios::in);
+ file1 = fopen("./ROMs/"PROM4, "rb");
- if (ff1)
+ if (file1)
{
for(int i=0; i<128; i++) // Load sprite pallete with PROM values
- {
for(int j=0; j<16; j++)
- {
- ff1.get(ch);
- scolor[i][j] = (uint8_t)ch;
- }
- }
+ scolor[i][j] = (uint8_t)fgetc(file1);
- ff1.close();
+ fclose(file1);
}
- ff1.open("./ROMs/"PROM1, ios::binary | ios::in);
- ff2.open("./ROMs/"PROM2, ios::binary | ios::in);
+ file1 = fopen("./ROMs/"PROM1, "rb");
+ FILE * file2 = fopen("./ROMs/"PROM2, "rb");
// If open was successful...
- if (ff1 && ff2)
+ if (file1 && file2)
{
// Palette is 12-bit RGB, we stretch it to 24-bit
for(int i=0; i<256; i++)
{
- char c1, c2;
- ff1.get(c1);
- ff2.get(c2);
+ uint8_t c1 = fgetc(file1);
+ uint8_t c2 = fgetc(file2);
uint8_t r = (uint8_t)c1 & 0x0F;
uint8_t g = (uint8_t)c1 >> 4;
uint8_t b = (uint8_t)c2;
palette[i] = 0xFF000000 | (b << 20) | (b << 16) | (g << 12) | (g << 8) | (r << 4) | r;
}
- ff1.close();
- ff2.close();
+ fclose(file1);
+ fclose(file2);
}
// PROM5 has the following in it (tile address decoder):
// 00: 00 20 40 60 02 22 42 62 04 24 44 64 06 26 46 66
// 10: 88 A8 C8 E8 8A AA CA EA 8C AC CC EC 8E AE CE EE
- if (!ff1)
+ if (!file1)
+ {
printf("Could not open PROM files!\n");
+ return false;
+ }
- return ff1;
+ return true;
}
//
bool UnpackFonts(void)
{
-// uint8_t b1, b2, b3;
- char b1, b2, b3;
- fstream f1, f2;
- //0x4000 $800 chars
- f1.open("./ROMs/"ROM7, ios::binary | ios::in);
- f2.open("./ROMs/"ROM8, ios::binary | ios::in);
+ // 0x4000 $800 chars
+ FILE * file1 = fopen("./ROMs/"ROM7, "rb");
+ FILE * file2 = fopen("./ROMs/"ROM8, "rb");
- if ((!f1) || (!f2))
- return false; // Return if not found...
+ if (!file1 || !file2)
+ {
+ printf("Could not open either "ROM7" or "ROM8"!\n");
+ return false;
+ }
for(long i=0; i<0x40000; i+=64)
{
for(int j=0; j<64; j+=8)
{
- f1.get(b1); f1.get(b2); f2.get(b3);
- b3 ^= 0xFF; // Invert top data...
- chr_rom[i+j] = ((b3 & 0x80) >> 5) | ((b1 & 0x80) >> 6) | ((b1 & 0x08) >> 3);
- chr_rom[i+j+1] = ((b3 & 0x40) >> 4) | ((b1 & 0x40) >> 5) | ((b1 & 0x04) >> 2);
- chr_rom[i+j+2] = ((b3 & 0x20) >> 3) | ((b1 & 0x20) >> 4) | ((b1 & 0x02) >> 1);
- chr_rom[i+j+3] = ((b3 & 0x10) >> 2) | ((b1 & 0x10) >> 3) | (b1 & 0x01);
- chr_rom[i+j+4] = ((b3 & 0x08) >> 1) | ((b2 & 0x80) >> 6) | ((b2 & 0x08) >> 3);
- chr_rom[i+j+5] = (b3 & 0x04) | ((b2 & 0x40) >> 5) | ((b2 & 0x04) >> 2);
- chr_rom[i+j+6] = ((b3 & 0x02) << 1) | ((b2 & 0x20) >> 4) | ((b2 & 0x02) >> 1);
- chr_rom[i+j+7] = ((b3 & 0x01) << 2) | ((b2 & 0x10) >> 3) | (b2 & 0x01);
+ uint8_t b1 = (uint8_t)fgetc(file1);
+ uint8_t b2 = (uint8_t)fgetc(file1);
+ uint8_t b3 = (uint8_t)fgetc(file2) ^ 0xFF;
+ charROM[i + j + 0] = ((b3 & 0x80) >> 5) | ((b1 & 0x80) >> 6) | ((b1 & 0x08) >> 3);
+ charROM[i + j + 1] = ((b3 & 0x40) >> 4) | ((b1 & 0x40) >> 5) | ((b1 & 0x04) >> 2);
+ charROM[i + j + 2] = ((b3 & 0x20) >> 3) | ((b1 & 0x20) >> 4) | ((b1 & 0x02) >> 1);
+ charROM[i + j + 3] = ((b3 & 0x10) >> 2) | ((b1 & 0x10) >> 3) | (b1 & 0x01);
+ charROM[i + j + 4] = ((b3 & 0x08) >> 1) | ((b2 & 0x80) >> 6) | ((b2 & 0x08) >> 3);
+ charROM[i + j + 5] = (b3 & 0x04) | ((b2 & 0x40) >> 5) | ((b2 & 0x04) >> 2);
+ charROM[i + j + 6] = ((b3 & 0x02) << 1) | ((b2 & 0x20) >> 4) | ((b2 & 0x02) >> 1);
+ charROM[i + j + 7] = ((b3 & 0x01) << 2) | ((b2 & 0x10) >> 3) | (b2 & 0x01);
}
}
- f1.close();
- f2.close();
+ fclose(file1);
+ fclose(file2);
+
+ file1 = fopen("./ROMs/"ROM5, "rb");
+ file2 = fopen("./ROMs/"ROM6, "rb");
- f1.open("./ROMs/"ROM5, ios::binary | ios::in);
- f2.open("./ROMs/"ROM6, ios::binary | ios::in);
+ if (!file1 || !file2)
+ {
+ printf("Could not open either "ROM5" or "ROM6"!\n");
+ return false;
+ }
for(long i=0x40000; i<0x60000; i+=64)
{
for(int j=0; j<64; j+=8)
{
- f1.get(b1); f1.get(b2); f2.get(b3);
- b3 ^= 0xFF; // Invert top data
- chr_rom[i+j] = ((b3 & 0x80) >> 5) | ((b1 & 0x80) >> 6) | ((b1 & 0x08) >> 3);
- chr_rom[i+j+1] = ((b3 & 0x40) >> 4) | ((b1 & 0x40) >> 5) | ((b1 & 0x04) >> 2);
- chr_rom[i+j+2] = ((b3 & 0x20) >> 3) | ((b1 & 0x20) >> 4) | ((b1 & 0x02) >> 1);
- chr_rom[i+j+3] = ((b3 & 0x10) >> 2) | ((b1 & 0x10) >> 3) | (b1 & 0x01);
- chr_rom[i+j+4] = ((b3 & 0x08) >> 1) | ((b2 & 0x80) >> 6) | ((b2 & 0x08) >> 3);
- chr_rom[i+j+5] = (b3 & 0x04) | ((b2 & 0x40) >> 5) | ((b2 & 0x04) >> 2);
- chr_rom[i+j+6] = ((b3 & 0x02) << 1) | ((b2 & 0x20) >> 4) | ((b2 & 0x02) >> 1);
- chr_rom[i+j+7] = ((b3 & 0x01) << 2) | ((b2 & 0x10) >> 3) | (b2 & 0x01);
+ uint8_t b1 = (uint8_t)fgetc(file1);
+ uint8_t b2 = (uint8_t)fgetc(file1);
+ uint8_t b3 = (uint8_t)fgetc(file2) ^ 0xFF;
+ charROM[i + j + 0] = ((b3 & 0x80) >> 5) | ((b1 & 0x80) >> 6) | ((b1 & 0x08) >> 3);
+ charROM[i + j + 1] = ((b3 & 0x40) >> 4) | ((b1 & 0x40) >> 5) | ((b1 & 0x04) >> 2);
+ charROM[i + j + 2] = ((b3 & 0x20) >> 3) | ((b1 & 0x20) >> 4) | ((b1 & 0x02) >> 1);
+ charROM[i + j + 3] = ((b3 & 0x10) >> 2) | ((b1 & 0x10) >> 3) | (b1 & 0x01);
+ charROM[i + j + 4] = ((b3 & 0x08) >> 1) | ((b2 & 0x80) >> 6) | ((b2 & 0x08) >> 3);
+ charROM[i + j + 5] = (b3 & 0x04) | ((b2 & 0x40) >> 5) | ((b2 & 0x04) >> 2);
+ charROM[i + j + 6] = ((b3 & 0x02) << 1) | ((b2 & 0x20) >> 4) | ((b2 & 0x02) >> 1);
+ charROM[i + j + 7] = ((b3 & 0x01) << 2) | ((b2 & 0x10) >> 3) | (b2 & 0x01);
}
}
- f1.close();
- f2.close();
+ fclose(file1);
+ fclose(file2);
return true;
}
InitLog("thunder.log");
extern bool disasm; // From 'V6809.CPP'
- extern bool charbase; // From 'SCREEN.CPP'
- charbase = false;
bool running; // CPU running state flag...
SDL_Event event; // SDL "event"
- extern uint8_t palette[768]; // Screen physical palette
uint32_t ticks, oldTicks;
+ uint8_t frameTickCount = 0;
printf("THUNDER v"THUNDER_VERSION" by James Hammons\n");
printf("Serial #20149417 / Prerelease\n");
// SDL_WM_SetCaption("Thunder v"THUNDER_VERSION" ", "Thunder");
- // Needed only for debugger
- gram = gram1; grom = grom1;
-
- memset(gram, 0, 0x10000);
- memset(grom, 0, 0x10000);
- memset(gram2, 0, 0x10000);
- memset(grom2, 0, 0x10000);
+ printf("Loading ROMs...\n");
- cout << "Loading ROMs..." << endl;
if (!ReadColorPROMs())
return -1;
// Load 5, 6, 7, 8th ROMs
if (!UnpackFonts())
- {
- cout << "Could not open font files!" << endl;
return -1;
- }
// Load MCU program + data
if (!LoadImg(MCUROM, mcuMem, 0xF000, 0x1000))
return -1;
// Set up V6809, V63701 execution contexts
-
memset(&cpu1, 0, sizeof(V6809REGS));
- cpu1.RdMem = RdMem;
- cpu1.WrMem = WrMem;
+ cpu1.RdMem = MainReadMemory;
+ cpu1.WrMem = MainWriteMemory;
cpu1.cpuFlags |= V6809_ASSERT_LINE_RESET;
memset(&cpu2, 0, sizeof(V6809REGS));
- cpu2.RdMem = RdMemB;
- cpu2.WrMem = WrMemB;
+ cpu2.RdMem = SubReadMemory;
+ cpu2.WrMem = SubWriteMemory;
cpu2.cpuFlags |= V6809_ASSERT_LINE_RESET;
memset(&mcu, 0, sizeof(V63701REGS));
mcu.WrMem = MCUWriteMemory;
mcu.cpuFlags |= V63701_ASSERT_LINE_RESET;
- running = true; // Set running status...
+ running = true;
// Set all inputs to inactive...
- input1.byte = input2.byte = input3.byte = input4.byte = input5.byte = 0xFF;
- banksw1 = 0; // Will this work?
+ input1.byte = input2.byte = input3.byte = 0xFF;
+ banksw1 = 0;
banksw2 = 0;
InitGUI(); // Reset # of coins
+ // Set up DIP switches...
+ input4.bit.b0 = 1; // DSW B-0: Contiues (1 = 6, 0 = 3)
+ input4.bit.b1 = 1; // DSW B-2: ???
+ input4.bit.b2 = 1; // DSW B-4: Difficulty (1 = normal, 0 = easy)
+ input4.bit.b3 = 1; // DSW B-6: Bonus lives (70K/200K = 1, 100K/300K = 0)
+ input4.bit.b4 = 1; // DSW A-0: Coin #2 credit
+ input4.bit.b5 = 1; // DSW A-2: Freeze mode (0 = freeze)
+ input4.bit.b6 = 1; // DSW A-4: Attract mode sound (1 = on)
+ input4.bit.b7 = 1; // DSW A-6: Coin #1 credit
+
+ input5.bit.b0 = 1; // DSW B-1: Cabinet type (1 = A, 0 = B)
+ input5.bit.b1 = 0; // DSW B-3: Level select (0 = on)
+ input5.bit.b2 = 0; // DSW B-5: Time (1 = 120, 0 = 150)
+ input5.bit.b3 = 0; // DSW B-7: Lives (1 = 3, 0 = 5)
+ input5.bit.b4 = 1; // DSW A-1: Coin #2 credit
+ input5.bit.b5 = 1; // DSW A-3: Invulnerability (0 = on)
+ input5.bit.b6 = 1; // DSW A-5: Coin #1 credit
+ input5.bit.b7 = 1; // DSW A-7: Service mode
+
WriteLog("About to set up screen...\n");
InitVideo();
WriteLog("About to set up audio...\n");
InitSound();
-memset(scrBuffer, 0xFF, VIRTUAL_SCREEN_WIDTH*VIRTUAL_SCREEN_HEIGHT*sizeof(uint32_t));
-RenderScreenBuffer();
+//memset(scrBuffer, 0xFF, VIRTUAL_SCREEN_WIDTH*VIRTUAL_SCREEN_HEIGHT*sizeof(uint32_t));
+//RenderScreenBuffer();
WriteLog("About to enter main loop...\n");
while (running)
{
- HandleGUIDebounce(); // Debounce GUI keys
+// HandleGUIDebounce(); // Debounce GUI keys
// Dipswitches are presented to the main CPUs as 0 or 1 at locations
// $423D - $425B by the MCU
input1.bit.b5 = 0;
else if (event.key.keysym.sym == SDLK_1)
input1.bit.b6 = 0;
- else if (event.key.keysym.sym == SDLK_RIGHT)
+ else if (event.key.keysym.sym == SDLK_2)
+ input2.bit.b6 = 0;
+ else if (event.key.keysym.sym == SDLK_c) // Left
input3.bit.b5 = 0;
- else if (event.key.keysym.sym == SDLK_LEFT)
+ else if (event.key.keysym.sym == SDLK_z) // Right
input3.bit.b4 = 0;
- else if (event.key.keysym.sym == SDLK_UP)
+ else if (event.key.keysym.sym == SDLK_s) // Up
input2.bit.b2 = 0;
- else if (event.key.keysym.sym == SDLK_DOWN)
+ else if (event.key.keysym.sym == SDLK_x) // Down
input1.bit.b2 = 0;
- else if (event.key.keysym.sym == SDLK_q) // (Q) Jump
+ else if (event.key.keysym.sym == SDLK_k) // Jump
input1.bit.b1 = 0;
- else if (event.key.keysym.sym == SDLK_e) // (E) Fire
+ else if (event.key.keysym.sym == SDLK_l) // Fire
input3.bit.b3 = 0;
+
+ else if (event.key.keysym.sym == SDLK_F1) // Service mode
+ input5.bit.b7 = !input5.bit.b7;
+
+ else if (event.key.keysym.sym == SDLK_q)
+ input4.bit.b7 = !input4.bit.b7;
+ else if (event.key.keysym.sym == SDLK_w)
+ input5.bit.b6 = !input5.bit.b6;
+ else if (event.key.keysym.sym == SDLK_e)
+ input5.bit.b5 = !input5.bit.b5;
+ else if (event.key.keysym.sym == SDLK_r)
+ input5.bit.b4 = !input5.bit.b4;
+ else if (event.key.keysym.sym == SDLK_t)
+ input5.bit.b3 = !input5.bit.b3;
+ else if (event.key.keysym.sym == SDLK_y)
+ input5.bit.b2 = !input5.bit.b2;
+ else if (event.key.keysym.sym == SDLK_u)
+ input5.bit.b1 = !input5.bit.b1;
+ else if (event.key.keysym.sym == SDLK_i)
+ input5.bit.b0 = !input5.bit.b0;
+
#else
else if (event.key.keysym.sym == SDLK_1)
input1.bit.b0 = 0;
input1.bit.b5 = 1;
else if (event.key.keysym.sym == SDLK_1)
input1.bit.b6 = 1;
- else if (event.key.keysym.sym == SDLK_RIGHT)
+ else if (event.key.keysym.sym == SDLK_2)
+ input2.bit.b6 = 1;
+ else if (event.key.keysym.sym == SDLK_c)
input3.bit.b5 = 1;
- else if (event.key.keysym.sym == SDLK_LEFT)
+ else if (event.key.keysym.sym == SDLK_z)
input3.bit.b4 = 1;
- else if (event.key.keysym.sym == SDLK_UP)
+ else if (event.key.keysym.sym == SDLK_s)
input2.bit.b2 = 1;
- else if (event.key.keysym.sym == SDLK_DOWN)
+ else if (event.key.keysym.sym == SDLK_x)
input1.bit.b2 = 1;
- else if (event.key.keysym.sym == SDLK_q) // (Q) Jump
+ else if (event.key.keysym.sym == SDLK_k) // (Q) Jump
input1.bit.b1 = 1;
- else if (event.key.keysym.sym == SDLK_e) // (E) Fire
+ else if (event.key.keysym.sym == SDLK_l) // (E) Fire
input3.bit.b3 = 1;
#else
if (event.key.keysym.sym == SDLK_1)
Execute63701(&mcu, 40);
}
+ BlitChar(charROM, gram1);
+
+ frameTickCount++;
+
+ if (frameTickCount == 3)
+ frameTickCount = 0;
+
// Speed throttling happens here...
- // Actually, it's 16.66... Need to account for that somehow
- while (SDL_GetTicks() - oldTicks < 16)
+ // Actually, it's 16.66... Need to account for that somehow [DONE]
+ while (SDL_GetTicks() - oldTicks < (16 + (frameTickCount == 2 ? 1 : 0)))
SDL_Delay(1); // Release our timeslice...
oldTicks = SDL_GetTicks();
projects / thunder / blobdiff