dan
/
TIC-80-guile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1 bank for non Pro build

This commit is contained in:
BADIM-PC\Vadim 2017-12-14 17:19:35 +03:00
parent 295dd90766
commit 272f6af991
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jsapi.c
View File

@ -512,7 +512,7 @@ static duk_ret_t duk_pmem(duk_context* duk)
u32 index = duk_to_int(duk, 0); u32 index = duk_to_int(duk, 0);
if(index >= 0 && index < TIC_PERSISTENT_SIZE) if(index < TIC_PERSISTENT_SIZE)
{ {
s32 val = memory->ram.persistent.data[index]; s32 val = memory->ram.persistent.data[index];

2
src/luaapi.c
View File

@ -981,7 +981,7 @@ static s32 lua_pmem(lua_State *lua)
{ {
u32 index = getLuaNumber(lua, 1); u32 index = getLuaNumber(lua, 1);
if(index >= 0 && index < TIC_PERSISTENT_SIZE) if(index < TIC_PERSISTENT_SIZE)
{ {
s32 val = memory->ram.persistent.data[index]; s32 val = memory->ram.persistent.data[index];

24
src/studio.c
View File

@ -59,6 +59,12 @@
#define POPUP_DUR (TIC_FRAMERATE*2) #define POPUP_DUR (TIC_FRAMERATE*2)
#if defined(TIC80_PRO)
#define TIC_EDITOR_BANKS (TIC_BANKS)
#else
#define TIC_EDITOR_BANKS 1
#endif
typedef struct typedef struct
{ {
u8 data[16]; u8 data[16];
@ -198,11 +204,11 @@ static struct
struct struct
{ {
Code* code[TIC_BANKS]; Code* code [TIC_EDITOR_BANKS];
Sprite* sprite[TIC_BANKS]; Sprite* sprite [TIC_EDITOR_BANKS];
Map* map[TIC_BANKS]; Map* map [TIC_EDITOR_BANKS];
Sfx* sfx[TIC_BANKS]; Sfx* sfx [TIC_EDITOR_BANKS];
Music* music[TIC_BANKS]; Music* music [TIC_EDITOR_BANKS];
} editor; } editor;
struct struct
@ -607,7 +613,7 @@ static void drawBankIcon(s32 x, s32 y)
enum{Size = TOOLBAR_SIZE}; enum{Size = TOOLBAR_SIZE};
for(s32 i = 0; i < TIC_BANKS; i++) for(s32 i = 0; i < TIC_EDITOR_BANKS; i++)
{ {
SDL_Rect rect = {x + 2 + (i+1)*Size, 0, Size, Size}; SDL_Rect rect = {x + 2 + (i+1)*Size, 0, Size, Size};
@ -1085,7 +1091,7 @@ static void initModules()
{ {
tic_mem* tic = studio.tic; tic_mem* tic = studio.tic;
for(s32 i = 0; i < TIC_BANKS; i++) for(s32 i = 0; i < TIC_EDITOR_BANKS; i++)
{ {
initCode(studio.editor.code[i], studio.tic, &tic->cart.banks[i].code); initCode(studio.editor.code[i], studio.tic, &tic->cart.banks[i].code);
initSprite(studio.editor.sprite[i], studio.tic, &tic->cart.banks[i].tiles); initSprite(studio.editor.sprite[i], studio.tic, &tic->cart.banks[i].tiles);
@ -2606,7 +2612,7 @@ static void onFSInitialized(FileSystem* fs)
studio.tic = studio.tic80local->memory; studio.tic = studio.tic80local->memory;
{ {
for(s32 i = 0; i < TIC_BANKS; i++) for(s32 i = 0; i < TIC_EDITOR_BANKS; i++)
{ {
studio.editor.code[i] = SDL_malloc(sizeof(Code)); studio.editor.code[i] = SDL_malloc(sizeof(Code));
studio.editor.sprite[i] = SDL_malloc(sizeof(Sprite)); studio.editor.sprite[i] = SDL_malloc(sizeof(Sprite));
@ -2718,7 +2724,7 @@ s32 main(s32 argc, char **argv)
#endif #endif
{ {
for(s32 i = 0; i < TIC_BANKS; i++) for(s32 i = 0; i < TIC_EDITOR_BANKS; i++)
{ {
SDL_free(studio.editor.code[i]); SDL_free(studio.editor.code[i]);
SDL_free(studio.editor.sprite[i]); SDL_free(studio.editor.sprite[i]);