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

Changed: Minor changes

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2015-12-15 14:07:32 +01:00
parent 70196d2f90
commit a550f2c760
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/src/misc/common.cpp
View file

@ -708,7 +708,7 @@ bool launchProgram(const std::string &programName, const std::string &arguments,
} }
string arg = " " + 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) if (res)
{ {

10
code/ryzom/server/src/entities_game_service/game_item_manager/game_item_manager.cpp
View file

@ -918,8 +918,9 @@ NLMISC_COMMAND(createItem,"create a new item","<sheet id><quality>")
// return false; // return false;
// } // }
// //
// CEntityId itemId( RYZOMID::object, NLMISC::fromString(args[0].c_str()) ); // CEntityId itemId( RYZOMID::object, NLMISC::fromString(args[0]) );
// //uint16 quality = (uint16)NLMISC::fromString(args[1].c_str()); // //uint16 quality;
// //NLMISC::fromString(args[1]; quality);
// //
// sint32 x; // sint32 x;
// NLMISC::fromString(args[2], x); // NLMISC::fromString(args[2], x);
@ -957,9 +958,10 @@ NLMISC_COMMAND(createItem,"create a new item","<sheet id><quality>")
// } // }
// else // else
// { // {
// CEntityId itemId( RYZOMID::object, NLMISC::fromString(args[0].c_str()) ); // CEntityId itemId( RYZOMID::object, NLMISC::fromString(args[0]) );
// CSheetId sheetId(args[1]); // 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 x = (sint32)NLMISC::fromString(args[3].c_str()) * 1000;
// sint32 y = (sint32)NLMISC::fromString(args[4].c_str()) * 1000; // sint32 y = (sint32)NLMISC::fromString(args[4].c_str()) * 1000;
// sint32 z = (sint32)NLMISC::fromString(args[5].c_str()) * 1000; // sint32 z = (sint32)NLMISC::fromString(args[5].c_str()) * 1000;

3
code/ryzom/server/src/entities_game_service/player_manager/cdb_branch.h
View file

@ -140,8 +140,7 @@ public:
//get the number of nodes //get the number of nodes
uint16 getNbNodes() const uint16 getNbNodes() const
{ {
return (uint16) return (uint16)_Nodes.size();
_Nodes.size();
} }
/** /**