Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Merged: default in gsoc2012-fabien

Browse Source 
--HG--
branch : gsoc2012-fabien
hg/feature/gsoc2012-fabien
Fabien_HENON 12 years ago
parent b0858977e7 d44cbd240c
commit b22e255762
23 changed files with 721 additions and 131 deletions
Show Stats Download Patch File Download Diff File

5
.hgignore
Unescape Escape View File

@ -156,6 +156,11 @@ code/build/*
build/*
install/*
code/build_nFV/*
code/build/*
externals/*
*/test_mfc/*
# Linux nel compile
code/nel/build/nel-config
code/nel/config.status

1
code/nel/src/3d/point_light.cpp
Unescape Escape View File

@ -40,6 +40,7 @@ CPointLight::CPointLight() : _LightedModels(/*&_LightedModelListMemory*/)
_Diffuse= _Specular= CRGBA::White;
// Default setup. this is arbitrary
_Type= PointLight;
_AttenuationBegin= 10;
_AttenuationEnd= 30;

2
code/nel/src/3d/render_trav.cpp
Unescape Escape View File

@ -623,7 +623,7 @@ void CRenderTrav::changeLightSetup(CLightContribution *lightContribution, bool
uint i;
// if same lightContribution, no-op.
if(_CacheLightContribution == lightContribution && _LastLocalAttenuation == useLocalAttenuation)
if (_CacheLightContribution == lightContribution && (lightContribution == NULL || _LastLocalAttenuation == useLocalAttenuation))
return;
// else, must setup the lights into driver.
else

3
code/nel/src/3d/visual_collision_mesh.cpp
Unescape Escape View File

@ -512,7 +512,8 @@ void CVisualCollisionMesh::receiveShadowMap(const NLMISC::CMatrix &instanceMatr
}
// if triangle not clipped, add the triangle
if( (triFlag & NL3D_VCM_SHADOW_NUM_CLIP_PLANE_MASK)==0 )
// if( (triFlag & NL3D_VCM_SHADOW_NUM_CLIP_PLANE_MASK)==0 )
if (triFlag == 0) // previous line not useful due to init
{
// Add the 3 index to the index buffer.
ibPtr[currentTriIdx++]= (uint16) triId[0];

2
code/nel/src/misc/fixed_size_allocator.cpp
Unescape Escape View File

@ -100,7 +100,7 @@ CFixedSizeAllocator::CChunk::~CChunk()
nlassert(NumFreeObjs == 0);
nlassert(Allocator->_NumChunks > 0);
-- (Allocator->_NumChunks);
delete Mem;
delete[] Mem;
}
// *****************************************************************************************************************

2
code/nel/src/misc/path.cpp
Unescape Escape View File

@ -83,7 +83,7 @@ CFileContainer::~CFileContainer()
{
if( _AllFileNames )
{
delete _AllFileNames;
delete[] _AllFileNames;
_AllFileNames = NULL;
}
}

37
code/nel/src/misc/sheet_id.cpp
Unescape Escape View File

@ -47,7 +47,7 @@ std::map<std::string, uint32> CSheetId::_DevSheetNameToId;
#define NL_TEMP_YUBO_NO_SOUND_SHEET_ID
#ifdef NL_TEMP_YUBO_NO_SOUND_SHEET_ID
namespace { bool a_NoSoundSheetId = false; }
namespace { bool a_NoSoundSheetId = false; const uint32 a_NoSoundSheetType = 80; }
#endif
const CSheetId CSheetId::Unknown(0);
@ -110,18 +110,25 @@ CSheetId::CSheetId( const string& sheetName )
*this = Unknown;
}
// nldebug("LIST_SHEET_ID: %s (%s)", toString().c_str(), sheetName.c_str());
} // CSheetId //
CSheetId::CSheetId( const std::string& sheetName, const std::string &defaultType )
{
if (CFile::getExtension(sheetName) == "" && defaultType != "")
// Don't use this function without defaultType, use the one above.
nlassert(defaultType.size() != 0);
if (sheetName.rfind('.') == std::string::npos)
{
std::string withType = sheetName + "." + defaultType;
*this = CSheetId(withType);
// nldebug("SHEETID: Constructing CSheetId from name '%s' without explicit type, defaulting as '%s' to '%s'", sheetName.c_str(), defaultType.c_str(), withType.c_str());
}
else
{
*this = CSheetId(sheetName);
}
}
@ -152,13 +159,18 @@ bool CSheetId::buildSheetId(const std::string& sheetName)
_DevSheetIdToName.push_back(std::vector<std::string>());
typeId = _FileExtensions.size() - 1;
_DevTypeNameToId[sheetType] = typeId;
std::string unknownNewType = std::string("unknown." + sheetType);
_DevSheetIdToName[typeId].push_back(unknownNewType);
_Id.IdInfos.Type = typeId;
_Id.IdInfos.Id = _DevSheetIdToName[typeId].size() - 1;
_DevSheetNameToId[unknownNewType] = _Id.Id;
}
else
{
typeId = tit->second;
_Id.IdInfos.Type = typeId;
}
_DevSheetIdToName[typeId].push_back(sheetName);
_Id.IdInfos.Type = typeId;
_DevSheetIdToName[typeId].push_back(sheetNameLc);
_Id.IdInfos.Id = _DevSheetIdToName[typeId].size() - 1;
// nldebug("SHEETID: Type %i, id %i, sheetid %i", _Id.IdInfos.Type, _Id.IdInfos.Id, _Id.Id);
_DevSheetNameToId[sheetNameLc] = _Id.Id;
@ -206,10 +218,9 @@ bool CSheetId::buildSheetId(const std::string& sheetName)
std::map<std::string, uint32>::iterator it = _DevSheetNameToId.find(sheetNameLc);
if (it == _DevSheetNameToId.end())
{
uint32 typeId = ((1 << (NL_SHEET_ID_TYPE_BITS)) - 1);
// nldebug("SHEETID: Creating a temporary sheet id for '%s'", sheetName.c_str());
_DevSheetIdToName[0].push_back(sheetName);
_Id.IdInfos.Type = typeId;
_Id.IdInfos.Type = a_NoSoundSheetType;
_Id.IdInfos.Id = _DevSheetIdToName[0].size() - 1;
_DevSheetNameToId[sheetNameLc] = _Id.Id;
return true;
@ -377,8 +388,15 @@ void CSheetId::init(bool removeUnknownSheet)
{
nlwarning("SHEETID: Loading without known sound sheet id, please update sheet_id.bin with .sound sheets");
nlassert(_FileExtensions.size() == 1 << (NL_SHEET_ID_TYPE_BITS));
_FileExtensions[((1 << (NL_SHEET_ID_TYPE_BITS)) - 1)] == "sound";
nlassert(_FileExtensions[a_NoSoundSheetType].empty());
_FileExtensions[a_NoSoundSheetType] == "sound";
_DevSheetIdToName.push_back(std::vector<std::string>());
_DevSheetIdToName[0].push_back("unknown.sound");
TSheetId id;
id.IdInfos.Type = a_NoSoundSheetType;
id.IdInfos.Id = _DevSheetIdToName[0].size() - 1;
nlassert(id.IdInfos.Id == 0);
_DevSheetNameToId["unknown.sound"] = id.Id;
a_NoSoundSheetId = true;
}
#endif
@ -450,6 +468,9 @@ CSheetId& CSheetId::operator=( const string& sheetName )
if (!buildSheetId(sheetName))
*this = Unknown;
// nldebug("LIST_SHEET_ID: %s (%s)", toString().c_str(), sheetName.c_str());
return *this;
} // operator= //
@ -513,7 +534,7 @@ string CSheetId::toString(bool ifNotFoundUseNumericId) const
else
{
#ifdef NL_TEMP_YUBO_NO_SOUND_SHEET_ID
if (a_NoSoundSheetId && _Id.IdInfos.Type == ((1 << (NL_SHEET_ID_TYPE_BITS)) - 1))
if (a_NoSoundSheetId && _Id.IdInfos.Type == a_NoSoundSheetType)
{
return _DevSheetIdToName[0][_Id.IdInfos.Id];
}

3
code/nel/src/sound/complex_source.cpp
Unescape Escape View File

@ -28,7 +28,8 @@ namespace NLSOUND
CComplexSource::CComplexSource (CComplexSound *soundPattern, bool spawn, TSpawnEndCallback cb, void *cbUserParam, NL3D::CCluster *cluster, CGroupController *groupController)
: CSourceCommon(soundPattern, spawn, cb, cbUserParam, cluster, groupController),
_Source1(NULL),
_Source2(NULL)
_Source2(NULL),
_Muted(false)
{
nlassert(soundPattern->getSoundType() == CSound::SOUND_COMPLEX);
_PatternSound = static_cast<CComplexSound*>(soundPattern);

10
code/nel/tools/3d/object_viewer/edit_ps_sound.cpp
Unescape Escape View File

@ -159,7 +159,7 @@ END_MESSAGE_MAP()
void CEditPSSound::OnBrowseSound()
{
// CPickSound::TNameVect names;
vector<NLMISC::TStringId> names;
vector<NLMISC::CSheetId> names;
NLSOUND::UAudioMixer *audioMixer = CSoundSystem::getAudioMixer();
@ -172,7 +172,7 @@ void CEditPSSound::OnBrowseSound()
if (ps.DoModal() == IDOK)
{
m_SoundName = NLMISC::CStringMapper::unmap(ps.getName()).c_str();
m_SoundName = ps.getName().toString().c_str();
_Sound->setSoundName(ps.getName());
updateModifiedFlag();
UpdateData(FALSE);
@ -184,7 +184,7 @@ BOOL CEditPSSound::OnInitDialog()
CDialog::OnInitDialog();
nlassert(_Sound);
m_SoundName = NLMISC::CStringMapper::unmap(_Sound->getSoundName()).c_str();
m_SoundName = _Sound->getSoundName().toString().c_str();
UpdateData(FALSE);
return TRUE; // return TRUE unless you set the focus to a control
@ -195,7 +195,7 @@ void CEditPSSound::OnChangeSoundName()
{
nlassert(_Sound);
UpdateData();
_Sound->setSoundName( NLMISC::CStringMapper::map((LPCTSTR) m_SoundName) );
_Sound->setSoundName(NLMISC::CSheetId((LPCTSTR)m_SoundName, "sound"));
updateModifiedFlag();
}
@ -209,7 +209,7 @@ void CEditPSSound::OnSpawn()
// play the currently selected sound
void CEditPSSound::OnPlaySound()
{
CSoundSystem::play(std::string((LPCTSTR) m_SoundName));
CSoundSystem::play(std::string((LPCTSTR)m_SoundName));
}
void CEditPSSound::OnMute()

4
code/nel/tools/3d/object_viewer/pick_sound.cpp
Unescape Escape View File

@ -74,7 +74,7 @@ BOOL CPickSound::OnInitDialog()
for (TNameVect::iterator it = _Names.begin(); it != _Names.end(); ++it)
{
m_NameList.AddString(NLMISC::CStringMapper::unmap(*it).c_str());
m_NameList.AddString((*it).toString().c_str());
}
_Timer = SetTimer (1, 100, NULL);
@ -111,7 +111,7 @@ void CPickSound::OnSelchange()
nlassert(m_NameList.GetTextLen(m_NameList.GetCurSel()) < 1024);
m_NameList.GetText(m_NameList.GetCurSel(), str);
_CurrName = NLMISC::CStringMapper::map(str);
_CurrName = NLMISC::CSheetId(str, "sound");
}

8
code/nel/tools/3d/object_viewer/pick_sound.h
Unescape Escape View File

@ -23,7 +23,7 @@
#endif // _MSC_VER > 1000
// pick_sound.h : header file
//
#include "nel/misc/string_mapper.h"
#include "nel/misc/sheet_id.h"
#include <vector>
#include <string>
@ -40,11 +40,11 @@ class CPickSound : public CDialog
{
// Construction
public:
typedef std::vector<NLMISC::TStringId> TNameVect;
typedef std::vector<NLMISC::CSheetId> TNameVect;
CPickSound(const TNameVect &names, CWnd* pParent = NULL); // standard constructor
const NLMISC::TStringId &getName(void) const { return _CurrName; }
const NLMISC::CSheetId &getName(void) const { return _CurrName; }
// Dialog Data
//{{AFX_DATA(CPickSound)
@ -63,7 +63,7 @@ public:
// Implementation
protected:
TNameVect _Names;
NLMISC::TStringId _CurrName;
NLMISC::CSheetId _CurrName;
UINT_PTR _Timer;

10
code/nel/tools/3d/object_viewer/sound_anim_dlg.cpp
Unescape Escape View File

@ -126,18 +126,18 @@ void CSoundAnimDlg::updateSounds()
{
if (_SelectedMarker != 0)
{
vector<NLMISC::TStringId> sounds;
vector<NLMISC::CSheetId> sounds;
_SelectedMarker->getSounds(sounds);
CListBox* list = (CListBox*) GetDlgItem(IDC_SOUND_ANIM_LIST);
list->ResetContent();
vector<NLMISC::TStringId>::iterator iter;
vector<NLMISC::CSheetId>::iterator iter;
for (iter = sounds.begin(); iter != sounds.end(); iter++)
{
list->AddString(CStringMapper::unmap(*iter).c_str());
list->AddString((*iter).toString().c_str());
}
list->UpdateData();
@ -151,7 +151,7 @@ void CSoundAnimDlg::OnAddSound()
if (_SelectedMarker != 0)
{
// CPickSound::TNameVect names;
vector<NLMISC::TStringId> names;
vector<NLMISC::CSheetId> names;
NLSOUND::UAudioMixer *audioMixer = CSoundSystem::getAudioMixer();
@ -183,7 +183,7 @@ void CSoundAnimDlg::OnRemoveSound()
if (list->GetText(list->GetCurSel(), s) != LB_ERR)
{
string name(s);
_SelectedMarker->removeSound(CStringMapper::map(name));
_SelectedMarker->removeSound(NLMISC::CSheetId(name, "sound"));
updateSounds();
}
}

4
code/nel/tools/3d/object_viewer/sound_system.cpp
Unescape Escape View File

@ -168,7 +168,7 @@ void CSoundSystem::play(const string &soundName)
{
if (_AudioMixer)
{
NLSOUND::USource *src = _AudioMixer->createSource(CStringMapper::map(soundName), true);
NLSOUND::USource *src = _AudioMixer->createSource(NLMISC::CSheetId(soundName, "sound"), true);
if (src)
{
src->setLooping(false);
@ -187,7 +187,7 @@ USource *CSoundSystem::create(const std::string &soundName)
{
if (_AudioMixer)
{
NLSOUND::USource *src = _AudioMixer->createSource(CStringMapper::map(soundName), false);
NLSOUND::USource *src = _AudioMixer->createSource(NLMISC::CSheetId(soundName, "sound"), false);
if (src)
{
src->setLooping(false);

15
code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp
Unescape Escape View File

@ -336,16 +336,27 @@ void addId( string fileName )
if( firstFreeFileTypeId == -1 )
{
nlwarning("MORE THAN 256 FILE TYPES!!!!");
return;
}
else
{
FileTypeToId.insert( make_pair(fileType,(uint8)firstFreeFileTypeId) );
IdToFileType.insert( make_pair((uint8)firstFreeFileTypeId,fileType) );
TypeToLastId.insert( make_pair((uint8)firstFreeFileTypeId,0) );
// Reserve id 0 for unknown.newtype.
// User may supply a sheet called unknown.newtype
// that can safely be used as a fallback when a
// requested sheet does not exist.
// Only for newly added sheet types.
fid.FormIDInfos.Type = (uint8)firstFreeFileTypeId;
fid.FormIDInfos.Id = 0;
std::string unknownNewType = std::string("unknown." + fileType);
FormToId.insert(make_pair(unknownNewType, fid));
IdToForm.insert(make_pair(fid, unknownNewType));
TypeToLastId.insert( make_pair((uint8)firstFreeFileTypeId,1) );
fid.FormIDInfos.Id = 1;
nlinfo("Adding file type '%s' with id %d", fileType.c_str(), firstFreeFileTypeId);
NbTypesAdded++;
}

23
code/ryzom/client/src/interface_v3/group_html.cpp
Unescape Escape View File

@ -223,7 +223,7 @@ bool CGroupHTML::addBnpDownload(const string &url, const string &action, const s
#ifdef LOG_DL
nlwarning("add to download '%s' dest '%s'", url.c_str(), dest.c_str());
#endif
// erase the tmp file if exists
if (NLMISC::CFile::fileExists(tmpdest))
NLMISC::CFile::deleteFile(tmpdest);
@ -622,7 +622,7 @@ void CGroupHTML::addLink (uint element_number, uint /* attribute_number */, HTCh
_LinkTitle.push_back("");
}
}
}
}
@ -948,7 +948,7 @@ void CGroupHTML::beginElement (uint element_number, const BOOL *present, const c
typedef pair<string, string> TTmplParam;
vector<TTmplParam> tmplParams;
string templateName;
if (!style.empty())
{
@ -1044,12 +1044,12 @@ void CGroupHTML::beginElement (uint element_number, const BOOL *present, const c
CRGBA bgColor = getColor (value[HTML_BODY_BGCOLOR]);
setBackgroundColor (bgColor);
}
string style;
if (present[HTML_BODY_STYLE] && value[HTML_BODY_STYLE])
style = value[HTML_BODY_STYLE];
if (!style.empty())
{
TStyle styles = parseStyle(style);
@ -1057,7 +1057,7 @@ void CGroupHTML::beginElement (uint element_number, const BOOL *present, const c
it = styles.find("background-repeat");
bool repeat = (it != styles.end() && it->second == "1");
// Webig only
it = styles.find("background-scale");
bool scale = (it != styles.end() && it->second == "1");
@ -1187,7 +1187,7 @@ void CGroupHTML::beginElement (uint element_number, const BOOL *present, const c
if (it != styles.end() && (*it).second == "1")
reloadImg = true;
}
addImage (value[MY_HTML_IMG_SRC], globalColor, reloadImg);
}
}
@ -1838,6 +1838,7 @@ CGroupHTML::CGroupHTML(const TCtorParam &param)
_GroupHtmlByUID[_GroupHtmlUID]= this;
// init
_TrustedDomain = false;
_ParsingLua = false;
_IgnoreText = false;
_BrowseNextTime = false;
@ -2469,7 +2470,7 @@ void CGroupHTML::addString(const ucstring &str)
getParagraph()->addChild (buttonGroup);
paragraphChange ();
}
}
else
{
@ -3706,14 +3707,14 @@ int CGroupHTML::luaRemoveContent(CLuaState &ls)
}
// ***************************************************************************
int CGroupHTML::luaInsertText(CLuaState &ls)
int CGroupHTML::luaInsertText(CLuaState &ls)
{
const char *funcName = "insertText";
CLuaIHM::checkArgCount(ls, funcName, 3);
CLuaIHM::checkArgType(ls, funcName, 1, LUA_TSTRING);
CLuaIHM::checkArgType(ls, funcName, 2, LUA_TSTRING);
CLuaIHM::checkArgType(ls, funcName, 3, LUA_TBOOLEAN);
string name = ls.toString(1);
ucstring text;

7
code/ryzom/client/unix/ryzom.desktop.in
Unescape Escape View File

@ -3,11 +3,14 @@ Version=1.0
Name=Ryzom
Name[ru]=Ризом
Type=Application
GenericName=ryzom
GenericName=Game client
Comment=Ryzom client
Comment[fr_FR]=Client Ryzom
Exec=${RYZOM_BIN_PREFIX}/ryzom_client
TryExec=${RYZOM_GAMES_PREFIX}/ryzom_client
Exec=${RYZOM_GAMES_PREFIX}/ryzom_client
Icon=ryzom
Terminal=false
Hidden=false
Categories=Game;RolePlaying;
StartupWMClass=ryzom
X-AppInstall-Package=ryzom-client

BIN
code/ryzom/common/data_leveldesign/leveldesign/Game_elem/sheet_id.bin
View File

Binary file not shown.

599
code/ryzom/common/data_leveldesign/primitives/newbieland/urban_newbieland.primitive
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<PRIMITIVES VERSION="1">
<ROOT_PRIMITIVE TYPE="CPrimNode">
<ALIAS LAST_GENERATED="1269"/>
<ALIAS LAST_GENERATED="1271"/>
<CHILD TYPE="CPrimZone">
<PROPERTY TYPE="string">
<NAME>class</NAME>
@ -117,19 +117,68 @@
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>WELCOME_RYZOM_CORE</STRING>
<STRING>GUILD_MISSION</STRING>
</PROPERTY>
<PROPERTY TYPE="string_array">
<NAME>script</NAME>
<STRING># script generated from 'urban_newbieland.primitive'</STRING>
<STRING># script generated from 'guild_missions.primitive'</STRING>
<STRING></STRING>
<STRING>#mission tags and pre-requisites</STRING>
<STRING>replayable</STRING>
<STRING>guild</STRING>
<STRING>mission_category : Killing</STRING>
<STRING></STRING>
<STRING>#Variables declaration</STRING>
<STRING>decl : bot : giver</STRING>
<STRING>decl : bot : player</STRING>
<STRING>decl : bot : chiang_the_strong</STRING>
<STRING></STRING>
<STRING>#pre-requisites</STRING>
<STRING>req_guild</STRING>
<STRING>req_grade : Leader</STRING>
<STRING></STRING>
<STRING>#script</STRING>
<STRING>mission_title : GUILD_MISSION_TITLE</STRING>
<STRING>mission_desc : GUILD_MISSION_DESC</STRING>
<STRING># step</STRING>
<STRING>spawn_mission : SOLO_GUILD_MISSION : chiang_the_strong : guild</STRING>
<STRING>set_obj : MIS_DO_MISSION</STRING>
<STRING>mission : SOLO_GUILD_MISSION 2</STRING>
<STRING>kill_fauna : chdfa1 2</STRING>
<STRING>recv_money : 100: guild</STRING>
<STRING>recv_money : 50</STRING>
<STRING></STRING>
</PROPERTY>
<CHILD TYPE="CPrimAlias">
<ALIAS VALUE="1268"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>alias</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>alias</STRING>
</PROPERTY>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>mission</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>SOLO_GUILD_MISSION</STRING>
</PROPERTY>
<PROPERTY TYPE="string_array">
<NAME>script</NAME>
<STRING># script generated from 'guild_missions.primitive'</STRING>
<STRING></STRING>
<STRING>#mission tags and pre-requisites</STRING>
<STRING>replayable</STRING>
<STRING>solo</STRING>
<STRING>mission_category : Killing</STRING>
<STRING>player_replay_timer : 10</STRING>
<STRING>global_replay_timer : 10</STRING>
<STRING>mission_icon : tets</STRING>
<STRING>not_proposed</STRING>
<STRING></STRING>
<STRING>#Variables declaration</STRING>
<STRING>decl : bot : giver</STRING>
@ -139,15 +188,15 @@
<STRING>#pre-requisites</STRING>
<STRING></STRING>
<STRING>#script</STRING>
<STRING>mission_title : WELCOME_RYZOM_CORE_TITLE</STRING>
<STRING>mission_desc : WELCOME_RYZOM_CORE_DESC</STRING>
<STRING># step_4</STRING>
<STRING>mission_title : SOLO_GUILD_MISSION_TITLE</STRING>
<STRING>mission_desc : SOLO_GUILD_MISSION_DESC</STRING>
<STRING># step</STRING>
<STRING>kill_fauna : chdfa1 1</STRING>
<STRING>recv_money : 10000</STRING>
<STRING>recv_money : 20</STRING>
<STRING></STRING>
</PROPERTY>
<CHILD TYPE="CPrimAlias">
<ALIAS VALUE="1256"/>
<ALIAS VALUE="1269"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>alias</STRING>
@ -165,7 +214,7 @@
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>HUNTING_GROUNDS</STRING>
<STRING>WELCOME_RYZOM_CORE</STRING>
</PROPERTY>
<PROPERTY TYPE="string_array">
<NAME>script</NAME>
@ -173,11 +222,11 @@
<STRING></STRING>
<STRING>#mission tags and pre-requisites</STRING>
<STRING>replayable</STRING>
<STRING>guild</STRING>
<STRING>solo</STRING>
<STRING>mission_category : Killing</STRING>
<STRING>player_replay_timer : 10</STRING>
<STRING>global_replay_timer : 10</STRING>
<STRING>mission_icon : test</STRING>
<STRING>mission_icon : tets</STRING>
<STRING></STRING>
<STRING>#Variables declaration</STRING>
<STRING>decl : bot : giver</STRING>
@ -185,23 +234,20 @@
<STRING>decl : bot : chiang_the_strong</STRING>
<STRING></STRING>
<STRING>#pre-requisites</STRING>
<STRING>req_guild</STRING>
<STRING>req_grade : Leader</STRING>
<STRING></STRING>
<STRING>#script</STRING>
<STRING>mission_title : WELCOME_RYZOM_CORE_DESC</STRING>
<STRING>mission_desc : WELCOME_RYZOM_CORE_TITLE</STRING>
<STRING>mission_title : WELCOME_RYZOM_CORE_TITLE</STRING>
<STRING>mission_desc : WELCOME_RYZOM_CORE_DESC_BLAH</STRING>
<STRING># step_4</STRING>
<STRING>spawn_mission : WELCOME_RYZOM_CORE : chiang_the_strong : guild</STRING>
<STRING>set_obj : MIS_DO_MISSION</STRING>
<STRING>mission : WELCOME_RYZOM_CORE 2</STRING>
<STRING>kill_fauna : chdfa1 2</STRING>
<STRING>recv_money : 100000</STRING>
<STRING>recv_money : 20: guild</STRING>
<STRING>camera_animation : MY_CAMERA_ANIMATION</STRING>
<STRING>sound_trigger : my_sound_name : here</STRING>
<STRING>kill_fauna : chdfa1 1</STRING>
<STRING>recv_money : 10000</STRING>
<STRING>sound_trigger : sfsd : sdfsdf</STRING>
<STRING></STRING>
</PROPERTY>
<CHILD TYPE="CPrimAlias">
<ALIAS VALUE="1262"/>
<ALIAS VALUE="1256"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>alias</STRING>
@ -219,16 +265,19 @@
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>GUILD_MISSION</STRING>
<STRING>HUNTING_GROUNDS</STRING>
</PROPERTY>
<PROPERTY TYPE="string_array">
<NAME>script</NAME>
<STRING># script generated from 'guild_missions.primitive'</STRING>
<STRING># script generated from 'urban_newbieland.primitive'</STRING>
<STRING></STRING>
<STRING>#mission tags and pre-requisites</STRING>
<STRING>replayable</STRING>
<STRING>guild</STRING>
<STRING>mission_category : Killing</STRING>
<STRING>player_replay_timer : 10</STRING>
<STRING>global_replay_timer : 10</STRING>
<STRING>mission_icon : test</STRING>
<STRING></STRING>
<STRING>#Variables declaration</STRING>
<STRING>decl : bot : giver</STRING>
@ -240,19 +289,16 @@
<STRING>req_grade : Leader</STRING>
<STRING></STRING>
<STRING>#script</STRING>
<STRING>mission_title : GUILD_MISSION_TITLE</STRING>
<STRING>mission_desc : GUILD_MISSION_DESC</STRING>
<STRING># step</STRING>
<STRING>spawn_mission : SOLO_GUILD_MISSION : chiang_the_strong : guild</STRING>
<STRING>set_obj : MIS_DO_MISSION</STRING>
<STRING>mission : SOLO_GUILD_MISSION 2</STRING>
<STRING>mission_title : WELCOME_RYZOM_CORE_DESC</STRING>
<STRING>mission_desc : WELCOME_RYZOM_CORE_TITLE</STRING>
<STRING># step_4</STRING>
<STRING>kill_fauna : chdfa1 2</STRING>
<STRING>recv_money : 100: guild</STRING>
<STRING>recv_money : 50</STRING>
<STRING>recv_money : 100000</STRING>
<STRING>recv_money : 20: guild</STRING>
<STRING></STRING>
</PROPERTY>
<CHILD TYPE="CPrimAlias">
<ALIAS VALUE="1268"/>
<ALIAS VALUE="1262"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>alias</STRING>
@ -270,17 +316,19 @@
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>SOLO_GUILD_MISSION</STRING>
<STRING>NEW</STRING>
</PROPERTY>
<PROPERTY TYPE="string_array">
<NAME>script</NAME>
<STRING># script generated from 'guild_missions.primitive'</STRING>
<STRING># script generated from 'urban_newbieland.primitive'</STRING>
<STRING></STRING>
<STRING>#mission tags and pre-requisites</STRING>
<STRING>replayable</STRING>
<STRING>solo</STRING>
<STRING>mission_category : Killing</STRING>
<STRING>not_proposed</STRING>
<STRING>mission_category : Kiling</STRING>
<STRING>player_replay_timer : 10</STRING>
<STRING>global_replay_timer : 1</STRING>
<STRING>need_validation</STRING>
<STRING></STRING>
<STRING>#Variables declaration</STRING>
<STRING>decl : bot : giver</STRING>
@ -290,15 +338,17 @@
<STRING>#pre-requisites</STRING>
<STRING></STRING>
<STRING>#script</STRING>
<STRING>mission_title : SOLO_GUILD_MISSION_TITLE</STRING>
<STRING>mission_desc : SOLO_GUILD_MISSION_DESC</STRING>
<STRING># step</STRING>
<STRING>kill_fauna : chdfa1 1</STRING>
<STRING>recv_money : 20</STRING>
<STRING>mission_title : dddd</STRING>
<STRING>mission_desc : gg</STRING>
<STRING># step_4</STRING>
<STRING>sound_trigger : sound : here</STRING>
<STRING>camera_animation : MY_CAMERA_ANIMATION</STRING>
<STRING>kill_fauna : chdfa1 2</STRING>
<STRING>recv_money : 10000</STRING>
<STRING></STRING>
</PROPERTY>
<CHILD TYPE="CPrimAlias">
<ALIAS VALUE="1269"/>
<ALIAS VALUE="1271"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>alias</STRING>
@ -786,7 +836,7 @@
</PROPERTY>
<PROPERTY TYPE="string_array">
<NAME>mission_description</NAME>
<STRING>WELCOME_RYZOM_CORE_DESC</STRING>
<STRING>WELCOME_RYZOM_CORE_DESC_BLAH</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>mission_giver</NAME>
@ -907,6 +957,38 @@
<NAME>name</NAME>
<STRING>pre_actions</STRING>
</PROPERTY>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>animation_name</NAME>
<STRING>MY_CAMERA_ANIMATION</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>camera_animation</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>camera animation</STRING>
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>sound_trigger</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>sound_trigger_autre</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>sound_name</NAME>
<STRING>my_sound_name</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>sound_position</NAME>
<STRING>here</STRING>
</PROPERTY>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
@ -947,6 +1029,24 @@
<STRING>recv_money</STRING>
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>sound_trigger</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>sound_trigger_2</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>sound_name</NAME>
<STRING>sfsd</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>sound_position</NAME>
<STRING>sdfsdf</STRING>
</PROPERTY>
</CHILD>
</CHILD>
</CHILD>
</CHILD>
@ -1114,24 +1214,6 @@
<NAME>name</NAME>
<STRING>pre_actions</STRING>
</PROPERTY>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>spawn_mission</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>giver_name</NAME>
<STRING>chiang_the_strong</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>guild</NAME>
<STRING>true</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>mission_name</NAME>
<STRING>WELCOME_RYZOM_CORE</STRING>
</PROPERTY>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
@ -1142,20 +1224,6 @@
<NAME>name</NAME>
<STRING>objectives</STRING>
</PROPERTY>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>do_mission</STRING>
</PROPERTY>
<PROPERTY TYPE="string_array">
<NAME>mission_names</NAME>
<STRING>WELCOME_RYZOM_CORE 2</STRING>
</PROPERTY>
<PROPERTY TYPE="string_array">
<NAME>overload_objective</NAME>
<STRING>MIS_DO_MISSION</STRING>
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
@ -1207,6 +1275,379 @@
</CHILD>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>audience</NAME>
<STRING>solo</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>mission_tree</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>giver_primitive</NAME>
<STRING>urban_newbieland.primitive</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>global_replay_timer</NAME>
<STRING>1</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>mission_category</NAME>
<STRING>Kiling</STRING>
</PROPERTY>
<PROPERTY TYPE="string_array">
<NAME>mission_description</NAME>
<STRING>gg</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>mission_giver</NAME>
<STRING>$givervar@fullname$</STRING>
</PROPERTY>
<PROPERTY TYPE="string_array">
<NAME>mission_title</NAME>
<STRING>dddd</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>NEW</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>player_replay_timer</NAME>
<STRING>10</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>replayable</NAME>
<STRING>true</STRING>
</PROPERTY>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>variables</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>variables</STRING>
</PROPERTY>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>var_npc</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>givervar = chiang_the_strong (fct_ranger_leader)</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>npc_function</NAME>
<STRING>fct_ranger_leader</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>npc_name</NAME>
<STRING>chiang_the_strong</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>var_name</NAME>
<STRING>givervar</STRING>
</PROPERTY>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>pre_requisite</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>pre_requisite</STRING>
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimAlias">
<ALIAS VALUE="1270"/>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>alias</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>alias</STRING>
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>step</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>step_4</STRING>
</PROPERTY>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>actions</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>pre_actions</STRING>
</PROPERTY>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>sound_trigger</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>sound_trigger</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>sound_name</NAME>
<STRING>sound</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>sound_position</NAME>
<STRING>here</STRING>
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>animation_name</NAME>
<STRING>MY_CAMERA_ANIMATION</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>camera_animation</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>MY_CAMERA_ANIMATION</STRING>
</PROPERTY>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>mission_objectives</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>objectives</STRING>
</PROPERTY>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>kill</STRING>
</PROPERTY>
<PROPERTY TYPE="string_array">
<NAME>fauna/quantity</NAME>
<STRING>chdfa1 2</STRING>
</PROPERTY>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>actions</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>post_actions</STRING>
</PROPERTY>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>amount</NAME>
<STRING>10000</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>recv_money</STRING>
</PROPERTY>
</CHILD>
</CHILD>
</CHILD>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>camera_animations_editor</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>camera_animations_editor_3</STRING>
</PROPERTY>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>camera_animation_tree</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>MY_CAMERA_ANIMATION</STRING>
</PROPERTY>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>camera_animation_go_to</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>duration</NAME>
<STRING>3</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>end_position</NAME>
<STRING>here or there</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>look_at_position</NAME>
<STRING>i look there</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>go to npc in 3 sec</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>text</NAME>
<STRING>First step</STRING>
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>camera_animation_static</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>duration</NAME>
<STRING>2</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>look_at_position</NAME>
<STRING>hhmmm there</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>stay here for 2 sec with shake effect</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>text</NAME>
<STRING>2nd step</STRING>
</PROPERTY>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>camera_modifier_shake</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>shake</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>strength</NAME>
<STRING>10000</STRING>
</PROPERTY>
</CHILD>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>camera_animation_static</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>duration</NAME>
<STRING>2</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>look_at_position</NAME>
<STRING>eheh here now</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>move look at position for 2 sec</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>text</NAME>
<STRING>3rd step</STRING>
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>camera_animation_follow_entity</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>distance_to_entity</NAME>
<STRING>50</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>duration</NAME>
<STRING>10</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>entity_to_follow</NAME>
<STRING>a man</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>look_at_position</NAME>
<STRING>i look at him</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>follow entity for 10 sec</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>text</NAME>
<STRING>4th step</STRING>
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>camera_animation_turn_around</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>distance_to_point</NAME>
<STRING>10</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>duration</NAME>
<STRING>2</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>look_at_position</NAME>
<STRING>i don't know</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>turn around</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>point_to_turn_around</NAME>
<STRING>this point</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>speed</NAME>
<STRING>23</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>text</NAME>
<STRING>5th step</STRING>
</PROPERTY>
</CHILD>
<CHILD TYPE="CPrimNode">
<PROPERTY TYPE="string">
<NAME>class</NAME>
<STRING>camera_animation_return</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>duration</NAME>
<STRING>2</STRING>
</PROPERTY>
<PROPERTY TYPE="string">
<NAME>name</NAME>
<STRING>go back in 2sec</STRING>
</PROPERTY>
</CHILD>
</CHILD>
</CHILD>
</ROOT_PRIMITIVE>
</PRIMITIVES>

4
code/ryzom/common/src/game_share/fame.cpp
Unescape Escape View File

@ -320,9 +320,9 @@ CStaticFames::CStaticFames()
//----------------------------------------------------------------------------
CStaticFames::~CStaticFames()
{
delete _FameTable;
delete[] _FameTable;
_FameTable = NULL;
delete _PropagationFactorTable;
delete[] _PropagationFactorTable;
_PropagationFactorTable = NULL;
}

2
code/ryzom/server/frontend_service.cfg
Unescape Escape View File

@ -6,7 +6,7 @@
BandwidthRatio = 1;
FSUDPPort = 47851;
FSListenHost = "192.168.1.112";
FSListenHost = "open.ryzom.com";
#include "frontend_service_default.cfg"

105
code/ryzom/server/shard_start_cmake_full.bat
Unescape Escape View File

@ -0,0 +1,105 @@
@echo off
REM This script will start all the services with good parameters
REM set MODE=Debug
set MODE=..\..\build\bin\Debug
rem AS
start %MODE%\ryzom_admin_service.exe --fulladminname=admin_executor_service --shortadminname=AES
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem bms_master
start %MODE%\ryzom_backup_service --writepid -P49990
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem egs
start %MODE%\ryzom_entities_game_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem gpms
start %MODE%\ryzom_gpm_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem ios
start %MODE%\ryzom_ios_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem rns
start %MODE%\ryzom_naming_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem rws
start %MODE%\ryzom_welcome_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem ts
start %MODE%\ryzom_tick_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem ms
start %MODE%\ryzom_mirror_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem ais_newbyland
start %MODE%\ryzom_ai_service --writepid -mCommon:Newbieland:Post
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem mfs
start %MODE%\ryzom_mail_forum_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem su
start %MODE%\ryzom_shard_unifier_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem fes
start %MODE%\ryzom_frontend_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem sbs
start %MODE%\ryzom_session_browser_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem lgs
start %MODE%\ryzom_logger_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem lgs
start %MODE%\ryzom_dynamic_scenario_service --writepid
rem wait 2s (yes, i didn't find a better way to wait N seconds)
ping -n 2 127.0.0.1 > NUL 2>&1
rem ras
start %MODE%\ryzom_admin_service --fulladminname=admin_service --shortadminname=AS --writepid

2
code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/primitive_plugin.h
Unescape Escape View File

@ -72,7 +72,7 @@ private:
void serial (NLMISC::IStream &s);
static uint getVersion ()
static uint getVersion ();
void removed() {}
};

4
code/ryzom/tools/server/admin/config.php
Unescape Escape View File

@ -9,8 +9,8 @@
define('NELTOOL_DBNAME','nel_tool');
// site paths definitions
define('NELTOOL_SITEBASE','http://open.ryzom.com/');
define('NELTOOL_SYSTEMBASE','/home/nevrax/hg/code/ryzom/tools/server/admin/');
define('NELTOOL_SITEBASE','.');
define('NELTOOL_SYSTEMBASE','D:\\Programmation\\Personal projects\\ryzom\\ryzom\\code\\ryzom\\tools\\server\\admin\\'/*'/home/nevrax/hg/code/ryzom/tools/server/admin/'*/);
define('NELTOOL_LOGBASE', NELTOOL_SYSTEMBASE .'/logs/');
define('NELTOOL_IMGBASE', NELTOOL_SYSTEMBASE .'/imgs/');

Write Preview
Loading…
Cancel
Save