Skip to content

Commit

Permalink
fix: correct the version string for 2.55.x releases
Browse files Browse the repository at this point in the history
  • Loading branch information
@connorjclark
connorjclark committed Apr 25, 2024
1 parent b119635 commit 387e6c0
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 116 deletions.
17 changes: 11 additions & 6 deletions src/base/zdefs.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,9 @@ string generate_zq_about()

bool zquestheader::is_legacy() const
{
return new_version_id_main < 2 || (new_version_id_main == 2 && new_version_id_second < 55);
return new_version_id_main < 2 ||
(new_version_id_main == 2 && new_version_id_second < 55) ||
(new_version_id_main == 2 && new_version_id_second == 55 && new_version_id_release == 0);
}

int8_t zquestheader::getAlphaState() const
Expand Down Expand Up @@ -786,6 +788,13 @@ char const* zquestheader::getVerStr() const
{
switch(zelda_version)
{
case 0x255:
if(new_version_id_fourth > 0)
sprintf(buf, "%d.%d.%d.%d %s", new_version_id_main, new_version_id_second,
new_version_id_third, new_version_id_fourth, getAlphaVerStr());
else sprintf(buf, "%d.%d.%d %s", new_version_id_main, new_version_id_second,
new_version_id_third, getAlphaVerStr());
break;
case 0x254:
sprintf(buf, "2.54 Build %d", build);
break;
Expand Down Expand Up @@ -846,11 +855,7 @@ char const* zquestheader::getVerStr() const
break;
}
}
else if(new_version_id_fourth > 0)
sprintf(buf, "%d.%d.%d.%d %s", new_version_id_main, new_version_id_second,
new_version_id_third, new_version_id_fourth, getAlphaVerStr());
else sprintf(buf, "%d.%d.%d %s", new_version_id_main, new_version_id_second,
new_version_id_third, getAlphaVerStr());
else sprintf(buf, "%d.%d.%d", new_version_id_main, new_version_id_second, new_version_id_third);
return buf;
}

Expand Down
112 changes: 2 additions & 110 deletions src/qst.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2024,116 +2024,8 @@ void print_quest_metadata(zquestheader const& tempheader, char const* path, byte
if(qst_num < moduledata.max_quest_files)
zprint2("Loading module quest %d\n", qst_num+1);
if(path) zprint2("Loading '%s'\n", path);
if ( tempheader.new_version_id_main > 0 )
{
if(tempheader.new_version_id_fourth > 0)
zprint2("Last saved in version %d.%d.%d.%d ",
tempheader.new_version_id_main,tempheader.new_version_id_second,
tempheader.new_version_id_third,tempheader.new_version_id_fourth);
else zprint2("Last saved in version: %d.%d.%d ",
tempheader.new_version_id_main,tempheader.new_version_id_second,
tempheader.new_version_id_third);
}
else
{
switch ( tempheader.zelda_version )
{
case 0x255:
{
zprint2("Last saved in version: 2.55.0, %s: %d", tempheader.getAlphaStr(), tempheader.getAlphaVer());
break;
}
case 0x254:
{
zprint2("Last saved in version: 2.54.0, Alpha Build ID: %d", tempheader.build);
break;
}
case 0x250:
{
switch(tempheader.build)
{
case 19:
zprint2("Last saved in version: 2.50.0, Gamma 1"); break;
case 20:
zprint2("Last saved in version: 2.50.0, Gamma 2"); break;
case 21:
zprint2("Last saved in version: 2.50.0, Gamma 3"); break;
case 22:
zprint2("Last saved in version: 2.50.0, Gamma 4"); break;
case 23:
zprint2("Last saved in version: 2.50.0, Gamma 5"); break;
case 24:
zprint2("Last saved in version: 2.50.0, Release"); break;
case 25:
zprint2("Last saved in version: 2.50.1, Gamma 1"); break;
case 26:
zprint2("Last saved in version: 2.50.1, Gamma 2"); break;
case 27:
zprint2("Last saved in version: 2.50.1, Gamma 3"); break;
case 28:
zprint2("Last saved in version: 2.50.1, Release"); break;
case 29:
zprint2("Last saved in version: 2.50.2, Release"); break;
case 30:
zprint2("Last saved in version: 2.50.3, Gamma 1"); break;
case 31:
zprint2("Last saved in version: 2.53.0, Prior to Gamma 3"); break;
case 32:
zprint2("Last saved in version: 2.53.0"); break;
case 33:
zprint2("Last saved in version: 2.53.1"); break;
default:
zprint2("Last saved in version: %x, Build %d", tempheader.zelda_version,tempheader.build); break;

}
break;
}

case 0x211:
{
zprint2("Last saved in version: 2.11, Beta %d", tempheader.build); break;
}
case 0x210:
{
zprint2("Last saved in version: 2.10.x");
if ( tempheader.build ) zprint2("Beta/Build %d\n", tempheader.build);
break;
}
/* These versions cannot be handled here; they will be incorrect at this time. -Z
case 0x193:
{
zprint2("Last saved in version: 1.93, Beta %d\n", tempheader.build); break;
}
case 0x192:
{
zprint2("Last saved in version: 1.92, Beta %d\n", tempheader.build); break;
}
case 0x190:
{
zprint2("Last saved in version: 1.90, Beta/Build %d\n", tempheader.build); break;
}
case 0x184:
{
zprint2("Last saved in version: 1.84, Beta/Build %d\n", tempheader.build); break;
}
case 0x183:
{
zprint2("Last saved in version: 1.83, Beta/Build %d\n", tempheader.build); break;
}
case 0x180:
{
zprint2("Last saved in version: 1.80, Beta/Build %d\n", tempheader.build); break;
}
default:
{
zprint2("Last saved in version: %x, Beta %d\n", tempheader.zelda_version,tempheader.build); break;
}
*/
}
}
if(!tempheader.is_legacy() && tempheader.getAlphaVer())
zprint2("%s\n", tempheader.getAlphaVerStr());
else zprint2("\n");
zprint2("Last saved in version %s\n", tempheader.getVerStr());

if ( tempheader.made_in_module_name[0] ) zprint2("Created with ZC Module: %s\n\n", tempheader.made_in_module_name);
if ( tempheader.new_version_devsig[0] ) zprint2("Developr Signoff by: %s\n", tempheader.new_version_devsig);
if ( tempheader.new_version_compilername[0] ) zprint2("Compiled with: %s, (ID: %d)\n", tempheader.new_version_compilername, tempheader.compilerid);
Expand Down

0 comments on commit 387e6c0

Please sign in to comment.