diff --git a/imgconvert/main.c b/imgconvert/main.c index 0a37ba6..0543e6e 100644 --- a/imgconvert/main.c +++ b/imgconvert/main.c @@ -27,21 +27,21 @@ void convertColor(char *filename, char *basename, bool showIt) { colors = image->format->palette->ncolors; c = image->format->palette->colors; - jlStaT *sta = NULL; - jlStaCreate(sta); + jlImgT *img = NULL; + jlImgCreate(img); for (int x=0; xpalette[x].r = c[x].r / 16; - sta->palette[x].g = c[x].g / 16; - sta->palette[x].b = c[x].b / 16; - //printf("Palette %03d = R%03d G%03d B%03d\n", x, sta->palette[x].r, sta->palette[x].g, sta->palette[x].b); + img->palette[x].r = c[x].r / 16; + img->palette[x].g = c[x].g / 16; + img->palette[x].b = c[x].b / 16; + //printf("Palette %03d = R%03d G%03d B%03d\n", x, img->palette[x].r, img->palette[x].g, img->palette[x].b); } if (colors < 16) { for (int x=colors; x<16; x++) { - sta->palette[x].r = 0; - sta->palette[x].g = 0; - sta->palette[x].b = 0; + img->palette[x].r = 0; + img->palette[x].g = 0; + img->palette[x].b = 0; //printf("Palette %03d = R000 G000 B000 (added)\n", x); } } @@ -51,22 +51,22 @@ void convertColor(char *filename, char *basename, bool showIt) { for (int x=0; xw; x+=2) { //printf("%02X %02X ", getPixel(image, x, y), getPixel(image, x + 1, y)); // These are backwards - no idea why yet. - sta->pixels[p].r = (unsigned char)getPixel(image, x, y); - sta->pixels[p++].l = (unsigned char)getPixel(image, x + 1, y); + img->pixels[p].r = (unsigned char)getPixel(image, x, y); + img->pixels[p++].l = (unsigned char)getPixel(image, x + 1, y); } } - jlStaSave(sta, basename); + jlImgSave(img, basename); SDL_FreeSurface(image); if (showIt) { - jlStaDisplay(sta); + jlImgDisplay(img); jlDisplayPresent(); jlKeyWaitForAny(); } - jlStaFree(sta); + jlImgFree(img); } @@ -193,7 +193,7 @@ int main(int argc, char *argv[]) { return 1; } - jlUtilStartup("STA/STN Converter"); + jlUtilStartup("IMG/STN Converter"); int imageFlags = IMG_INIT_JPG | IMG_INIT_PNG | IMG_INIT_TIF; int imageResult = IMG_Init(imageFlags); diff --git a/joeylib/src/font.sta b/joeylib/src/font.sta deleted file mode 100644 index f488f74..0000000 Binary files a/joeylib/src/font.sta and /dev/null differ diff --git a/joeylib/src/font.xcf b/joeylib/src/font.xcf new file mode 100644 index 0000000..fd60997 --- /dev/null +++ b/joeylib/src/font.xcf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:749f464714a6bf26132b5dc186488c794d37ed24fd4f11dab2c8090f350abdc8 +size 28884 diff --git a/joeylib/src/kanga.sta b/joeylib/src/kanga.sta deleted file mode 100644 index cef14ce..0000000 Binary files a/joeylib/src/kanga.sta and /dev/null differ diff --git a/joeylib/src/kanga.xcf b/joeylib/src/kanga.xcf new file mode 100644 index 0000000..a15fd9d --- /dev/null +++ b/joeylib/src/kanga.xcf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c11bb1f9ad52e9d62b2212433dc7d54fb06d5b1e48804f41441db4ee2cbda91 +size 9359 diff --git a/scripts/xcf2sta.sh b/scripts/xcf2img.sh similarity index 98% rename from scripts/xcf2sta.sh rename to scripts/xcf2img.sh index 0330b70..b48dd1d 100755 --- a/scripts/xcf2sta.sh +++ b/scripts/xcf2img.sh @@ -49,7 +49,7 @@ fi # Call custom converter ${JOEY}/utils/imgconvert "${FILENAME}-DoNtEvErDoThIs-1.png" "${FILENAME}-DoNtEvErDoThIs-2.png" "${NAME}" -mv "data/${NAME}.sta" . +mv "data/${NAME}.img" . # Remove data folder if we created one if [[ "${HASDATA}" -eq "0" ]]; then