gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-21 02:32:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use std::stack for charmaps

Browse Source
This commit is contained in:
Rangi42
2024-02-21 09:48:55 -05:00
committed by Sylvie
parent 0e07408c63
commit 52c80c2740
1 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/asm/charmap.cpp
View File

@@ -2,6 +2,7 @@
#include <errno.h> #include <errno.h>
#include <new> #include <new>
#include <stack>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
@@ -37,12 +38,7 @@ static HashMap charmaps;
// that gets reallocated. // that gets reallocated.
static struct Charmap **currentCharmap; static struct Charmap **currentCharmap;
struct CharmapStackEntry { std::stack<struct Charmap **> charmapStack;
struct Charmap **charmap;
struct CharmapStackEntry *next;
};
struct CharmapStackEntry *charmapStack;
static struct Charmap *charmap_Get(char const *name) static struct Charmap *charmap_Get(char const *name)
{ {
@@ -119,29 +115,18 @@ void charmap_Set(char const *name)
void charmap_Push(void) void charmap_Push(void)
{ {
struct CharmapStackEntry *stackEntry = (struct CharmapStackEntry *)malloc(sizeof(*stackEntry)); charmapStack.push(currentCharmap);
if (stackEntry == NULL)
fatalerror("Failed to alloc charmap stack entry: %s\n", strerror(errno));
stackEntry->charmap = currentCharmap;
stackEntry->next = charmapStack;
charmapStack = stackEntry;
} }
void charmap_Pop(void) void charmap_Pop(void)
{ {
if (charmapStack == NULL) { if (charmapStack.empty()) {
error("No entries in the charmap stack\n"); error("No entries in the charmap stack\n");
return; return;
} }
struct CharmapStackEntry *top = charmapStack; currentCharmap = charmapStack.top();
charmapStack.pop();
currentCharmap = top->charmap;
charmapStack = top->next;
free(top);
} }
void charmap_Add(char *mapping, uint8_t value) void charmap_Add(char *mapping, uint8_t value)