DF 31.21 SDL Windows

develop
Petr Mrázek 2011-03-07 05:01:36 +01:00
parent ec9ccb51f1
commit 47c3f57206
2 changed files with 17 additions and 12 deletions

@ -2091,6 +2091,10 @@
</Group> </Group>
</Offsets> </Offsets>
</Version> </Version>
<Version name="v0.31.21 SDL" os="windows" base="v0.31.20 SDL" >
<PETimeStamp value="0x4D743DA7" />
<MD5 value="3aadcbd781f7d70d5ee552b92c03bc6b" />
</Version>
.-"""-. .-"""-.
' \ ' \

@ -57,12 +57,12 @@ int main (int numargs, const char ** args)
p->readDWord (region_z_offset, (uint32_t &)regionZ); p->readDWord (region_z_offset, (uint32_t &)regionZ);
Maps->Start(); Maps->Start();
/*
vector<DFHack::t_feature> global_features; vector<DFHack::t_feature> global_features;
std::map <DFHack::planecoord, std::vector<DFHack::t_feature *> > local_features; std::map <DFHack::planecoord, std::vector<DFHack::t_feature *> > local_features;
*/
//Maps->ReadLocalFeatures(local_features); bool have_local = Maps->ReadLocalFeatures(local_features);
//Maps->ReadGlobalFeatures(global_features); bool have_global = Maps->ReadGlobalFeatures(global_features);
int32_t cursorX, cursorY, cursorZ; int32_t cursorX, cursorY, cursorZ;
Pos->getCursorCoords(cursorX,cursorY,cursorZ); Pos->getCursorCoords(cursorX,cursorY,cursorZ);
@ -131,14 +131,14 @@ int main (int numargs, const char ** args)
PRINT_FLAG( skyview ); PRINT_FLAG( skyview );
PRINT_FLAG( subterranean ); PRINT_FLAG( subterranean );
PRINT_FLAG( water_table ); PRINT_FLAG( water_table );
//PRINT_FLAG( rained ); PRINT_FLAG( rained );
planecoord pc; planecoord pc;
pc.dim.x=blockX; pc.dim.y=blockY; pc.dim.x=blockX; pc.dim.y=blockY;
PRINT_FLAG( feature_local ); PRINT_FLAG( feature_local );
/*
if( des.feature_local ) if( des.feature_local && have_local )
{ {
printf("%-16s %4d (%2d) %s\n", "", printf("%-16s %4d (%2d) %s\n", "",
block.local_feature, block.local_feature,
@ -146,18 +146,19 @@ int main (int numargs, const char ** args)
sa_feature(local_features[pc][block.local_feature]->type) sa_feature(local_features[pc][block.local_feature]->type)
); );
} }
*/
PRINT_FLAG( feature_global ); PRINT_FLAG( feature_global );
/*
if( des.feature_global ){ if( des.feature_global && have_global )
{
printf("%-16s %4d (%2d) %s\n", "", printf("%-16s %4d (%2d) %s\n", "",
block.global_feature, block.global_feature,
global_features[block.global_feature].type, global_features[block.global_feature].type,
sa_feature(global_features[block.global_feature].type) sa_feature(global_features[block.global_feature].type)
); );
} }
*/
#undef PRINT_FLAG #undef PRINT_FLAG
std::cout << std::endl; std::cout << std::endl;
} }