JailDoctor/ascii
2
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

[BUG] memcpy minor bug

Browse Source 
[FEAT] boot sequence
This commit is contained in:
JailDoctor
2021-12-08 09:18:42 +01:00
parent 1a73164990
commit 66bbdea85f
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ascii.cpp
View File

@@ -133,7 +133,7 @@ int main(int argc,char*argv[]) {
romcpy(); romcpy();
reinit(); reinit();
debug("ASCII SYSTEM BOOTING..."); debug("ASCII SYSTEM BOOTING...");
lua_init(lua_filename); lua_init(NULL);
lua_call_init(); lua_call_init();
while(!exit) { while(!exit) {
@@ -472,8 +472,8 @@ void poke(uint16_t addr, uint8_t val) {
} }
void memcpy(uint16_t dst, uint16_t src, uint16_t size) { void memcpy(uint16_t dst, uint16_t src, uint16_t size) {
if (dst <= src) return; if ((dst<=src) && (dst+size>=src)) return;
if (src+size>=dst) return; if ((dst>=src) && (src+size>=dst)) return;
SDL_memcpy(&mem[dst], &mem[src], size); SDL_memcpy(&mem[dst], &mem[src], size);
} }
@@ -496,7 +496,7 @@ void setmode(const uint8_t mode) {
} }
void load(const char* str) { void load(const char* str) {
SDL_strlcpy(lua_filename, str, SDL_strlen(str)+1); if (str!=NULL) SDL_strlcpy(lua_filename, str, SDL_strlen(str)+1);
should_reset = true; should_reset = true;
} }

14
lua.cpp
View File

@@ -227,7 +227,7 @@ extern "C" {
} }
static int cpp_load(lua_State *L) { static int cpp_load(lua_State *L) {
const char* str = luaL_checkstring(L, 1); const char* str = luaL_optstring(L, 1, NULL);
load(str); load(str);
return 0; return 0;
} }
@@ -268,12 +268,23 @@ bool lua_is_playing() {
return lua_state == STATE_PLAYING; return lua_state == STATE_PLAYING;
} }
const char boot[] = "function init()setmode(1)cls()memcpy(360,4608,240)memcpy(1560,4848,240)ink(1)print('G A M E',8,16)ink(4)print('S Y S T E M',20,16)ink(8)print('v0.5.1',26,8)w=0 end function update()w=w+1 if w>90 then cls()load()end end";
void lua_init(const char* filename, const bool start_playing) { void lua_init(const char* filename, const bool start_playing) {
if (lua_state != STATE_STOPPED) lua_quit(); if (lua_state != STATE_STOPPED) lua_quit();
L = luaL_newstate(); L = luaL_newstate();
init_exists = update_exists = false; init_exists = update_exists = false;
bool file_loaded = true; bool file_loaded = true;
if (filename == NULL) {
if (luaL_loadstring(L, boot)) {
debug("BOOT ERROR");
debug(lua_tostring(L, -1));
lua_pop(L,1);
setmode(0);
file_loaded = false;
}
} else {
if (luaL_loadfile(L, filename)) { if (luaL_loadfile(L, filename)) {
debug("ERROR LOADING GAME"); debug("ERROR LOADING GAME");
debug(lua_tostring(L, -1)); debug(lua_tostring(L, -1));
@@ -281,6 +292,7 @@ void lua_init(const char* filename, const bool start_playing) {
setmode(0); setmode(0);
file_loaded = false; file_loaded = false;
} }
}
lua_pushcfunction(L,cpp_cls); lua_setglobal(L, "cls"); lua_pushcfunction(L,cpp_cls); lua_setglobal(L, "cls");
lua_pushcfunction(L,cpp_ink); lua_setglobal(L, "ink"); lua_pushcfunction(L,cpp_ink); lua_setglobal(L, "ink");