mirror of
https://github.com/mangosfour/server.git
synced 2025-12-12 19:37:03 +00:00
Rebase resync
This commit is contained in:
parent
a0797532e8
commit
1997c1e903
3106 changed files with 11118 additions and 627576 deletions
|
|
@ -10,8 +10,8 @@ bool isHole(int holes, int i, int j)
|
|||
{
|
||||
int testi = i / 2;
|
||||
int testj = j / 4;
|
||||
if(testi > 3) testi = 3;
|
||||
if(testj > 3) testj = 3;
|
||||
if (testi > 3) testi = 3;
|
||||
if (testj > 3) testj = 3;
|
||||
return (holes & holetab_h[testi] & holetab_v[testj]) != 0;
|
||||
}
|
||||
|
||||
|
|
@ -44,7 +44,7 @@ bool ADT_file::prepareLoadedData()
|
|||
return false;
|
||||
|
||||
// Check and prepare MHDR
|
||||
a_grid = (adt_MHDR *)(GetData()+8+version->size);
|
||||
a_grid = (adt_MHDR*)(GetData() + 8 + version->size);
|
||||
if (!a_grid->prepareLoadedData())
|
||||
return false;
|
||||
|
||||
|
|
@ -77,7 +77,7 @@ bool adt_MHDR::prepareLoadedData()
|
|||
if (fcc != 'MHDR')
|
||||
return false;
|
||||
|
||||
if (size!=sizeof(adt_MHDR)-8)
|
||||
if (size != sizeof(adt_MHDR) - 8)
|
||||
return false;
|
||||
|
||||
// Check and prepare MCIN
|
||||
|
|
@ -97,9 +97,9 @@ bool adt_MCIN::prepareLoadedData()
|
|||
return false;
|
||||
|
||||
// Check cells data
|
||||
for (int i=0; i<ADT_CELLS_PER_GRID;i++)
|
||||
for (int j=0; j<ADT_CELLS_PER_GRID;j++)
|
||||
if (cells[i][j].offsMCNK && !getMCNK(i,j)->prepareLoadedData())
|
||||
for (int i = 0; i < ADT_CELLS_PER_GRID; i++)
|
||||
for (int j = 0; j < ADT_CELLS_PER_GRID; j++)
|
||||
if (cells[i][j].offsMCNK && !getMCNK(i, j)->prepareLoadedData())
|
||||
return false;
|
||||
|
||||
return true;
|
||||
|
|
@ -137,7 +137,7 @@ bool adt_MCVT::prepareLoadedData()
|
|||
if (fcc != 'MCVT')
|
||||
return false;
|
||||
|
||||
if (size != sizeof(adt_MCVT)-8)
|
||||
if (size != sizeof(adt_MCVT) - 8)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue