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

Changed: #1469 Getting last version from default branch

Browse source 
--HG--
branch : gsoc2012-fabien
This commit is contained in:
Fabien_HENON 2012-05-26 21:38:30 +02:00
commit dd6f2f2611
7 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
code/nel/include/nel/misc/entity_id.h
View file

@ -470,12 +470,12 @@ public:
/// return a string in form "(a:b:c:d)" where a,b,c,d are components of entity id.
std::string toString() const
{
std::string id;
id.reserve(25);
id+='(';
getDebugString (id);
id+=')';
return id;
std::string ident;
ident.reserve(25);
ident+='(';
getDebugString (ident);
ident+=')';
return ident;
}
/// Read from a debug string, use the same format as toString() (id:type:creator:dynamic) in hexadecimal

2
code/nel/src/3d/driver/opengl/mac/cocoa_application_delegate.h
View file

@ -22,6 +22,8 @@ using NL3D::NLDRIVERGLES::CDriverGL;
#else
using NL3D::NLDRIVERGL::CDriverGL;
#endif
#else
using NL3D::CDriverGL;
#endif
@interface CocoaApplicationDelegate : NSObject

2
code/nel/src/3d/driver/opengl/mac/cocoa_opengl_view.h
View file

@ -41,6 +41,8 @@ using NL3D::NLDRIVERGLES::CDriverGL;
#else
using NL3D::NLDRIVERGL::CDriverGL;
#endif
#else
using NL3D::CDriverGL;
#endif
@interface CocoaOpenGLView : NSOpenGLView<NSTextInputClient>

2
code/nel/src/3d/driver/opengl/mac/cocoa_window_delegate.h
View file

@ -23,6 +23,8 @@ using NL3D::NLDRIVERGLES::CDriverGL;
#else
using NL3D::NLDRIVERGL::CDriverGL;
#endif
#else
using NL3D::CDriverGL;
#endif
@interface CocoaWindowDelegate : NSObject

9
code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp
View file

@ -147,8 +147,9 @@ void readFormId( string& outputFileName )
// get the file type from form name
TFormId fid = (*itIF).first;
string fileType;
bool fileTypeGet = getFileType((*itIF).second, fileType);
if((*itIF).second.empty() || (*itIF).second=="." || (*itIF).second==".." || (*itIF).second[0]=='_' || (*itIF).second.find(".#")==0)
if((*itIF).second.empty() || (*itIF).second=="." || (*itIF).second==".." || ((*itIF).second[0]=='_' && fileType != "sound") || (*itIF).second.find(".#")==0)
{
map<TFormId,string>::iterator itErase = itIF;
++itIF;
@ -156,7 +157,7 @@ void readFormId( string& outputFileName )
}
else
{
if( getFileType( (*itIF).second, fileType ) )
if(fileTypeGet)
{
// insert the association (file type/file type id)
map<string,uint8>::iterator itFT = FileTypeToId.find(fileType);
@ -290,7 +291,8 @@ void makeId( list<string>& dirs )
//-----------------------------------------------
void addId( string fileName )
{
if(fileName.empty() || fileName=="." || fileName==".." || fileName[0]=='_' || fileName.find(".#")==0)
string extStr = CFile::getExtension( fileName );
if(fileName.empty() || fileName=="." || fileName==".." || (fileName[0]=='_' && extStr != "sound") || fileName.find(".#")==0)
{
//nlinfo("Discarding file '%s'", fileName.c_str());
NbFilesDiscarded++;
@ -300,7 +302,6 @@ void addId( string fileName )
{
if( !ExtensionsAllowed.empty() )
{
string extStr = CFile::getExtension( fileName );
if( ExtensionsAllowed.find(extStr) == ExtensionsAllowed.end() )
{
NbFilesDiscarded++;

2
code/ryzom/server/src/monitor_service/service_main.cpp
View file

@ -31,9 +31,9 @@
# define NOMINMAX
# include <WinSock2.h>
# include <Windows.h>
typedef unsigned long ulong;
#endif // NL_OS_WINDOWS
#include <my_global.h>
#include <mysql.h>
using namespace NLMISC;

2
code/ryzom/server/src/server_share/mysql_wrapper.h
View file

@ -28,9 +28,9 @@
#ifdef NL_OS_WINDOWS
# include <WinSock2.h>
# include <Windows.h>
typedef unsigned long ulong;
#endif
#include <my_global.h>
#include <mysql.h>
#include <time.h>