diff --git a/.gitignore b/.gitignore index c01479d..fe3525b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ scr_min.c tests.lua fake_editor.lua *.bin -bin/* \ No newline at end of file +bin/* +build/* \ No newline at end of file diff --git a/ascii.cpp b/ascii.cpp index 9cbcd79..352ee37 100644 --- a/ascii.cpp +++ b/ascii.cpp @@ -2,7 +2,7 @@ #include #include #include "lua.h" -#include "rom.c" +#include "rom.h" #include "play.h" #include @@ -124,6 +124,18 @@ void reinit() { //SDL_RenderSetLogicalSize(mini_ren, 640, 480); mini_bak = SDL_CreateTexture(mini_ren, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, 256, 192); break; + case 4: + screen_width = 80; + screen_height = 30; + current_color = 0x07; + current_border = 0; + cursor_x = 0; + cursor_y = 0; + char_screen = &mem[0]; + color_screen = &mem[0x1200]; + //SDL_RenderSetLogicalSize(mini_ren, 640, 480); + mini_bak = SDL_CreateTexture(mini_ren, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, 640, 240); + break; } } @@ -297,9 +309,13 @@ int main(int argc,char*argv[]) { case 1: case 2: case 3: + case 4: for (int y=0; y>4)+((chr_color&0x0f)<<4); + } const uint32_t ink_color = palette[chr_color & 0x0f]; const uint32_t paper_color = palette[chr_color >> 4]; const uint8_t chr = CHRSCR(x,y); diff --git a/lagueirtofile b/lagueirtofile new file mode 100644 index 0000000..c93af87 --- /dev/null +++ b/lagueirtofile @@ -0,0 +1,6 @@ +[linux_debug] default +libs = -lSDL2 +cppflags = -D DEBUG -g +executable = ascii +sourcepath = . lua +buildpath = build diff --git a/main.cpp b/main.cpp index 7222c0d..dd73566 100644 --- a/main.cpp +++ b/main.cpp @@ -154,7 +154,7 @@ void refresh_code_editor() { } void init_code_editor() { - mode(0); + mode(4); code.clear(); load_code(); refresh_code_editor(); diff --git a/rom.c b/rom.h similarity index 100% rename from rom.c rename to rom.h