openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Minor change to the Windows Scenario Editor:

Browse Source 
Previously, when saving a scenario, it wrote uninitialized variables in lieu of the hashed/encrypted values that the original editor used for password checking. (Stored in flag_a, flag_b, etc.) That made it incompatible with earlier editors (such as Super Editor), which expected a password of "0", which is to say, data hashed using 0 as the argument.

This commit just adds the old password code back in, and saving now gives all scenarios a password of "0". Loading behavior is still unchanged.

git-svn-id: http://openexile.googlecode.com/svn/trunk@163 4ebdad44-0ea0-11de-aab3-ff745001d230
This commit is contained in:
Icelizarrd
2011-06-20 05:20:53 +00:00
parent ecb123b6ab
commit c8200e94ac
2 changed files with 142 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
Win32/Scenario Editor/tfileio.cpp
View File

@@ -231,6 +231,18 @@ void save_scenario()
scenario.flag3 = 60; scenario.flag3 = 60;
scenario.flag4 = 80; /// these mean made on PC scenario.flag4 = 80; /// these mean made on PC
// now password flags -- these are for temporary compatibility with older scenario editors (like Super Editor).
// Just set the password to 0.
scenario.flag_a = sizeof(scenario_data_type) + get_ran(1,-1000,1000);
scenario.flag_b = town_s(0);
scenario.flag_c = out_s(0);
scenario.flag_e = str_size_1(0);
scenario.flag_f = str_size_2(0);
scenario.flag_h = str_size_3(0);
scenario.flag_g = 10000 + get_ran(1,0,5000);
scenario.flag_d = init_data(0);
// scenario data // scenario data
if(WriteFile(dummy_f, &scenario, sizeof(scenario_data_type), &dwByteRead, NULL) == FALSE){ if(WriteFile(dummy_f, &scenario, sizeof(scenario_data_type), &dwByteRead, NULL) == FALSE){
CloseHandle(file_id); CloseHandle(dummy_f);oops_error(15); CloseHandle(file_id); CloseHandle(dummy_f);oops_error(15);
@@ -3321,6 +3333,132 @@ void alter_rect(RECT16 *r)
r->right = a; r->right = a;
} }
short init_data(short flag)
{
// password hashing. Only used to write an "empty" password into the file.
long k = 0;
k = (long) flag;
k = k * k;
jl = jl * jl + 84 + k;
k = k + 51;
jl = jl * 2 + 1234 + k;
k = k % 3000;
jl = jl * 54;
jl = jl * 2 + 1234 + k;
k = k * 82;
k = k % 10000;
k = k + 10000;
return (short) k;
}
short town_s(short flag)
{
// password hashing. Only used to write an "empty" password into the file.
long k = 0;
k = (long) flag;
k = k * k * k;
jl = jl * 54;
jl = jl * 2 + 1234 + k;
k = k + 51;
k = k % 3000;
jl = jl * 2 + 1234 + k;
k = k * scenario.num_towns;
k = k % 10000;
jl = jl * jl + 84 + k;
k = k + 10000;
return (short) k;
}
short out_s(short flag)
{
// password hashing. Only used to write an "empty" password into the file.
long k = 0;
k = (long) flag;
k = k * k * k;
jl = jl * jl + 84 + k;
k = k + scenario.out_data_size[0][1];
k = k % 3000;
k = k * 4;
jl = jl * 2 + 1234 + k;
jl = jl * 54;
jl = jl * 2 + 1234 + k;
k = k % 10000;
k = k + 4;
return (short) k;
}
short str_size_1(short flag)
{
// password hashing. Only used to write an "empty" password into the file.
long k = 0;
k = (long) flag;
k = k * k;
jl = jl * 2 + 1234 + k;
jl = jl * jl + 84 + k;
k = k + scenario.scen_str_len[0] + scenario.scen_str_len[1] + scenario.scen_str_len[2];
jl = jl * 2 + 1234 + k;
k = k % 3000;
jl = jl * 54;
jl = jl * jl + 84 + k;
k = k * 4;
k = k % 5000;
k = k - 9099;
return (short) k;
}
short str_size_2(short flag)
{
// password hashing. Only used to write an "empty" password into the file.
long k = 0;
k = (long) flag;
jl = jl * jl + 84 + k;
k = k * k * k * k;
jl = jl * 54;
k = k + 80;
k = k % 3000;
jl = jl * 2 + 1234 + k;
k = k * scenario.out_width * scenario.out_height;
jl = jl * jl + 84 + k;
k = k % 3124;
k = k - 5426;
return (short) k;
}
short str_size_3(short flag)
{
// password hashing. Only used to write an "empty" password into the file.
long k = 0;
k = (long) flag;
k = k * (scenario.town_data_size[0][0] + scenario.town_data_size[0][1] + scenario.town_data_size[0][2] + scenario.town_data_size[0][3]);
k = k + 80;
jl = jl * jl + 84 + k;
k = k % 3000;
jl = jl * 2 + 1234 + k;
k = k * 45;
jl = jl * 54;
jl = jl * jl + 84 + k;
k = k % 887;
k = k + 9452;
return (short) k;
}
/* /*
void import_outdoors(location which_out) void import_outdoors(location which_out)
{ {

3
Win32/Scenario Editor/tfileio.h
View File

@@ -38,4 +38,7 @@ void flip_rect(RECT16 *s);
void alter_rect(RECT16 *r); void alter_rect(RECT16 *r);
void object_scenario_data_dump(); void object_scenario_data_dump();
void start_outdoor_data_dump(); void start_outdoor_data_dump();
// relics from the past--for temporary backwards compatibility with older scenario editor.
short init_data(short flag);
short town_s(short flag); short town_s(short flag);