mirror of
https://port.numenaute.org/aleajactaest/khanat-code-old.git
synced 2024-11-10 01:09:34 +00:00
Changed: Removed unused variables
This commit is contained in:
parent
e8b906c59b
commit
b4d5bb9af5
10 changed files with 16 additions and 29 deletions
|
@ -284,7 +284,6 @@ CInterfaceGroup *CInterfaceHelp::activateNextWindow(CDBCtrlSheet *elt, sint forc
|
|||
|
||||
// If some free window possible, search which to take
|
||||
sint newIndexWindow= -1;
|
||||
bool mustPlace= true;
|
||||
bool mustAddToActiveWindows= true;
|
||||
// if an active window is not in KeepMode, get it.
|
||||
for(i=0;i<_ActiveWindows.size();i++)
|
||||
|
@ -293,7 +292,6 @@ CInterfaceGroup *CInterfaceHelp::activateNextWindow(CDBCtrlSheet *elt, sint forc
|
|||
if(!_InfoWindows[_ActiveWindows[i]].KeepMode && forceKeepWindow!=(sint)_ActiveWindows[i])
|
||||
{
|
||||
newIndexWindow= _ActiveWindows[i];
|
||||
mustPlace= false;
|
||||
mustAddToActiveWindows= false;
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -1816,7 +1816,6 @@ void CDBCtrlSheet::draw()
|
|||
|
||||
CInterfaceManager *pIM = CInterfaceManager::getInstance();
|
||||
CViewRenderer &rVR = *CViewRenderer::getInstance();
|
||||
CRGBA color = CRGBA(255,255,255,255);
|
||||
|
||||
if (_Type != SheetType_Macro)
|
||||
{
|
||||
|
|
|
@ -840,13 +840,13 @@ bool CGroupMap::getCtrlsUnder (sint32 x, sint32 y, sint32 clipX, sint32 clipY, s
|
|||
(y < (clipY + clipH))))
|
||||
return false;
|
||||
|
||||
bool bFound = false;
|
||||
// bool bFound = false;
|
||||
for (uint32 i = 0; i < _PolyButtons.size(); ++i)
|
||||
{
|
||||
if (_PolyButtons[i]->contains(CVector2f((float)x,(float)y)))
|
||||
{
|
||||
vICL.push_back(_PolyButtons[i]);
|
||||
bFound = true;
|
||||
// bFound = true;
|
||||
}
|
||||
}
|
||||
return CInterfaceGroup::getCtrlsUnder(x, y, clipX, clipY, clipW, clipH, vICL);
|
||||
|
|
|
@ -250,7 +250,6 @@ void CInterfaceDDX::CParam::backupDB()
|
|||
|
||||
if (Widget == ColorButton)
|
||||
{
|
||||
CRGBA col = CRGBA::White;
|
||||
CCDBNodeLeaf *pNL = NLGUI::CDBManager::getInstance()->getDbProp(Link,false);
|
||||
if (pNL != NULL)
|
||||
{
|
||||
|
|
|
@ -795,8 +795,8 @@ void CInterfaceManager::uninitOutGame()
|
|||
|
||||
CInterfaceItemEdition::getInstance()->setCurrWindow(NULL);
|
||||
|
||||
NLMISC::TTime initStart;
|
||||
initStart = ryzomGetLocalTime ();
|
||||
// NLMISC::TTime initStart;
|
||||
// initStart = ryzomGetLocalTime ();
|
||||
if (SoundMngr != NULL)
|
||||
{
|
||||
NLSOUND::UAudioMixer *pMixer = SoundMngr->getMixer();
|
||||
|
@ -804,23 +804,23 @@ void CInterfaceManager::uninitOutGame()
|
|||
}
|
||||
//nlinfo ("%d seconds for uninitOutGame", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
|
||||
initStart = ryzomGetLocalTime ();
|
||||
// initStart = ryzomGetLocalTime ();
|
||||
CWidgetManager::getInstance()->activateMasterGroup ("ui:outgame", false);
|
||||
|
||||
CInterfaceParser *parser = dynamic_cast< CInterfaceParser* >( CWidgetManager::getInstance()->getParser() );
|
||||
//nlinfo ("%d seconds for activateMasterGroup", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
initStart = ryzomGetLocalTime ();
|
||||
// initStart = ryzomGetLocalTime ();
|
||||
parser->removeAll();
|
||||
//nlinfo ("%d seconds for removeAll", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
initStart = ryzomGetLocalTime ();
|
||||
// initStart = ryzomGetLocalTime ();
|
||||
reset();
|
||||
//nlinfo ("%d seconds for reset", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
// reset the mouse pointer to avoid invalid pointer access
|
||||
CWidgetManager::getInstance()->setPointer( NULL );
|
||||
initStart = ryzomGetLocalTime ();
|
||||
// initStart = ryzomGetLocalTime ();
|
||||
CInterfaceLink::removeAllLinks();
|
||||
//nlinfo ("%d seconds for removeAllLinks", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
initStart = ryzomGetLocalTime ();
|
||||
// initStart = ryzomGetLocalTime ();
|
||||
ICDBNode::CTextId textId("UI");
|
||||
NLGUI::CDBManager::getInstance()->getDB()->removeNode(textId);
|
||||
//nlinfo ("%d seconds for removeNode", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
|
@ -828,7 +828,7 @@ void CInterfaceManager::uninitOutGame()
|
|||
// Init the action manager
|
||||
{
|
||||
|
||||
initStart = ryzomGetLocalTime ();
|
||||
// initStart = ryzomGetLocalTime ();
|
||||
uninitActions();
|
||||
// nlinfo ("%d seconds for uninitActions", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
}
|
||||
|
|
|
@ -525,7 +525,7 @@ CXDeltaPatch::TApplyResult CXDeltaPatch::apply(const std::string &sFileToPatch,
|
|||
}
|
||||
|
||||
SXDeltaCtrl::SSourceInfo *pFromSource = NULL;
|
||||
SXDeltaCtrl::SSourceInfo *pDataSource = NULL;
|
||||
// SXDeltaCtrl::SSourceInfo *pDataSource = NULL;
|
||||
|
||||
if (_Ctrl.SourceInfo.size() > 0)
|
||||
{
|
||||
|
@ -533,7 +533,7 @@ CXDeltaPatch::TApplyResult CXDeltaPatch::apply(const std::string &sFileToPatch,
|
|||
|
||||
if (rInfo.IsData)
|
||||
{
|
||||
pDataSource = &rInfo;
|
||||
// pDataSource = &rInfo;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -2030,7 +2030,7 @@ void CNetworkConnection::sendNormalMessage()
|
|||
uint numPacked = 0;
|
||||
|
||||
// pack each block
|
||||
TGameCycle lastPackedCycle = 0;
|
||||
// TGameCycle lastPackedCycle = 0;
|
||||
list<CActionBlock>::iterator itblock;
|
||||
|
||||
//nldebug("CNET[%p]: sending message %d", this, _CurrentSendNumber);
|
||||
|
@ -2052,7 +2052,7 @@ void CNetworkConnection::sendNormalMessage()
|
|||
|
||||
//nlassertex((*itblock).Cycle > lastPackedCycle, ("(*itblock).Cycle=%d lastPackedCycle=%d", (*itblock).Cycle, lastPackedCycle));
|
||||
|
||||
lastPackedCycle = block.Cycle;
|
||||
// lastPackedCycle = block.Cycle;
|
||||
|
||||
block.serial(message);
|
||||
++numPacked;
|
||||
|
|
|
@ -121,9 +121,6 @@ CPlayerR2CL::~CPlayerR2CL()
|
|||
|
||||
CGenderInfo * CPlayerR2CL::getGenderInfo()
|
||||
{
|
||||
string propName = toString("SERVER:Entities:E%d:P%d", _Slot, CLFECOMMON::PROPERTY_VPB);
|
||||
sint64 vA = NLGUI::CDBManager::getInstance()->getDbProp(propName)->getValue64();
|
||||
SPropVisualA visualA = *(SPropVisualA *)(&vA);
|
||||
EGSPD::CPeople::TPeople ePeople = _Sheet->Race;
|
||||
bool bMale = (_Sheet->Gender == GSGENDER::male);
|
||||
|
||||
|
|
|
@ -262,7 +262,6 @@ void CInstanceMapDeco::onPreRender(CGroupMap &groupMap)
|
|||
{
|
||||
_Orient->setActive(true);
|
||||
_Orient->setColorRGBA(CRGBA(255, 255, 255, (uint8) (255 * _OrientBlendFactor)));
|
||||
CVector2f worldPos = getWorldPos();
|
||||
sint32 x;
|
||||
sint32 y;
|
||||
groupMap.worldToWindowSnapped(x, y, getWorldPos());
|
||||
|
|
|
@ -231,13 +231,11 @@ void CToolChoosePos::updateBeforeRender()
|
|||
if (entity)
|
||||
{
|
||||
CMatrix mat;
|
||||
bool shown = false;
|
||||
if (worldViewRay.OnMiniMap && rayIntersectionType == NoIntersection)
|
||||
{
|
||||
entity->show(false);
|
||||
}
|
||||
else
|
||||
if (!entity->skeleton())
|
||||
else if (!entity->skeleton())
|
||||
{
|
||||
/*
|
||||
nlwarning("Selected entity for the 'create' tool has no skeleton");
|
||||
|
@ -266,7 +264,6 @@ void CToolChoosePos::updateBeforeRender()
|
|||
return;
|
||||
}
|
||||
entity->show(true);
|
||||
shown = true;
|
||||
//
|
||||
CQuat frontQuat(CVector::K, _CreateAngle - (float) (NLMISC::Pi / 2));
|
||||
inst.setRotQuat(frontQuat);
|
||||
|
@ -277,7 +274,6 @@ void CToolChoosePos::updateBeforeRender()
|
|||
else
|
||||
{
|
||||
entity->show(true);
|
||||
shown = true;
|
||||
//
|
||||
entity->updateVisible(T1, NULL);
|
||||
entity->updatePos(T1, NULL);
|
||||
|
@ -293,7 +289,6 @@ void CToolChoosePos::updateBeforeRender()
|
|||
mat.setRot(frontQuat);
|
||||
mat.setPos(entityPos);
|
||||
*/
|
||||
CMatrix skelMatrix = entity->skeleton()->getMatrix();
|
||||
// relative position to skeleton root
|
||||
CVector skelRootRelativePos = entity->skeleton()->getMatrix().getPos() - entity->pos().asVector();
|
||||
// combine quat for front face xform & anim quat
|
||||
|
|
Loading…
Reference in a new issue