Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Minor changes

Browse source
This commit is contained in:
kervala 2015-12-17 12:48:57 +01:00
parent 17429dd145
commit e8cf46226a
3 changed files with 197 additions and 193 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/nel/tools/3d/panoply_maker/panoply_maker.cpp
View file

@ -203,7 +203,7 @@ int main(int argc, char* argv[])
{ {
CInfoMaskGeneration infoMaskGen(_Path_Input_TexBases, CInfoMaskGeneration infoMaskGen(_Path_Input_TexBases,
_Path_Input_Masks, _Path_Input_Masks,
_Path_Output_MaksOptimized, _Path_Output_MasksOptimized,
_Path_Output_Gtm, _Path_Output_Gtm,
argv[3], argv[3],
1); 1);
@ -651,6 +651,7 @@ static void BuildColoredVersionForOneBitmap(const CBuildInfo &bi, const std::str
{ {
throw NLMISC::Exception(std::string("Failed to load bitmap ") + actualInputPath + fileNameWithExtension); throw NLMISC::Exception(std::string("Failed to load bitmap ") + actualInputPath + fileNameWithExtension);
} }
if (srcBitmap.PixelFormat != NLMISC::CBitmap::RGBA) if (srcBitmap.PixelFormat != NLMISC::CBitmap::RGBA)
{ {
srcBitmap.convertToType(NLMISC::CBitmap::RGBA); srcBitmap.convertToType(NLMISC::CBitmap::RGBA);
@ -735,6 +736,7 @@ static void BuildColoredVersionForOneBitmap(const CBuildInfo &bi, const std::str
{ {
throw NLMISC::Exception("Bitmap and mask do not have the same size"); throw NLMISC::Exception("Bitmap and mask do not have the same size");
} }
masks.push_back(li); masks.push_back(li);
} }
else else
@ -799,7 +801,7 @@ static void BuildColoredVersionForOneBitmap(const CBuildInfo &bi, const std::str
} }
// save good hlsInfo instance name // save good hlsInfo instance name
hlsTextInstance.Name= outputFileName + bi.OutputFormat; hlsTextInstance.Name = outputFileName + bi.OutputFormat;
nlwarning("Writing %s", outputFileName.c_str()); nlwarning("Writing %s", outputFileName.c_str());
/// Save the result. We let propagate exceptions (if there's no more space disk it useless to continue...) /// Save the result. We let propagate exceptions (if there's no more space disk it useless to continue...)

4
code/ryzom/server/src/ai_service/ai_grp_fauna.cpp
View file

@ -858,12 +858,14 @@ bool CGrpFauna::spawnPop(uint popVersion)
do do
{ {
++_CurrentCycleIndex; ++_CurrentCycleIndex;
} while ( _CurrentCycleIndex<(sint32)cycle._PopList.size() }
while ( _CurrentCycleIndex<(sint32)cycle._PopList.size()
&& !_Populations[cycle._PopList[_CurrentCycleIndex]]); && !_Populations[cycle._PopList[_CurrentCycleIndex]]);
if (_CurrentCycleIndex<(sint32)cycle._PopList.size()) if (_CurrentCycleIndex<(sint32)cycle._PopList.size())
{ {
popVersion=cycle._PopList[_CurrentCycleIndex]; popVersion=cycle._PopList[_CurrentCycleIndex];
if (!timeAllowSpawn(popVersion)) if (!timeAllowSpawn(popVersion))
{ {
popVersion=~0; popVersion=~0;