mirror of
https://port.numenaute.org/aleajactaest/khanat-code-old.git
synced 2024-11-17 21:11:39 +00:00
Changed: Minor changes
This commit is contained in:
parent
1f247f032e
commit
935ee947a6
48 changed files with 78 additions and 100 deletions
|
@ -493,7 +493,7 @@ public:
|
|||
*
|
||||
* NB: you must setupViewMatrix() BEFORE setupModelMatrix(), or else undefined results.
|
||||
*/
|
||||
virtual void setupViewMatrix(const CMatrix &mtx)=0;
|
||||
virtual void setupViewMatrix(const CMatrix &mtx) = 0;
|
||||
|
||||
/** setup the view matrix (inverse of camera matrix).
|
||||
* Extended: give a cameraPos (mtx.Pos() is not taken into account but for getViewMatrix()),
|
||||
|
@ -1422,7 +1422,6 @@ protected:
|
|||
|
||||
private:
|
||||
bool _StaticMemoryToVRAM;
|
||||
|
||||
};
|
||||
|
||||
// --------------------------------------------------
|
||||
|
|
|
@ -39,9 +39,9 @@ class CPThread : public IThread
|
|||
public:
|
||||
enum TThreadState
|
||||
{
|
||||
ThreadStateNone,
|
||||
ThreadStateRunning,
|
||||
ThreadStateFinished,
|
||||
ThreadStateNone,
|
||||
ThreadStateRunning,
|
||||
ThreadStateFinished,
|
||||
};
|
||||
|
||||
/// Constructor
|
||||
|
|
|
@ -543,14 +543,14 @@ ColorPickerPopup::ColorPickerPopup(int width, bool withColorDialog,
|
|||
setMouseTracking(true);
|
||||
cols = width;
|
||||
|
||||
if (withColorDialog)
|
||||
if (withColorDialog)
|
||||
{
|
||||
moreButton = new ColorPickerButton(this);
|
||||
moreButton->setFixedWidth(24);
|
||||
moreButton->setFixedHeight(21);
|
||||
moreButton->setFrameRect(QRect(2, 2, 20, 17));
|
||||
connect(moreButton, SIGNAL(clicked()), SLOT(getColorFromDialog()));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
moreButton = 0;
|
||||
|
|
|
@ -1509,9 +1509,6 @@ bool CDriverD3D::setDisplay(nlWindow wnd, const GfxMode& mode, bool show, bool r
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
// _D3D->CreateDevice (adapter, _Rasterizer, _HWnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, ¶meters, &_DeviceInterface);
|
||||
|
||||
// Check some caps
|
||||
D3DCAPS9 caps;
|
||||
if (_DeviceInterface->GetDeviceCaps(&caps) == D3D_OK)
|
||||
|
|
|
@ -2178,7 +2178,7 @@ void CDriverGL::flush()
|
|||
// ***************************************************************************
|
||||
void CDriverGL::setSwapVBLInterval(uint interval)
|
||||
{
|
||||
H_AUTO_OGL(CDriverGL_setSwapVBLInterval)
|
||||
H_AUTO_OGL(CDriverGL_setSwapVBLInterval);
|
||||
|
||||
if (!_Initialized)
|
||||
return;
|
||||
|
|
|
@ -403,7 +403,7 @@ bool CDriverGL::setupMaterial(CMaterial& mat)
|
|||
// Must setup textures each frame. (need to test if touched).
|
||||
// Must separate texture setup and texture activation in 2 "for"...
|
||||
// because setupTexture() may disable all stage.
|
||||
if (matShader != CMaterial::Water
|
||||
if (matShader != CMaterial::Water
|
||||
&& ((matShader != CMaterial::Program) || (_LastSetuppedPP->features().MaterialFlags & CProgramFeatures::TextureStages))
|
||||
)
|
||||
{
|
||||
|
|
|
@ -767,7 +767,7 @@ void CDriverGLStates::setTextureMode(TTextureMode texMode)
|
|||
{
|
||||
glDisable(GL_TEXTURE_2D);
|
||||
}
|
||||
else if(oldTexMode == TextureRect)
|
||||
else if (oldTexMode == TextureRect)
|
||||
{
|
||||
#ifndef USE_OPENGLES
|
||||
if(_TextureRectangleSupported)
|
||||
|
@ -780,7 +780,7 @@ void CDriverGLStates::setTextureMode(TTextureMode texMode)
|
|||
glDisable(GL_TEXTURE_2D);
|
||||
}
|
||||
}
|
||||
else if(oldTexMode == TextureCubeMap)
|
||||
else if (oldTexMode == TextureCubeMap)
|
||||
{
|
||||
if(_TextureCubeMapSupported)
|
||||
{
|
||||
|
|
|
@ -392,7 +392,6 @@ bool CMeshVPWindTree::begin(IDriver *driver, CScene *scene, CMeshBaseInstance *m
|
|||
sint numPls= renderTrav->getNumVPLights()-1;
|
||||
clamp(numPls, 0, CRenderTrav::MaxVPLight-1);
|
||||
|
||||
|
||||
// Enable normalize only if requested by user. Because lighting don't manage correct "scale lighting"
|
||||
uint idVP= (SpecularLighting?2:0) + (driver->isForceNormalize()?1:0) ;
|
||||
// correct VP id for correct unmber of pls.
|
||||
|
@ -523,7 +522,7 @@ void CMeshVPWindTree::beginMBRInstance(IDriver *driver, CScene *scene, CMeshBase
|
|||
idVP = numPls*4 + idVP;
|
||||
|
||||
// re-activate VP if idVP different from last setup
|
||||
if(idVP != _LastMBRIdVP)
|
||||
if (idVP != _LastMBRIdVP)
|
||||
{
|
||||
_LastMBRIdVP= idVP;
|
||||
driver->activeVertexProgram(_VertexProgram[_LastMBRIdVP]);
|
||||
|
|
|
@ -158,7 +158,7 @@ CScene::CScene(bool bSmallScene) : LightTrav(bSmallScene)
|
|||
|
||||
_MaxSkeletonsInNotCLodForm= 20;
|
||||
|
||||
_FilterRenderFlags= std::numeric_limits<uint32>::max();
|
||||
_FilterRenderFlags = std::numeric_limits<uint32>::max();
|
||||
|
||||
_NextRenderProfile= false;
|
||||
|
||||
|
@ -592,11 +592,9 @@ void CScene::renderPart(UScene::TRenderPart rp, bool doHrcPass, bool doTrav, boo
|
|||
//
|
||||
nlassert(CurrentCamera);
|
||||
|
||||
|
||||
// update models.
|
||||
updateModels();
|
||||
|
||||
|
||||
// Use the camera to setup Clip / Render pass.
|
||||
float left, right, bottom, top, znear, zfar;
|
||||
CurrentCamera->getFrustum(left, right, bottom, top, znear, zfar);
|
||||
|
|
|
@ -244,7 +244,7 @@ void CShadowMapManager::addShadowReceiver(CTransform *model)
|
|||
void CShadowMapManager::renderGenerate(CScene *scene)
|
||||
{
|
||||
H_AUTO( NL3D_ShadowManager_Generate );
|
||||
|
||||
|
||||
// Each frame, do a small garbage collector for unused free textures.
|
||||
garbageShadowTextures(scene);
|
||||
|
||||
|
|
|
@ -113,7 +113,7 @@ CTransform::CTransform()
|
|||
_StateFlags= IsOpaque | IsUserLightable;
|
||||
|
||||
// By default, always allow rendering of Transform Models.
|
||||
_RenderFilterType= std::numeric_limits<uint32>::max();
|
||||
_RenderFilterType = std::numeric_limits<uint32>::max();
|
||||
|
||||
// By default, don't suport fast intersection detection
|
||||
_SupportFastIntersect= false;
|
||||
|
|
|
@ -707,7 +707,7 @@ bool CFormDfn::getEntryIndexByName (uint &entry, const std::string &name) const
|
|||
}
|
||||
entryIndex++;
|
||||
}
|
||||
entry=std::numeric_limits<uint>::max();
|
||||
entry = std::numeric_limits<uint>::max();
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
@ -17,8 +17,8 @@
|
|||
|
||||
#include "stdmisc.h"
|
||||
|
||||
#include <nel/misc/types_nl.h>
|
||||
#include <nel/misc/debug.h>
|
||||
#include "nel/misc/types_nl.h"
|
||||
#include "nel/misc/debug.h"
|
||||
|
||||
#ifdef NL_OS_UNIX
|
||||
|
||||
|
|
|
@ -217,7 +217,7 @@ bool CSheetId::buildSheetId(const std::string& sheetName)
|
|||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#ifdef NL_TEMP_YUBO_NO_SOUND_SHEET_ID
|
||||
if (a_NoSoundSheetId && sheetName.find(".sound") != std::string::npos)
|
||||
{
|
||||
|
@ -236,7 +236,7 @@ bool CSheetId::buildSheetId(const std::string& sheetName)
|
|||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -417,10 +417,10 @@ void CSheetId::initWithoutSheet()
|
|||
nlassert(_DontHaveSheetKnowledge);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
_Initialised = true;
|
||||
_DontHaveSheetKnowledge = true;
|
||||
|
||||
|
||||
// Initialize id 0,0 as unknown.unknown
|
||||
CSheetId unknownunknown = CSheetId("unknown.unknown");
|
||||
nlassert(unknownunknown == CSheetId::Unknown);
|
||||
|
@ -525,7 +525,7 @@ bool CSheetId::operator < (const CSheetId& sheetRef ) const
|
|||
string CSheetId::toString(bool ifNotFoundUseNumericId) const
|
||||
{
|
||||
if (!_Initialised) init(false);
|
||||
|
||||
|
||||
if (_DontHaveSheetKnowledge)
|
||||
{
|
||||
// FIXME: When someone punches in a fake sheet id this will
|
||||
|
@ -564,7 +564,7 @@ string CSheetId::toString(bool ifNotFoundUseNumericId) const
|
|||
void CSheetId::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
|
||||
{
|
||||
nlassert(!_DontHaveSheetKnowledge);
|
||||
|
||||
|
||||
f.serial( _Id.Id );
|
||||
|
||||
#ifdef NL_DEBUG_SHEET_ID
|
||||
|
|
|
@ -198,7 +198,7 @@ void CWinThread::start ()
|
|||
{
|
||||
if (isRunning())
|
||||
throw EThread("Starting a thread that is already started, existing thread will continue running, this should not happen");
|
||||
|
||||
|
||||
// ThreadHandle = (void *) ::CreateThread (NULL, _StackSize, ProxyFunc, this, 0, (DWORD *)&ThreadId);
|
||||
ThreadHandle = (void *) ::CreateThread (NULL, 0, ProxyFunc, this, 0, (DWORD *)&ThreadId);
|
||||
// nldebug("NLMISC: thread %x started for runnable '%x'", typeid( Runnable ).name());
|
||||
|
|
|
@ -80,7 +80,7 @@ enum TSourceDSoundEndState
|
|||
class CSourceDSound : public ISource
|
||||
{
|
||||
friend class CSoundDriverDSound;
|
||||
|
||||
|
||||
public:
|
||||
/// Constructor
|
||||
CSourceDSound(uint sourcename = 0);
|
||||
|
@ -446,7 +446,7 @@ private:
|
|||
|
||||
// Set the 'used' state of the source. Managed by the driver.
|
||||
void setUsed(bool v) { _IsUsed = v; }
|
||||
|
||||
|
||||
// Return the 'used' state of the source
|
||||
bool isUsed() { return _IsUsed; }
|
||||
*/
|
||||
|
|
|
@ -419,7 +419,7 @@ void CSourceFMod::setMinMaxDistances( float mindist, float maxdist, bool /* defe
|
|||
nlwarning("SOUND_DEV (FMod): Ridiculously high max distance set on source");
|
||||
maxdist = maxSqrt;
|
||||
}
|
||||
|
||||
|
||||
_MinDist= mindist;
|
||||
_MaxDist= maxdist;
|
||||
if(_FModChannel!=-1)
|
||||
|
|
|
@ -121,7 +121,7 @@ bool CBufferAL::unlock(uint size)
|
|||
// Error handling
|
||||
if (alGetError() == AL_NO_ERROR)
|
||||
_IsLoaded = true; // ->lock() set it to false
|
||||
|
||||
|
||||
return _IsLoaded;
|
||||
}
|
||||
|
||||
|
@ -162,7 +162,7 @@ bool CBufferAL::fill(const uint8 *src, uint size)
|
|||
|
||||
// Error handling
|
||||
_IsLoaded = (alGetError() == AL_NO_ERROR);
|
||||
|
||||
|
||||
return _IsLoaded;
|
||||
}
|
||||
|
||||
|
|
|
@ -176,7 +176,7 @@ void CSimpleSource::play()
|
|||
|
||||
// and play the sound
|
||||
bool play = pSource->play();
|
||||
|
||||
|
||||
#ifdef NL_DEBUG
|
||||
nlassert(play);
|
||||
#else
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
# Don't add other subdirectories if only max plugins are selected.
|
||||
IF(WITH_NEL_TOOLS)
|
||||
ADD_SUBDIRECTORY(misc)
|
||||
|
|
|
@ -30,8 +30,8 @@
|
|||
///////////
|
||||
// CLASS //
|
||||
class CCombo;
|
||||
class CActionsManager;
|
||||
class CAction;
|
||||
class CActionsManager;
|
||||
|
||||
/**
|
||||
* The goal of CCombo is to gather together Inputs that will validate an Action.
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
#include "../../common/src/game_share/ryzom_database_banks.h"
|
||||
#include "game_share/ryzom_database_banks.h"
|
||||
|
||||
|
||||
////////////////
|
||||
|
|
|
@ -4537,7 +4537,7 @@ void CCharacterCL::applyBehaviourFlyingHPs(const CBehaviourContext &bc, const MB
|
|||
{
|
||||
if(behaviour.DeltaHP != 0)
|
||||
{
|
||||
CRGBA deltaHPColor( 0, 0, 0 );
|
||||
CRGBA deltaHPColor(0, 0, 0);
|
||||
// if it's a hit
|
||||
if( behaviour.DeltaHP < 0 )
|
||||
{
|
||||
|
|
|
@ -26,7 +26,6 @@
|
|||
#include "nel/misc/types_nl.h"
|
||||
|
||||
#ifdef NL_OS_WINDOWS
|
||||
#include <windows.h>
|
||||
#include <shellapi.h>
|
||||
#else
|
||||
#include <csignal>
|
||||
|
|
|
@ -969,8 +969,6 @@ void CClientChatManager::buildTellSentence(const ucstring &sender, const ucstrin
|
|||
name = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(name), bWoman);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -1052,8 +1050,6 @@ void CClientChatManager::buildChatSentence(TDataSetIndex /* compressedSenderInde
|
|||
senderName = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(senderName), bWoman);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
switch(type)
|
||||
|
|
|
@ -426,7 +426,7 @@ void CEntityManager::initialize(uint nbMaxEntity)
|
|||
_Entities.resize(_NbMaxEntity, 0);
|
||||
_EntityGroundFXHandle.resize(_NbMaxEntity);
|
||||
}
|
||||
|
||||
|
||||
ICDBNode::CTextId textId;
|
||||
|
||||
// Add an observer on the mission database
|
||||
|
|
|
@ -2296,6 +2296,7 @@ void CEntityCL::onStringAvailable(uint /* stringId */, const ucstring &value)
|
|||
}
|
||||
|
||||
ucstring replacement(STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw, womanTitle));
|
||||
|
||||
// Sometimes translation contains another title
|
||||
{
|
||||
ucstring::size_type pos = replacement.find('$');
|
||||
|
@ -2308,7 +2309,7 @@ void CEntityCL::onStringAvailable(uint /* stringId */, const ucstring &value)
|
|||
replacement = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw, womanTitle);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
_Tags = STRING_MANAGER::CStringManagerClient::getTitleInfos(_TitleRaw, womanTitle);
|
||||
|
||||
if (!replacement.empty() || !ClientCfg.DebugStringManager)
|
||||
|
@ -2949,7 +2950,7 @@ void CEntityCL::dataSetId(CLFECOMMON::TClientDataSetIndex dataSet)
|
|||
{
|
||||
_DataSetId = dataSet;
|
||||
|
||||
if (_Primitive && _Primitive->UserData == UserDataEntity)
|
||||
if (_Primitive && _Primitive->UserData == UserDataEntity)
|
||||
_Primitive->UserData |= (((uint64)_DataSetId)<<16);
|
||||
|
||||
// additionaly, on a UID change, must check the IsInTeam and IsAniml flags
|
||||
|
|
|
@ -188,7 +188,6 @@ const std::string& CLoginStateMachine::toString(CLoginStateMachine::TEvent event
|
|||
_CurrentState = stateId; \
|
||||
break; \
|
||||
} \
|
||||
|
||||
|
||||
extern std::string LoginLogin, LoginPassword;
|
||||
extern bool noUserChar;
|
||||
|
|
|
@ -759,7 +759,7 @@ void prelogInit()
|
|||
NLMISC::CTime::probeTimerInfo(timerInfo);
|
||||
if (timerInfo.RequiresSingleCore) // TODO: Also have a FV configuration value to force single core.
|
||||
setCPUMask();
|
||||
|
||||
|
||||
FPU_CHECKER_ONCE
|
||||
|
||||
NLMISC::TTime initStart = ryzomGetLocalTime ();
|
||||
|
@ -949,7 +949,7 @@ void prelogInit()
|
|||
Driver->setSwapVBLInterval(1);
|
||||
else
|
||||
Driver->setSwapVBLInterval(0);
|
||||
|
||||
|
||||
if (StereoDisplay) // VR_CONFIG // VR_DRIVER
|
||||
{
|
||||
// override mode TODO
|
||||
|
@ -1077,7 +1077,7 @@ void prelogInit()
|
|||
|
||||
// Set the monitor color properties
|
||||
CMonitorColorProperties monitorColor;
|
||||
for ( uint i=0; i<3; i++)
|
||||
for (uint i=0; i<3; i++)
|
||||
{
|
||||
monitorColor.Contrast[i] = ClientCfg.Contrast;
|
||||
monitorColor.Luminosity[i] = ClientCfg.Luminosity;
|
||||
|
|
|
@ -1950,13 +1950,14 @@ public:
|
|||
womanTitle = pChar->getGender() == GSGENDER::female;
|
||||
|
||||
STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(copyInout), womanTitle);
|
||||
|
||||
|
||||
// Sometimes translation contains another title
|
||||
ucstring::size_type pos = copyInout.find('$');
|
||||
if (pos != ucstring::npos)
|
||||
{
|
||||
copyInout = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(copyInout), womanTitle);
|
||||
}
|
||||
|
||||
CStringPostProcessRemoveTitle::cbIDStringReceived(copyInout);
|
||||
inout = copyInout;
|
||||
}
|
||||
|
|
|
@ -3613,7 +3613,7 @@ public:
|
|||
uint8 index;
|
||||
fromString(Params, index);
|
||||
--index; // Param is 1-based so subtract 1
|
||||
if ( index >= MAX_INVENTORY_ANIMAL)
|
||||
if (index >= MAX_INVENTORY_ANIMAL)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -520,7 +520,7 @@ CCameraBackup setupCameraForScreenshot(UScene &scene, uint left, uint right, uin
|
|||
// Build a viewport
|
||||
CViewport viewport;
|
||||
NL3D::UDriver *Driver = CViewRenderer::getInstance()->getDriver();
|
||||
viewport.init (0, 0, (float)(right-left)/Driver->getWindowWidth(),(float)(bottom-top)/Driver->getWindowHeight());
|
||||
viewport.init (0, 0, (float)(right-left)/Driver->getWindowWidth(), (float)(bottom-top)/Driver->getWindowHeight());
|
||||
|
||||
// Activate all this
|
||||
scene.getCam().setFrustum (frustumPart);
|
||||
|
|
|
@ -777,7 +777,7 @@ void CHandlerMemorizePhraseOrMacro::execute (CCtrlBase *pCaller, const string &P
|
|||
sint32 dstPhraseId= pCSDst->getSPhraseId();
|
||||
sint32 dstMacroId= pCSDst->getMacroId();
|
||||
|
||||
if ((src.empty()) && (CHandlerPhraseMemoryCopy::haveLastPhraseElement))
|
||||
if (src.empty() && (CHandlerPhraseMemoryCopy::haveLastPhraseElement))
|
||||
{
|
||||
// get the slot ids from save
|
||||
srcIsMacro= CHandlerPhraseMemoryCopy::isMacro;
|
||||
|
@ -1600,7 +1600,6 @@ public:
|
|||
}
|
||||
}
|
||||
};
|
||||
|
||||
REGISTER_ACTION_HANDLER(CHandlerPhraseSelectMemory2, "phrase_select_memory_2");
|
||||
|
||||
// ***************************************************************************
|
||||
|
|
|
@ -30,7 +30,6 @@
|
|||
#undef LOG_WARNING
|
||||
#endif
|
||||
|
||||
|
||||
/**
|
||||
* class used to display console text commands in the chat window
|
||||
* \author Nicolas Brigand
|
||||
|
|
|
@ -47,7 +47,6 @@ CChatTextManager::~CChatTextManager()
|
|||
_TextShadowed = NULL;
|
||||
delete _ShowTimestamps;
|
||||
_ShowTimestamps = NULL;
|
||||
|
||||
}
|
||||
//=================================================================================
|
||||
uint CChatTextManager::getTextFontSize() const
|
||||
|
@ -96,6 +95,7 @@ bool CChatTextManager::showTimestamps() const
|
|||
}
|
||||
return _ShowTimestamps->getValueBool();
|
||||
}
|
||||
|
||||
//=================================================================================
|
||||
static CInterfaceGroup *parseCommandTag(ucstring &line)
|
||||
{
|
||||
|
@ -186,7 +186,6 @@ CViewBase *CChatTextManager::createMsgText(const ucstring &cstMsg, NLMISC::CRGBA
|
|||
msg = cur_time + msg;
|
||||
}
|
||||
|
||||
|
||||
vt->setTextFormatTaged(msg);
|
||||
vt->setColor(NLMISC::CRGBA::White);
|
||||
}
|
||||
|
|
|
@ -198,7 +198,7 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
|
|||
ucstring theTribeName;
|
||||
ucstring entityName = entity->getDisplayName();
|
||||
ucstring entityTitle = entity->getTitle();
|
||||
|
||||
|
||||
// For some NPC's the name is empty and only a title is given,
|
||||
// in that case, treat the title as the name.
|
||||
if (entityName.empty())
|
||||
|
@ -652,7 +652,6 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
|
|||
if (pPlayer == NULL)
|
||||
needPvPLogo = false;
|
||||
|
||||
|
||||
if (pPlayer != NULL && needPvPLogo)
|
||||
{
|
||||
if (pvpFactionLogo)
|
||||
|
@ -756,7 +755,6 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
|
|||
view = leftGroup->getView ("win_jauge_bot");
|
||||
if (view)
|
||||
leftGroup->delView (view);
|
||||
|
||||
}
|
||||
|
||||
// Delete remaining strings
|
||||
|
@ -771,8 +769,7 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
|
|||
CViewBase *win_mid = leftGroup->getView ("win_mid");
|
||||
if (win_mid)
|
||||
{
|
||||
win_mid->setH (win_mid->getH() - spaceBar/2 );
|
||||
|
||||
win_mid->setH (win_mid->getH() - spaceBar/2);
|
||||
}
|
||||
|
||||
// Set player name
|
||||
|
@ -963,7 +960,7 @@ void CGroupInSceneUserInfo::updateDynamicData ()
|
|||
|
||||
if (pPlayer != NULL)
|
||||
if (pPlayer->isAFK())
|
||||
entityName += CI18N::get("uiAFK");
|
||||
entityName += CI18N::get("uiAFK");
|
||||
_Name->setText(entityName);
|
||||
|
||||
// Title color get the PVP color
|
||||
|
|
|
@ -3213,7 +3213,7 @@ class CAHValidateUserLandMarkName : public IActionHandler
|
|||
CGroupEditBox *eb = dynamic_cast<CGroupEditBox *>(ig->getGroup("eb"));
|
||||
if (!eb) return;
|
||||
ig->setActive(false);
|
||||
|
||||
|
||||
CGroupContainer *gc = dynamic_cast<CGroupContainer *>(CWidgetManager::getInstance()->getElementFromId(WIN_LANDMARK_NAME));
|
||||
if (!gc) return;
|
||||
// Retrieve ComboBox to get the position(ordered landmark type) of the selected item
|
||||
|
|
|
@ -87,7 +87,7 @@ bool CGroupSkills::parse (xmlNodePtr cur, CInterfaceGroup *parentGroup)
|
|||
|
||||
string sTmp;
|
||||
ICDBNode::CTextId textId;
|
||||
|
||||
|
||||
for (uint k = 0; k < SKILLS::NUM_SKILLS; ++k)
|
||||
{
|
||||
sTmp = string(DB_SKILLS)+":"+NLMISC::toString((sint32)k)+":BaseSKILL";
|
||||
|
|
|
@ -378,13 +378,13 @@ void CGuildManager::update()
|
|||
// Online status not changed for this member
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
if ( (*it).second.Online != ccs_offline && _GuildMembers[i].Online != ccs_offline)
|
||||
{
|
||||
// Not from offline, or to offline, so don't show anything
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
ucstring msg = (_GuildMembers[i].Online != ccs_offline) ? onlineMessage : offlineMessage;
|
||||
strFindReplace(msg, "%s", _GuildMembers[i].Name);
|
||||
string cat = getStringCategory(msg, msg);
|
||||
|
@ -398,7 +398,6 @@ void CGuildManager::update()
|
|||
bool dummy;
|
||||
PeopleInterraction.ChatInput.Guild.displayMessage(msg, col, 2, &dummy);
|
||||
break;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -3982,5 +3982,3 @@ bool CInterfaceManager::parseTokens(ucstring& ucstr)
|
|||
ucstr = str;
|
||||
return true;;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -119,7 +119,7 @@ public:
|
|||
char * end = ptr.getDatas() + strlen( ptr.getDatas() );
|
||||
char * dataTok = strtok( ptr.getDatas()," ,");
|
||||
NLMISC::ICDBNode::CTextId textId;
|
||||
|
||||
|
||||
while(dataTok)
|
||||
{
|
||||
std::string data (dataTok);
|
||||
|
|
|
@ -2193,7 +2193,6 @@ class CHandlerTellContact : public IActionHandler
|
|||
CInterfaceGroup *ig = pCaller->getParent();
|
||||
if (!ig) return;
|
||||
CGroupContainer *gc = static_cast< CGroupContainer* >( ig->getEnclosingContainer() );
|
||||
|
||||
if (!gc) return;
|
||||
CPeopleList *list;
|
||||
uint peopleIndex;
|
||||
|
|
|
@ -895,7 +895,7 @@ class CHandlerContactEntry : public IActionHandler
|
|||
// it is simpler to keep it as it and to just use this action handler to manage user input.
|
||||
if (!pCaller || !pCaller->getParent()) return;
|
||||
CGroupContainer *gc = static_cast< CGroupContainer* >( pCaller->getParent()->getEnclosingContainer() );
|
||||
|
||||
|
||||
// title gives the name of the player
|
||||
ucstring playerName = gc->getUCTitle();
|
||||
|
||||
|
|
|
@ -474,16 +474,16 @@ void CSPhraseManager::memorizePhrase(uint32 memoryLine, uint32 memorySlot, ui
|
|||
}
|
||||
}
|
||||
|
||||
void CSPhraseManager::selectMemoryLineDBalt(sint32 memoryLine)
|
||||
// ***************************************************************************
|
||||
void CSPhraseManager::selectMemoryLineDB(sint32 memoryLine)
|
||||
{
|
||||
if(memoryLine<0)
|
||||
memoryLine= -1;
|
||||
|
||||
if(_SelectedMemoryDBalt!=memoryLine)
|
||||
|
||||
if(_SelectedMemoryDB!=memoryLine)
|
||||
{
|
||||
_SelectedMemoryDBalt= memoryLine;
|
||||
_SelectedMemoryDB= memoryLine;
|
||||
// since memory selection changes then must update all the DB and the Ctrl states
|
||||
|
||||
updateMemoryDBAll();
|
||||
updateAllMemoryCtrlState();
|
||||
updateAllMemoryCtrlRegenTickRange();
|
||||
|
@ -492,14 +492,14 @@ void CSPhraseManager::selectMemoryLineDBalt(sint32 memoryLine)
|
|||
}
|
||||
}
|
||||
|
||||
// ***************************************************************************
|
||||
void CSPhraseManager::selectMemoryLineDB(sint32 memoryLine)
|
||||
void CSPhraseManager::selectMemoryLineDBalt(sint32 memoryLine)
|
||||
{
|
||||
if(memoryLine<0)
|
||||
memoryLine= -1;
|
||||
if(_SelectedMemoryDB!=memoryLine)
|
||||
|
||||
if(_SelectedMemoryDBalt!=memoryLine)
|
||||
{
|
||||
_SelectedMemoryDB= memoryLine;
|
||||
_SelectedMemoryDBalt= memoryLine;
|
||||
// since memory selection changes then must update all the DB and the Ctrl states
|
||||
updateMemoryDBAll();
|
||||
updateAllMemoryCtrlState();
|
||||
|
@ -573,7 +573,7 @@ void CSPhraseManager::updateMemoryDBSlot(uint32 memorySlot)
|
|||
_MemoryDbLeaves[memorySlot]->setValue32(0);
|
||||
else
|
||||
_MemoryDbLeaves[memorySlot]->setValue32(slot.Id);
|
||||
|
||||
|
||||
CMemorySlot &slotAlt= _Memories[_SelectedMemoryDBalt].Slot[memorySlot];
|
||||
|
||||
if(!slotAlt.isPhrase())
|
||||
|
@ -1126,7 +1126,7 @@ void CSPhraseManager::buildPhraseDesc(ucstring &text, const CSPhraseCom &phrase,
|
|||
uint32 totalActionMalus= 0;
|
||||
CCDBNodeLeaf *actMalus = _TotalMalusEquipLeaf ? &*_TotalMalusEquipLeaf
|
||||
: &*(_TotalMalusEquipLeaf = NLGUI::CDBManager::getInstance()->getDbProp("UI:VARIABLES:TOTAL_MALUS_EQUIP", false));
|
||||
|
||||
|
||||
// root brick must not be Power or aura, because Action malus don't apply to them
|
||||
// (ie leave 0 ActionMalus for Aura or Powers
|
||||
if(actMalus && !rootBrick->isSpecialPower())
|
||||
|
@ -4519,7 +4519,7 @@ uint32 CSPhraseManager::getTotalActionMalus(const CSPhraseCom &phrase) const
|
|||
if (!rootBrick)
|
||||
nlerror("Invalid root sbrick in sphrase_com '%s'", phrase.Name.toUtf8().c_str());
|
||||
else if (actMalus && !rootBrick->isSpecialPower())
|
||||
totalActionMalus = actMalus->getValue32();
|
||||
totalActionMalus = actMalus->getValue32();
|
||||
}
|
||||
return totalActionMalus;
|
||||
}
|
||||
|
|
|
@ -106,11 +106,11 @@ enum TFilterMapping
|
|||
// constructor
|
||||
//-----------------------------------------------
|
||||
CSoundManager::CSoundManager(IProgressCallback * /* progressCallBack */)
|
||||
: _AudioMixer(NULL),
|
||||
: _AudioMixer(NULL),
|
||||
_GroupControllerEffects(NULL),
|
||||
_GroupControllerEffectsGame(NULL),
|
||||
_EnvSoundRoot(NULL),
|
||||
_Sources(NULL),
|
||||
_GroupControllerEffectsGame(NULL),
|
||||
_EnvSoundRoot(NULL),
|
||||
_Sources(NULL),
|
||||
_UserEntitySoundLevel(1.0f)
|
||||
{
|
||||
_EnableBackgroundMusicAtTime= 0;
|
||||
|
|
|
@ -518,7 +518,7 @@ void CUserEntity::updateVisualPropertyName(const NLMISC::TGameCycle &gameCycle,
|
|||
html->browse("home");
|
||||
}
|
||||
}
|
||||
*/
|
||||
*/
|
||||
}// updateVisualPropertyName //
|
||||
|
||||
//-----------------------------------------------
|
||||
|
|
|
@ -187,7 +187,7 @@ end
|
|||
function strify(str)
|
||||
return [["]] .. tostring(str) .. [["]]
|
||||
end
|
||||
|
||||
|
||||
-------------------------------------------------------------------------------------------------
|
||||
-- enclose a string by double quotes
|
||||
function strifyXml(str)
|
||||
|
|
|
@ -1112,7 +1112,7 @@
|
|||
<PARAMETER NAME="faction/quantity" TYPE="string" VISIBLE="true"/>
|
||||
<PARAMETER NAME="place" TYPE="string" VISIBLE="true"/>
|
||||
</PRIMITIVE>
|
||||
|
||||
|
||||
<PRIMITIVE CLASS_NAME="talk_to" TYPE="node" PARENT_CLASS="objective_parent">
|
||||
<PARAMETER NAME="name" TYPE="string" VISIBLE="true" AUTONAME="talk_to $npc_name$"/>
|
||||
<!-- talk to param-->
|
||||
|
@ -1126,7 +1126,7 @@
|
|||
<PARAMETER NAME="name" TYPE="string" VISIBLE="true" AUTONAME="cast $spell$"/>
|
||||
|
||||
<PARAMETER NAME="action" TYPE="string_array" VISIBLE="true"/>
|
||||
<PARAMETER NAME="place" TYPE="string" VISIBLE="true"/>
|
||||
<PARAMETER NAME="place" TYPE="string" VISIBLE="true"/>
|
||||
</PRIMITIVE>
|
||||
|
||||
<PRIMITIVE CLASS_NAME="forage" TYPE="node" PARENT_CLASS="objective_parent">
|
||||
|
@ -5023,13 +5023,13 @@
|
|||
</PARAMETER>
|
||||
<PARAMETER NAME="entity id" TYPE="string" VISIBLE="true" READ_ONLY="true">
|
||||
</PARAMETER>
|
||||
<PARAMETER NAME= "Sheet" TYPE="string" READ_ONLY="true" VISIBLE="true">
|
||||
<PARAMETER NAME= "Sheet" TYPE="string" READ_ONLY="true" VISIBLE="true">
|
||||
<DEFAULT_VALUE VALUE="unknown"/>
|
||||
</PARAMETER>
|
||||
<PARAMETER NAME= "HitPoints" TYPE="string" READ_ONLY="true" VISIBLE="true">
|
||||
<PARAMETER NAME= "HitPoints" TYPE="string" READ_ONLY="true" VISIBLE="true">
|
||||
<DEFAULT_VALUE VALUE="0"/>
|
||||
</PARAMETER>
|
||||
<PARAMETER NAME= "MaxHitPoints" TYPE="string" READ_ONLY="true" VISIBLE="true">
|
||||
<PARAMETER NAME= "MaxHitPoints" TYPE="string" READ_ONLY="true" VISIBLE="true">
|
||||
<DEFAULT_VALUE VALUE="0"/>
|
||||
</PARAMETER>
|
||||
<PARAMETER NAME= "Mode" TYPE="string" READ_ONLY="true" VISIBLE="true">
|
||||
|
|
Loading…
Reference in a new issue