Load the fontset correctly

The fontset was not being loaded to the emulator, resulting in the scores in pong now showing.

Author: Luk3

AlphaChip/chip8.cpp

@@ -3,28 +3,28 @@
 #include <time.h>       /* time */
 #include "chip8.h"
 
+unsigned char chip8_fontset[80] =
+{
+	0xF0, 0x90, 0x90, 0x90, 0xF0, //0
+	0x20, 0x60, 0x20, 0x20, 0x70, //1
+	0xF0, 0x10, 0xF0, 0x80, 0xF0, //2
+	0xF0, 0x10, 0xF0, 0x10, 0xF0, //3
+	0x90, 0x90, 0xF0, 0x10, 0x10, //4
+	0xF0, 0x80, 0xF0, 0x10, 0xF0, //5
+	0xF0, 0x80, 0xF0, 0x90, 0xF0, //6
+	0xF0, 0x10, 0x20, 0x40, 0x40, //7
+	0xF0, 0x90, 0xF0, 0x90, 0xF0, //8
+	0xF0, 0x90, 0xF0, 0x10, 0xF0, //9
+	0xF0, 0x90, 0xF0, 0x90, 0x90, //A
+	0xE0, 0x90, 0xE0, 0x90, 0xE0, //B
+	0xF0, 0x80, 0x80, 0x80, 0xF0, //C
+	0xE0, 0x90, 0x90, 0x90, 0xE0, //D
+	0xF0, 0x80, 0xF0, 0x80, 0xF0, //E
+	0xF0, 0x80, 0xF0, 0x80, 0x80  //F
+};
 
 chip8::chip8()
-{
-	unsigned char chip8_fontset[80] =
-	{
-		0xF0, 0x90, 0x90, 0x90, 0xF0, // 0
-		0x20, 0x60, 0x20, 0x20, 0x70, // 1
-		0xF0, 0x10, 0xF0, 0x80, 0xF0, // 2
-		0xF0, 0x10, 0xF0, 0x10, 0xF0, // 3
-		0x90, 0x90, 0xF0, 0x10, 0x10, // 4
-		0xF0, 0x80, 0xF0, 0x10, 0xF0, // 5
-		0xF0, 0x80, 0xF0, 0x90, 0xF0, // 6
-		0xF0, 0x10, 0x20, 0x40, 0x40, // 7
-		0xF0, 0x90, 0xF0, 0x90, 0xF0, // 8
-		0xF0, 0x90, 0xF0, 0x10, 0xF0, // 9
-		0xF0, 0x90, 0xF0, 0x90, 0x90, // A
-		0xE0, 0x90, 0xE0, 0x90, 0xE0, // B
-		0xF0, 0x80, 0x80, 0x80, 0xF0, // C
-		0xE0, 0x90, 0x90, 0x90, 0xE0, // D
-		0xF0, 0x80, 0xF0, 0x80, 0xF0, // E
-		0xF0, 0x80, 0xF0, 0x80, 0x80  // F
-	};
+{	
 }
 
 
@@ -78,7 +78,7 @@ void chip8::initialize()
 void chip8::emulateCycle()
 {
 	// Fetch opcode
-	this->opcode = this->memory[this->pc] << 8 | this->memory[this->pc + 1];
+	opcode = memory[pc] << 8 | memory[pc + 1];
 
 	// Decode opcode
 	switch (opcode & 0xF000)
@@ -474,8 +474,10 @@ void chip8::emulateCycle()
 	if (sound_timer > 0)
 	{
 		if (sound_timer == 1)
+		{
 			printf("BEEP!\n");
 			printf("\7");
+		}			
 		--sound_timer;
 	}
 }
@@ -498,7 +500,19 @@ void chip8::loadGame(std::string new_filename)
 	std::memcpy(memory + 0x200, buffer, 4096 - 0x200); // Rom data starts at 0x200
 }
 
-void chip8::setKeys()
+void chip8::debugDraw()
 {
-	//throw std::exception("not implemented");
+	// Draw
+	for (int y = 0; y < 32; ++y)
+	{
+		for (int x = 0; x < 64; ++x)
+		{
+			if (gfx[(y * 64) + x] == 0)
+				printf("O");
+			else
+				printf(" ");
+		}
+		printf("\n");
+	}
+	printf("\n");
 }

AlphaChip/chip8.h

@@ -7,7 +7,7 @@ class chip8
 	void initialize();
 	void emulateCycle();
 	void loadGame(std::string filename);
-	void setKeys();
+	void debugDraw();
 
 	bool drawFlag;
 
@@ -25,9 +25,6 @@ class chip8
 	unsigned short stack[16];
 	unsigned short sp;
 	unsigned char key[16];
-
-	unsigned char chip8_fontset[80];
-
 	/* 0x000-0x1FF - Chip 8 interpreter (contains font set in emu) [0 - 511]
 	0x050-0x0A0 - Used for the built in 4x5 pixel font set (0-F) [80 - 160]
 	0x200-0xFFF - Program ROM and work RAM  [512 - 7777]*/

AlphaChip/main.cpp

@@ -39,7 +39,7 @@ int main(int argc, char ** argv)
 	setupInput();
 
 	emulator.initialize();
-	emulator.loadGame("C:\\chip8-roms\\PONG");
+	emulator.loadGame("C:\\chip8-roms\\pong");
 
 
 	while (!quit)
@@ -50,6 +50,7 @@ int main(int argc, char ** argv)
 
 		if (emulator.drawFlag)
 		{
+			//emulator.debugDraw();
 			for (int i = 0; i < 64 * 32; i++)
 			{
 				if(emulator.gfx[i] == 1)
@@ -127,6 +128,9 @@ int main(int argc, char ** argv)
 			case SDLK_v:
 				emulator.key[0xF] = 1;
 				break;
+			case SDLK_ESCAPE:
+				quit = true;
+				break;
 			default:
 				break;
 			}