aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-27 01:26:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source
This commit is contained in:
kervala 2016-01-14 23:54:26 +01:00
parent f4d0b123ee
commit e32543564d
3 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/nel/src/misc/bitmap.cpp
View file

@ -19,7 +19,6 @@
#include "nel/misc/bitmap.h" #include "nel/misc/bitmap.h"
#include "nel/misc/stream.h" #include "nel/misc/stream.h"
#include "nel/misc/file.h" #include "nel/misc/file.h"
#include "nel/misc/system_info.h"
// Define this to force all bitmap white (debug) // Define this to force all bitmap white (debug)
// #define NEL_ALL_BITMAP_WHITE // #define NEL_ALL_BITMAP_WHITE
@ -508,6 +507,7 @@ uint8 CBitmap::readDDS(NLMISC::IStream &f, uint mipMapSkip)
// If no mipmap. // If no mipmap.
if(_MipMapCount==0) if(_MipMapCount==0)
_MipMapCount=1; _MipMapCount=1;
switch (_DDSSurfaceDesc[20]) switch (_DDSSurfaceDesc[20])
{ {
case DXTC1HEADER: case DXTC1HEADER:
@ -2761,7 +2761,6 @@ bool CBitmap::writeTGA( NLMISC::IStream &f, uint32 d, bool upsideDown)
for(y=0; y<(sint32)height; y++) for(y=0; y<(sint32)height; y++)
{ {
uint32 k=0; uint32 k=0;
if (PixelFormat == Alpha) if (PixelFormat == Alpha)
{ {

14
code/nel/src/misc/cmd_args.cpp
View file

@ -321,13 +321,6 @@ bool CCmdArgs::parse(const std::vector<std::string> &argv)
} }
} }
// process help if requested or if required arguments are missing
if (haveLongArg("help") || (needRequiredArg() && !haveRequiredArg()))
{
displayHelp();
return false;
}
// process version // process version
if (haveLongArg("version")) if (haveLongArg("version"))
{ {
@ -335,6 +328,13 @@ bool CCmdArgs::parse(const std::vector<std::string> &argv)
return false; return false;
} }
// process help if requested or if required arguments are missing
if (haveLongArg("help") || (needRequiredArg() && !haveRequiredArg()))
{
displayHelp();
return false;
}
return true; return true;
} }

2
code/nel/tools/3d/mesh_export/main.cpp
View file

@ -63,7 +63,7 @@ int main(int argc, char *argv[])
if (settings.DestinationDirectoryPath.empty()) if (settings.DestinationDirectoryPath.empty())
settings.DestinationDirectoryPath = filePath + "_export"; settings.DestinationDirectoryPath = filePath + "_export";
settings.DestinationDirectoryPath = NLMISC::standardizePath(settings.DestinationDirectoryPath); settings.DestinationDirectoryPath = NLMISC::CPath::standardizePath(settings.DestinationDirectoryPath);
if (args.haveLongArg("dependlog")) if (args.haveLongArg("dependlog"))
settings.ToolDependLog = args.getLongArg("dependlog").front(); settings.ToolDependLog = args.getLongArg("dependlog").front();