diff --git a/data/main.lua b/data/main.lua index 0cf2a27..ced4471 100644 --- a/data/main.lua +++ b/data/main.lua @@ -8,9 +8,8 @@ function reload_textures() if surf_sprites then surf.free(surf_sprites) end surf_sprites = surf.load("sprites.gif") if surf_tiles then surf.free(surf_tiles) end - surf_tiles = surf.load("test.gif") - surf.save(surf_tiles, "data/test2.gif",pal.load("test.gif")) - sys.quit() + surf_tiles = surf.load("tiles.gif") + pal.set(pal.load("tiles.gif")) end @@ -18,13 +17,12 @@ function mini.init() reload_textures() pal.trans(0) - --rooms.init() - --shader.init("lynx.glsl") - --editor.enable() + rooms.init() + shader.init("lynx.glsl") + editor.enable() end function mini.update() app.update() - sys.quit() end diff --git a/data/rooms.lua b/data/rooms.lua index 24e392a..fef978a 100644 --- a/data/rooms.lua +++ b/data/rooms.lua @@ -56,7 +56,8 @@ rooms = { end, save = function() - local p = pal.load("tiles.gif") + local p = {} + for i=0,255 do p[i] = {r=i,g=i,b=i} end surf.save(rooms.surf_background, "data/rooms_background"..ROOM_FILE_EXT, p) surf.save(rooms.surf_foreground, "data/rooms_foreground"..ROOM_FILE_EXT, p) surf.save(rooms.surf_items, "data/rooms_items"..ROOM_FILE_EXT, p) diff --git a/data/rooms_background.bin b/data/rooms_background.bin deleted file mode 100644 index 81d1746..0000000 Binary files a/data/rooms_background.bin and /dev/null differ diff --git a/data/rooms_background.gif b/data/rooms_background.gif index f33e26d..7b15853 100644 Binary files a/data/rooms_background.gif and b/data/rooms_background.gif differ diff --git a/data/rooms_foreground.bin b/data/rooms_foreground.bin deleted file mode 100644 index 64bdfa1..0000000 Binary files a/data/rooms_foreground.bin and /dev/null differ diff --git a/data/rooms_foreground.gif b/data/rooms_foreground.gif index 8b7a9a4..3f54985 100644 Binary files a/data/rooms_foreground.gif and b/data/rooms_foreground.gif differ diff --git a/data/rooms_items.bin b/data/rooms_items.bin deleted file mode 100644 index ff7db07..0000000 Binary files a/data/rooms_items.bin and /dev/null differ diff --git a/data/rooms_items.gif b/data/rooms_items.gif index 64a91f9..07a68a5 100644 Binary files a/data/rooms_items.gif and b/data/rooms_items.gif differ