From fade75eba61fb4e1b282c338cf027236e7a2ae21 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Wed, 23 May 2012 22:05:34 +0200 Subject: [PATCH 1/4] Added: Hack to exclude .sound sheets starting with _ from being filtered out from the sheet_id.bin. Sound sheets do not follow the conventional sheets naming pattern at the moment --- code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp b/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp index 50dcf910a..646028c2c 100644 --- a/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp +++ b/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp @@ -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::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::iterator itFT = FileTypeToId.find(fileType); @@ -290,7 +291,8 @@ void makeId( list& 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++; From fa63a284c27ed55a83bd3d9aede43a3024781fa0 Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 24 May 2012 12:56:53 +0200 Subject: [PATCH 2/4] Fixed: #1474 Compilation with new MySQL headers --- code/ryzom/server/src/monitor_service/service_main.cpp | 2 +- code/ryzom/server/src/server_share/mysql_wrapper.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/ryzom/server/src/monitor_service/service_main.cpp b/code/ryzom/server/src/monitor_service/service_main.cpp index d7cdfb6d8..5ca88641e 100644 --- a/code/ryzom/server/src/monitor_service/service_main.cpp +++ b/code/ryzom/server/src/monitor_service/service_main.cpp @@ -31,9 +31,9 @@ # define NOMINMAX # include # include +typedef unsigned long ulong; #endif // NL_OS_WINDOWS -#include #include using namespace NLMISC; diff --git a/code/ryzom/server/src/server_share/mysql_wrapper.h b/code/ryzom/server/src/server_share/mysql_wrapper.h index 59c1d76a7..2bc2489cf 100644 --- a/code/ryzom/server/src/server_share/mysql_wrapper.h +++ b/code/ryzom/server/src/server_share/mysql_wrapper.h @@ -28,9 +28,9 @@ #ifdef NL_OS_WINDOWS # include # include +typedef unsigned long ulong; #endif -#include #include #include From 63191bb27d6795bdfc6fad0de34e3add511c5c1d Mon Sep 17 00:00:00 2001 From: rti Date: Thu, 24 May 2012 16:33:56 +0200 Subject: [PATCH 3/4] Fixed: Build on Mac OS X, "id" is a datatype in objective-c(++) --- code/nel/include/nel/misc/entity_id.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/nel/include/nel/misc/entity_id.h b/code/nel/include/nel/misc/entity_id.h index 4ca446941..96b8db223 100644 --- a/code/nel/include/nel/misc/entity_id.h +++ b/code/nel/include/nel/misc/entity_id.h @@ -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 From e9692f5fea4afb02cf27d8a33c40587007bb13c5 Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 24 May 2012 20:28:19 +0200 Subject: [PATCH 4/4] Fixed: Compilation under Mac OS X without -DWITH_STATIC_DRIVERS=ON --- code/nel/src/3d/driver/opengl/mac/cocoa_application_delegate.h | 2 ++ code/nel/src/3d/driver/opengl/mac/cocoa_opengl_view.h | 2 ++ code/nel/src/3d/driver/opengl/mac/cocoa_window_delegate.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/code/nel/src/3d/driver/opengl/mac/cocoa_application_delegate.h b/code/nel/src/3d/driver/opengl/mac/cocoa_application_delegate.h index 668e61a50..da033c7c1 100644 --- a/code/nel/src/3d/driver/opengl/mac/cocoa_application_delegate.h +++ b/code/nel/src/3d/driver/opengl/mac/cocoa_application_delegate.h @@ -22,6 +22,8 @@ using NL3D::NLDRIVERGLES::CDriverGL; #else using NL3D::NLDRIVERGL::CDriverGL; #endif +#else +using NL3D::CDriverGL; #endif @interface CocoaApplicationDelegate : NSObject diff --git a/code/nel/src/3d/driver/opengl/mac/cocoa_opengl_view.h b/code/nel/src/3d/driver/opengl/mac/cocoa_opengl_view.h index b2b123274..e8acae926 100644 --- a/code/nel/src/3d/driver/opengl/mac/cocoa_opengl_view.h +++ b/code/nel/src/3d/driver/opengl/mac/cocoa_opengl_view.h @@ -41,6 +41,8 @@ using NL3D::NLDRIVERGLES::CDriverGL; #else using NL3D::NLDRIVERGL::CDriverGL; #endif +#else +using NL3D::CDriverGL; #endif @interface CocoaOpenGLView : NSOpenGLView diff --git a/code/nel/src/3d/driver/opengl/mac/cocoa_window_delegate.h b/code/nel/src/3d/driver/opengl/mac/cocoa_window_delegate.h index d35b162d6..53078e95a 100644 --- a/code/nel/src/3d/driver/opengl/mac/cocoa_window_delegate.h +++ b/code/nel/src/3d/driver/opengl/mac/cocoa_window_delegate.h @@ -23,6 +23,8 @@ using NL3D::NLDRIVERGLES::CDriverGL; #else using NL3D::NLDRIVERGL::CDriverGL; #endif +#else +using NL3D::CDriverGL; #endif @interface CocoaWindowDelegate : NSObject