diff --git a/src/core/paletteutil.cpp b/src/core/paletteutil.cpp index 4080e40c..3a6f7ff7 100644 --- a/src/core/paletteutil.cpp +++ b/src/core/paletteutil.cpp @@ -277,14 +277,14 @@ void PaletteUtil::writeJASC(QString filepath, QVector palette, int offset, return; } - QString text = "JASC-PAL\n0100\n"; - text += QString::number(nColors) + "\n"; + QString text = "JASC-PAL\r\n0100\r\n"; + text += QString::number(nColors) + "\r\n"; for (int i = offset; i < offset + nColors; i++) { QRgb color = palette.at(i); text += QString::number(qRed(color)) + " " + QString::number(qGreen(color)) + " " - + QString::number(qBlue(color)) + "\n"; + + QString::number(qBlue(color)) + "\r\n"; } QFile file(filepath); diff --git a/src/project.cpp b/src/project.cpp index ab01eb21..133cc807 100644 --- a/src/project.cpp +++ b/src/project.cpp @@ -4,6 +4,7 @@ #include "historyitem.h" #include "log.h" #include "parseutil.h" +#include "paletteutil.h" #include "tile.h" #include "tileset.h" #include "event.h" @@ -720,20 +721,10 @@ void Project::saveTilesetTilesImage(Tileset *tileset) { } void Project::saveTilesetPalettes(Tileset *tileset, bool primary) { + PaletteUtil parser; for (int i = 0; i < Project::getNumPalettesTotal(); i++) { QString filepath = tileset->palettePaths.at(i); - QString content = "JASC-PAL\r\n"; - content += "0100\r\n"; - content += "16\r\n"; - for (int j = 0; j < 16; j++) { - QRgb color = tileset->palettes->at(i).at(j); - content += QString("%1 %2 %3\r\n") - .arg(qRed(color)) - .arg(qGreen(color)) - .arg(qBlue(color)); - } - - saveTextFile(filepath, content); + parser.writeJASC(filepath, tileset->palettes->at(i).toVector(), 0, 16); } }