From f4c5683b861c8b1df95d9e2c0bdd5ca634460654 Mon Sep 17 00:00:00 2001 From: otya128 Date: Sat, 10 Dec 2016 19:28:30 +0900 Subject: [PATCH] Add initGraphicPages --- SMILEBASIC/graphic.d | 11 +++++++++++ SMILEBASIC/petitcomputer.d | 9 +-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/SMILEBASIC/graphic.d b/SMILEBASIC/graphic.d index 4af9ac5..c5aed08 100644 --- a/SMILEBASIC/graphic.d +++ b/SMILEBASIC/graphic.d @@ -77,6 +77,17 @@ class Graphic //nnnue paint.buffer = new uint[width * height]; } + void initGraphicPages() + { + petitcom.console.GRPF = createGRPF(petitcom.fontFile); + GRP = new GraphicPage[6]; + for(int i = 0; i < 4; i++) + { + GRP[i] = createEmptyPage(); + } + GRP[4] = createGRPF(petitcom.spriteFile); + GRP[5] = createGRPF(petitcom.BGFile); + } GraphicPage createGRPF(string file) { SDL_RWops* stream = SDL_RWFromFile(toStringz(file), toStringz("rb")); diff --git a/SMILEBASIC/petitcomputer.d b/SMILEBASIC/petitcomputer.d index 238373a..8524fc7 100644 --- a/SMILEBASIC/petitcomputer.d +++ b/SMILEBASIC/petitcomputer.d @@ -479,16 +479,9 @@ class PetitComputer { DerelictSDL2.load(); DerelictSDL2Image.load(); - console.GRPF = graphic.createGRPF(fontFile); - graphic.GRP = new GraphicPage[6]; - for(int i = 0; i < 4; i++) - { - graphic.GRP[i] = graphic.createEmptyPage(); - } + graphic.initGraphicPages(); sprite.sppage = 4; - graphic.GRP[4] = graphic.createGRPF(spriteFile); bgpage = 5; - graphic.GRP[5] = graphic.createGRPF(BGFile); SDL_Init(SDL_INIT_VIDEO); DerelictGL.load();