Skip to content

Commit

Permalink
Merge pull request #89 from myst6re/fix/field-open-error-no-texts-no-…
Browse files Browse the repository at this point in the history 
…musics

Fix/field open error no texts no musics
  • Loading branch information
@myst6re
myst6re authored Sep 26, 2020
2 parents b1ba9ca + 00cd39e commit 25cdd12
Show file tree
Hide file tree
Showing 11 changed files with 616 additions and 376 deletions.
353 changes: 213 additions & 140 deletions Makou_Reactor_fr.ts
View file

Large diffs are not rendered by default.

348 changes: 208 additions & 140 deletions Makou_Reactor_ja.ts
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Parameters.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
** along with this program. If not, see <http://www.gnu.org/licenses/>.
****************************************************************************/
#define PROG_NAME "Makou Reactor"
#define PROG_VERSION "1.8.1"
#define PROG_VERSION "1.8.2"
#define PROG_FULLNAME QString("%1 %2").arg(PROG_NAME, PROG_VERSION)

#define RC_PRODUCT_VERSION 1,8,1,0
#define RC_PRODUCT_VERSION 1,8,2,0
#define RC_FILE_DESCRIPTION_STR "Makou Reactor FF7 Field Editor"
#define RC_COMPANY_NAME_STR "myst6re"

Expand Down
22 changes: 8 additions & 14 deletions Window.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1329,21 +1329,15 @@ void Window::importToCurrentMap()

QFile bsxDevice(dialog.bsxPath()), mimDevice(dialog.mimPath());

qint8 error = field->importer(path, isDat, isCompressed, parts, &bsxDevice, &mimDevice);

QString out;
switch (error)
{
case 0:
setModified();
index = path.lastIndexOf('/');
Config::setValue("importPath", index == -1 ? path : path.left(index));
openField(true);
break;
case 1: out = tr("Error reopening file"); break;
case 2: out = tr("Invalid file"); break;
if (!field->importer(path, isDat, isCompressed, parts, &bsxDevice, &mimDevice)) {
QMessageBox::warning(this, tr("Error"), field->errorString());
return;
}
if (!out.isEmpty()) QMessageBox::warning(this, tr("Error"), out);

setModified();
index = path.lastIndexOf('/');
Config::setValue("importPath", index == -1 ? path : path.left(index));
openField(true);
}

void Window::varManager()
Expand Down
6 changes: 4 additions & 2 deletions core/field/EncounterFile.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ bool EncounterFile::isBattleEnabled(Table tableID) const

void EncounterFile::setBattleEnabled(Table tableID, bool enabled)
{
tables[(int)tableID].enabled = enabled;
setModified(true);
if (tables[(int)tableID].enabled != quint8(enabled)) {
tables[(int)tableID].enabled = enabled;
setModified(true);
}
}
137 changes: 95 additions & 42 deletions core/field/Field.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,29 +91,23 @@ bool Field::open(bool dontOptimize)

return true;
}

qint8 Field::open(const QString &path, bool isDat, bool compressed,
/*
bool Field::open(const QString &path, bool isDat, bool compressed,
QIODevice *device2)
{
qint8 ret = importer(path, isDat, compressed,
_isOpen = importer(path, isDat, compressed,
Field::FieldSection(0xFFFF), // Everything
device2);
if (ret == 0) {
_isOpen = true;
}
return ret;
return _isOpen;
}
qint8 Field::open(const QByteArray &data, bool isPSField, QIODevice *device2)
bool Field::open(const QByteArray &data, bool isPSField, QIODevice *device2)
{
qint8 ret = importer(data, isPSField,
_isOpen = importer(data, isPSField,
Field::FieldSection(0xFFFF), // Everything
device2);
if (ret == 0) {
_isOpen = true;
}
return ret;
}
return _isOpen;
}*/

int Field::sectionSize(FieldSection part) const
{
Expand Down Expand Up @@ -399,19 +393,31 @@ qint8 Field::save(const QString &path, bool compress)
return 0;
}

qint8 Field::importer(const QString &path, bool isDat, bool compressed, FieldSections part, QIODevice *bsxDevice,
bool Field::importer(const QString &path, bool isDat, bool compressed, FieldSections part, QIODevice *bsxDevice,
QIODevice *mimDevice)
{
QFile fic(path);
if (!fic.open(QIODevice::ReadOnly)) return 1;
if (fic.size() > 10000000) return 2;
if (!fic.open(QIODevice::ReadOnly)) {
_lastError = fic.errorString();
return false;
}
if (fic.size() > 10000000) {
_lastError = QObject::tr("File size greater than 10000000");
return false;
}

QByteArray data;

if (compressed) { // compressed field
quint32 fileSize=0;
if (fic.read((char *)&fileSize, 4) != 4) return 2;
if (fileSize+4 != fic.size()) return 2;
if (fic.read((char *)&fileSize, 4) != 4) {
_lastError = fic.errorString();
return false;
}
if (fileSize+4 != fic.size()) {
_lastError = QObject::tr("Malformed LZS header");
return false;
}

data = LZS::decompressAll(fic.readAll());
} else { // uncompressed field
Expand All @@ -429,14 +435,17 @@ bool Field::importModelLoader(const QByteArray &sectionData, bool isPSField, QIO
return false;
}

qint8 Field::importer(const QByteArray &data, bool isPSField, FieldSections part, QIODevice *bsxDevice,
bool Field::importer(const QByteArray &data, bool isPSField, FieldSections part, QIODevice *bsxDevice,
QIODevice *mimDevice)
{
if (isPSField) {
quint32 sectionPositions[7];
const int headerSize = 28;

if (data.size() < headerSize) return 2;
if (data.size() < headerSize) {
_lastError = QObject::tr("Incorrect field file size");
return false;
}
memcpy(sectionPositions, data.constData(), headerSize); // header
qint32 vramDiff = sectionPositions[0] - headerSize;// vram section1 pos - real section 1 pos

Expand All @@ -446,47 +455,67 @@ qint8 Field::importer(const QByteArray &data, bool isPSField, FieldSections part

if (part.testFlag(Scripts)) {
Section1File *section1 = scriptsAndTexts(false);
if (!section1->open(data.mid(sectionPositions[0], sectionPositions[1]-sectionPositions[0]))) return 2;
if (!section1->open(data.mid(sectionPositions[0], sectionPositions[1]-sectionPositions[0]))) {
_lastError = QObject::tr("Cannot open section 1 (texts, scripts and musics)");
return false;
}
section1->setModified(true);
}
if (part.testFlag(Akaos)) {
TutFile *_tut = tutosAndSounds(false);
if (!_tut->open(data.mid(sectionPositions[0], sectionPositions[1]-sectionPositions[0]))) return 2;
if (!_tut->open(data.mid(sectionPositions[0], sectionPositions[1]-sectionPositions[0]))) {
_lastError = QObject::tr("Cannot open tutos section");
return false;
}
_tut->setModified(true);
}
if (part.testFlag(Encounter)) {
EncounterFile *enc = encounter(false);
if (!enc->open(data.mid(sectionPositions[5], sectionPositions[6]-sectionPositions[5]))) return 2;
if (!enc->open(data.mid(sectionPositions[5], sectionPositions[6]-sectionPositions[5]))) {
_lastError = QObject::tr("Cannot open encounters section");
return false;
}
enc->setModified(true);
}
if (part.testFlag(Walkmesh)) {
IdFile *walk = walkmesh(false);
if (!walk->open(data.mid(sectionPositions[1], sectionPositions[2]-sectionPositions[1]))) return 2;
if (!walk->open(data.mid(sectionPositions[1], sectionPositions[2]-sectionPositions[1]))) {
_lastError = QObject::tr("Cannot open walkmesh section");
return false;
}
walk->setModified(true);
}
if (part.testFlag(Camera)) {
CaFile *ca = camera(false);
if (!ca->open(data.mid(sectionPositions[3], sectionPositions[4]-sectionPositions[3]))) return 2;
if (!ca->open(data.mid(sectionPositions[3], sectionPositions[4]-sectionPositions[3]))) {
_lastError = QObject::tr("Cannot open camera section");
return false;
}
ca->setModified(true);
}
if (part.testFlag(Inf)) {
InfFile *inf = this->inf(false);
if (!inf->open(data.mid(sectionPositions[4], sectionPositions[5]-sectionPositions[4]))) return 2;
if (!inf->open(data.mid(sectionPositions[4], sectionPositions[5]-sectionPositions[4]))) {
_lastError = QObject::tr("Cannot open info section");
return false;
}
inf->setMapName(name());
inf->setModified(true);
}
if (part.testFlag(ModelLoader)) {
if (!importModelLoader(data.mid(sectionPositions[6]), isPSField, bsxDevice)) {
return 2;
_lastError = QObject::tr("Cannot open model loader section");
return false;
}
}
if (part.testFlag(Background)) {
if (!mimDevice) {
qWarning() << "Field::importer Additional device need to be initialized";
return 2;
return false;
}
if (!mimDevice->open(QIODevice::ReadOnly)) {
return 1;
_lastError = mimDevice->errorString();
return false;
}

QByteArray mimData = LZS::decompressAllWithHeader(mimDevice->readAll()),
Expand All @@ -504,7 +533,8 @@ qint8 Field::importer(const QByteArray &data, bool isPSField, FieldSections part
if (isPC()) {
delete bg;
}
return 2;
_lastError = QObject::tr("Cannot open background section");
return false;
}
if (isPC()) {
_parts.insert(Background, new BackgroundFilePC(bg->toPC(static_cast<FieldPC *>(this))));
Expand All @@ -516,43 +546,65 @@ qint8 Field::importer(const QByteArray &data, bool isPSField, FieldSections part
} else {
quint32 sectionPositions[9];

if (data.size() < 6 + 9 * 4) return 3;
if (data.size() < 6 + 9 * 4) {
_lastError = QObject::tr("Incorrect field file size");
return false;
}
memcpy(sectionPositions, data.constData() + 6, 9 * 4); // header

if (part.testFlag(Scripts)) {
Section1File *section1 = scriptsAndTexts(false);
if (!section1->open(data.mid(sectionPositions[0]+4, sectionPositions[1]-sectionPositions[0]-4))) return 2;
if (!section1->open(data.mid(sectionPositions[0]+4, sectionPositions[1]-sectionPositions[0]-4))) {
_lastError = QObject::tr("Cannot open section 1 (texts, scripts and musics)");
return false;
}
section1->setModified(true);
}
if (part.testFlag(Akaos)) {
TutFile *_tut = tutosAndSounds(false);
if (!_tut->open(data.mid(sectionPositions[0]+4, sectionPositions[1]-sectionPositions[0]-4))) return 2;
if (!_tut->open(data.mid(sectionPositions[0]+4, sectionPositions[1]-sectionPositions[0]-4))) {
_lastError = QObject::tr("Cannot open tutos section");
return false;
}
_tut->setModified(true);
}
if (part.testFlag(ModelLoader)) {
if (!importModelLoader(data.mid(sectionPositions[1]+4, sectionPositions[2]-sectionPositions[1]-4),
if (!importModelLoader(data.mid(sectionPositions[2]+4, sectionPositions[3]-sectionPositions[2]-4),
isPSField, bsxDevice)) {
return 2;
_lastError = QObject::tr("Cannot open model loader section");
return false;
}
}
if (part.testFlag(Encounter)) {
EncounterFile *enc = encounter(false);
if (!enc->open(data.mid(sectionPositions[6]+4, sectionPositions[7]-sectionPositions[6]-4))) return 2;
if (!enc->open(data.mid(sectionPositions[6]+4, sectionPositions[7]-sectionPositions[6]-4))) {
_lastError = QObject::tr("Cannot open encounters section");
return false;
}
enc->setModified(true);
}
if (part.testFlag(Walkmesh)) {
IdFile *walk = walkmesh(false);
if (!walk->open(data.mid(sectionPositions[4]+4, sectionPositions[5]-sectionPositions[4]-4))) return 2;
if (!walk->open(data.mid(sectionPositions[4]+4, sectionPositions[5]-sectionPositions[4]-4))) {
_lastError = QObject::tr("Cannot open walkmesh section");
return false;
}
walk->setModified(true);
}
if (part.testFlag(Camera)) {
CaFile *ca = camera(false);
if (!ca->open(data.mid(sectionPositions[1]+4, sectionPositions[2]-sectionPositions[1]-4))) return 2;
if (!ca->open(data.mid(sectionPositions[1]+4, sectionPositions[2]-sectionPositions[1]-4))) {
_lastError = QObject::tr("Cannot open camera section");
return false;
}
ca->setModified(true);
}
if (part.testFlag(Inf)) {
InfFile *inf = this->inf(false);
if (!inf->open(data.mid(sectionPositions[7]+4, sectionPositions[8]-sectionPositions[7]-4))) return 2;
if (!inf->open(data.mid(sectionPositions[7]+4, sectionPositions[8]-sectionPositions[7]-4))) {
_lastError = QObject::tr("Cannot open info section");
return false;
}
inf->setMapName(name());
inf->setModified(true);
}
Expand All @@ -572,7 +624,8 @@ qint8 Field::importer(const QByteArray &data, bool isPSField, FieldSections part
if (isPS()) {
delete bg;
}
return 2;
_lastError = QObject::tr("Cannot open background section");
return false;
}
if (isPS()) {
_parts.insert(Background, new BackgroundFilePS(bg->toPS(static_cast<FieldPS *>(this))));
Expand All @@ -583,5 +636,5 @@ qint8 Field::importer(const QByteArray &data, bool isPSField, FieldSections part
}
}

return 0;
return true;
}
13 changes: 8 additions & 5 deletions core/field/Field.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,17 @@ class Field

bool open(bool dontOptimize=false);

qint8 open(const QString &path, bool isDat, bool compressed, QIODevice *device2=0);
qint8 open(const QByteArray &data, bool isPSField, QIODevice *device2=0);
//bool open(const QString &path, bool isDat, bool compressed, QIODevice *device2=0);
//bool open(const QByteArray &data, bool isPSField, QIODevice *device2=0);

void initEmpty();

void setSaved();
bool save(QByteArray &newData, bool compress);
qint8 save(const QString &path, bool compress);
qint8 importer(const QString &path, bool isDat, bool compressed, FieldSections part, QIODevice *bsxDevice = nullptr,
bool importer(const QString &path, bool isDat, bool compressed, FieldSections part, QIODevice *bsxDevice = nullptr,
QIODevice *mimDevice = nullptr);
qint8 importer(const QByteArray &data, bool isPSField, FieldSections part, QIODevice *bsxDevice = nullptr,
bool importer(const QByteArray &data, bool isPSField, FieldSections part, QIODevice *bsxDevice = nullptr,
QIODevice *mimDevice = nullptr);

Section1File *scriptsAndTexts(bool open=true);
Expand Down Expand Up @@ -104,6 +104,9 @@ class Field
inline void setRemoveUnusedSection(bool remove) { // FIXME: only in PC version, ugly hack detected!
_removeUnusedSection = remove;
}
inline const QString &errorString() const {
return _lastError;
}
protected:
virtual int headerSize() const=0;
virtual void openHeader(const QByteArray &fileData)=0;
Expand All @@ -127,7 +130,7 @@ class Field
QHash<FieldSection, FieldPart *> _parts;
FieldArchiveIO *_io;
bool _isOpen, _isModified;
QString _name;
QString _name, _lastError;
bool _removeUnusedSection;
};

Expand Down
Loading

0 comments on commit 25cdd12

Please sign in to comment.