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

Changed: #825 Remove all warning when compiling Ryzom

Browse source
This commit is contained in:
kervala 2010-10-16 18:58:53 +02:00
parent cd0670404a
commit 30ad426e03
3 changed files with 208 additions and 209 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/ryzom/tools/leveldesign/export/export.cpp
View file

@ -1160,7 +1160,7 @@ bool CExport::newExport (SExportOptions &opt, IExportCB *expCB)
_Options->PrimFloraDir = sContinentDir;
sTmp = "Exporting";
if (_ExportCB != NULL) _ExportCB->dispInfo (sTmp);
export (*_Options, _ExportCB, &vExportPrimitives);
doExport (*_Options, _ExportCB, &vExportPrimitives);
// Copy new files for incremental purpose
CTools::chdir (_ExeDir);
@ -1236,7 +1236,7 @@ bool CExport::newExport (SExportOptions &opt, IExportCB *expCB)
}
// ---------------------------------------------------------------------------
bool CExport::export (SExportOptions &opt, IExportCB *expCB, vector<SExportPrimitive> *selection)
bool CExport::doExport (SExportOptions &opt, IExportCB *expCB, vector<SExportPrimitive> *selection)
{
char sTmp[MAX_PATH];
GetCurrentDirectory (MAX_PATH, sTmp);

2
code/ryzom/tools/leveldesign/export/export.h
View file

@ -127,7 +127,7 @@ public:
// Parse the SourceDir find the .land and .prim
// newExport is the incremental export
bool newExport (SExportOptions &options, IExportCB *expCB = NULL);
bool export (SExportOptions &options, IExportCB *expCB = NULL, std::vector<SExportPrimitive> *selection = NULL);
bool doExport (SExportOptions &options, IExportCB *expCB = NULL, std::vector<SExportPrimitive> *selection = NULL);
// HELPERS
// Get All files with the extension ext in the current directory and subdirectory

1
code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp
View file

@ -34,7 +34,6 @@
#include "nel/ligo/zone_region.h"
#include "nel/ligo/zone_bank.h"
#include "nel/../../src/pacs/collision_mesh_build.h"