From 3b07ad440dbba9d28157507bd73a2666bfc9c9d7 Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 15 Dec 2015 14:07:32 +0100 Subject: [PATCH] Changed: Minor changes --- code/nel/src/misc/common.cpp | 2 +- .../game_item_manager/game_item_manager.cpp | 10 ++++++---- .../entities_game_service/player_manager/cdb_branch.h | 3 +-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/code/nel/src/misc/common.cpp b/code/nel/src/misc/common.cpp index 3a8f5e85c..4c0db690e 100644 --- a/code/nel/src/misc/common.cpp +++ b/code/nel/src/misc/common.cpp @@ -708,7 +708,7 @@ bool launchProgram(const std::string &programName, const std::string &arguments, } string arg = " " + arguments; - BOOL res = CreateProcessA(programName.c_str(), (char*)arg.c_str(), 0, 0, FALSE, CREATE_DEFAULT_ERROR_MODE | CREATE_NO_WINDOW, 0, 0, &si, &pi); + BOOL res = CreateProcessA(programName.c_str(), (char*)arg.c_str(), NULL, NULL, FALSE, CREATE_DEFAULT_ERROR_MODE | CREATE_NO_WINDOW, NULL, NULL, &si, &pi); if (res) { diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item_manager.cpp b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item_manager.cpp index 16258192c..72e9b2c8c 100644 --- a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item_manager.cpp +++ b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item_manager.cpp @@ -918,8 +918,9 @@ NLMISC_COMMAND(createItem,"create a new item","") // return false; // } // -// CEntityId itemId( RYZOMID::object, NLMISC::fromString(args[0].c_str()) ); -// //uint16 quality = (uint16)NLMISC::fromString(args[1].c_str()); +// CEntityId itemId( RYZOMID::object, NLMISC::fromString(args[0]) ); +// //uint16 quality; +// //NLMISC::fromString(args[1]; quality); // // sint32 x; // NLMISC::fromString(args[2], x); @@ -957,9 +958,10 @@ NLMISC_COMMAND(createItem,"create a new item","") // } // else // { -// CEntityId itemId( RYZOMID::object, NLMISC::fromString(args[0].c_str()) ); +// CEntityId itemId( RYZOMID::object, NLMISC::fromString(args[0]) ); // CSheetId sheetId(args[1]); -// uint16 quality = (uint16)NLMISC::fromString(args[2].c_str()); +// uint16 quality; +// NLMISC::fromString(args[2], quality); // sint32 x = (sint32)NLMISC::fromString(args[3].c_str()) * 1000; // sint32 y = (sint32)NLMISC::fromString(args[4].c_str()) * 1000; // sint32 z = (sint32)NLMISC::fromString(args[5].c_str()) * 1000; diff --git a/code/ryzom/server/src/entities_game_service/player_manager/cdb_branch.h b/code/ryzom/server/src/entities_game_service/player_manager/cdb_branch.h index bb16436e9..ef76578fd 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/cdb_branch.h +++ b/code/ryzom/server/src/entities_game_service/player_manager/cdb_branch.h @@ -140,8 +140,7 @@ public: //get the number of nodes uint16 getNbNodes() const { - return (uint16) - _Nodes.size(); + return (uint16)_Nodes.size(); } /**