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
This commit is contained in:
kervala 2014-12-26 13:38:02 +01:00
parent fe9e52931d
commit bdfa7a624e
48 changed files with 78 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/nel/include/nel/3d/driver.h
View file

@ -1422,7 +1422,6 @@ protected:
private: private:
bool _StaticMemoryToVRAM; bool _StaticMemoryToVRAM;
}; };
// -------------------------------------------------- // --------------------------------------------------

3
code/nel/src/3d/driver/direct3d/driver_direct3d.cpp
View file

@ -1509,9 +1509,6 @@ bool CDriverD3D::setDisplay(nlWindow wnd, const GfxMode& mode, bool show, bool r
} }
} }
// _D3D->CreateDevice (adapter, _Rasterizer, _HWnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &parameters, &_DeviceInterface);
// Check some caps // Check some caps
D3DCAPS9 caps; D3DCAPS9 caps;
if (_DeviceInterface->GetDeviceCaps(&caps) == D3D_OK) if (_DeviceInterface->GetDeviceCaps(&caps) == D3D_OK)

2
code/nel/src/3d/driver/opengl/driver_opengl.cpp
View file

@ -2178,7 +2178,7 @@ void CDriverGL::flush()
// *************************************************************************** // ***************************************************************************
void CDriverGL::setSwapVBLInterval(uint interval) void CDriverGL::setSwapVBLInterval(uint interval)
{ {
H_AUTO_OGL(CDriverGL_setSwapVBLInterval) H_AUTO_OGL(CDriverGL_setSwapVBLInterval);
if (!_Initialized) if (!_Initialized)
return; return;

1
code/nel/src/3d/meshvp_wind_tree.cpp
View file

@ -392,7 +392,6 @@ bool CMeshVPWindTree::begin(IDriver *driver, CScene *scene, CMeshBaseInstance *m
sint numPls= renderTrav->getNumVPLights()-1; sint numPls= renderTrav->getNumVPLights()-1;
clamp(numPls, 0, CRenderTrav::MaxVPLight-1); clamp(numPls, 0, CRenderTrav::MaxVPLight-1);
// Enable normalize only if requested by user. Because lighting don't manage correct "scale lighting" // Enable normalize only if requested by user. Because lighting don't manage correct "scale lighting"
uint idVP= (SpecularLighting?2:0) + (driver->isForceNormalize()?1:0) ; uint idVP= (SpecularLighting?2:0) + (driver->isForceNormalize()?1:0) ;
// correct VP id for correct unmber of pls. // correct VP id for correct unmber of pls.

2
code/nel/src/3d/scene.cpp
View file

@ -592,11 +592,9 @@ void CScene::renderPart(UScene::TRenderPart rp, bool doHrcPass, bool doTrav, boo
// //
nlassert(CurrentCamera); nlassert(CurrentCamera);
// update models. // update models.
updateModels(); updateModels();
// Use the camera to setup Clip / Render pass. // Use the camera to setup Clip / Render pass.
float left, right, bottom, top, znear, zfar; float left, right, bottom, top, znear, zfar;
CurrentCamera->getFrustum(left, right, bottom, top, znear, zfar); CurrentCamera->getFrustum(left, right, bottom, top, znear, zfar);

4
code/nel/src/misc/p_thread.cpp
View file

@ -17,8 +17,8 @@
#include "stdmisc.h" #include "stdmisc.h"
#include <nel/misc/types_nl.h> #include "nel/misc/types_nl.h"
#include <nel/misc/debug.h> #include "nel/misc/debug.h"
#ifdef NL_OS_UNIX #ifdef NL_OS_UNIX

1
code/nel/tools/CMakeLists.txt
View file

@ -1,4 +1,3 @@
# Don't add other subdirectories if only max plugins are selected. # Don't add other subdirectories if only max plugins are selected.
IF(WITH_NEL_TOOLS) IF(WITH_NEL_TOOLS)
ADD_SUBDIRECTORY(misc) ADD_SUBDIRECTORY(misc)

2
code/ryzom/client/src/actions.h
View file

@ -30,8 +30,8 @@
/////////// ///////////
// CLASS // // CLASS //
class CCombo; class CCombo;
class CActionsManager;
class CAction; class CAction;
class CActionsManager;
/** /**
* The goal of CCombo is to gather together Inputs that will validate an Action. * The goal of CCombo is to gather together Inputs that will validate an Action.

2
code/ryzom/client/src/cdb_synchronised.cpp
View file

@ -41,7 +41,7 @@
#include <string> #include <string>
#include "../../common/src/game_share/ryzom_database_banks.h" #include "game_share/ryzom_database_banks.h"
//////////////// ////////////////

1
code/ryzom/client/src/client.cpp
View file

@ -26,7 +26,6 @@
#include "nel/misc/types_nl.h" #include "nel/misc/types_nl.h"
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
#include <windows.h>
#include <shellapi.h> #include <shellapi.h>
#else #else
#include <csignal> #include <csignal>

4
code/ryzom/client/src/client_chat_manager.cpp
View file

@ -969,8 +969,6 @@ void CClientChatManager::buildTellSentence(const ucstring &sender, const ucstrin
name = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(name), bWoman); name = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(name), bWoman);
} }
} }
} }
else else
{ {
@ -1052,8 +1050,6 @@ void CClientChatManager::buildChatSentence(TDataSetIndex /* compressedSenderInde
senderName = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(senderName), bWoman); senderName = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(senderName), bWoman);
} }
} }
} }
switch(type) switch(type)

1
code/ryzom/client/src/entity_cl.cpp
View file

@ -2296,6 +2296,7 @@ void CEntityCL::onStringAvailable(uint /* stringId */, const ucstring &value)
} }
ucstring replacement(STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw, womanTitle)); ucstring replacement(STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw, womanTitle));
// Sometimes translation contains another title // Sometimes translation contains another title
{ {
ucstring::size_type pos = replacement.find('$'); ucstring::size_type pos = replacement.find('$');

1
code/ryzom/client/src/far_tp.cpp
View file

@ -189,7 +189,6 @@ const std::string& CLoginStateMachine::toString(CLoginStateMachine::TEvent event
break; \ break; \
} \ } \
extern std::string LoginLogin, LoginPassword; extern std::string LoginLogin, LoginPassword;
extern bool noUserChar; extern bool noUserChar;
extern bool userChar; extern bool userChar;

1
code/ryzom/client/src/interface_v3/action_handler_game.cpp
View file

@ -1957,6 +1957,7 @@ public:
{ {
copyInout = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(copyInout), womanTitle); copyInout = STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(CEntityCL::getTitleFromName(copyInout), womanTitle);
} }
CStringPostProcessRemoveTitle::cbIDStringReceived(copyInout); CStringPostProcessRemoveTitle::cbIDStringReceived(copyInout);
inout = copyInout; inout = copyInout;
} }

3
code/ryzom/client/src/interface_v3/action_handler_phrase.cpp
View file

@ -777,7 +777,7 @@ void CHandlerMemorizePhraseOrMacro::execute (CCtrlBase *pCaller, const string &P
sint32 dstPhraseId= pCSDst->getSPhraseId(); sint32 dstPhraseId= pCSDst->getSPhraseId();
sint32 dstMacroId= pCSDst->getMacroId(); sint32 dstMacroId= pCSDst->getMacroId();
if ((src.empty()) && (CHandlerPhraseMemoryCopy::haveLastPhraseElement)) if (src.empty() && (CHandlerPhraseMemoryCopy::haveLastPhraseElement))
{ {
// get the slot ids from save // get the slot ids from save
srcIsMacro= CHandlerPhraseMemoryCopy::isMacro; srcIsMacro= CHandlerPhraseMemoryCopy::isMacro;
@ -1600,7 +1600,6 @@ public:
} }
} }
}; };
REGISTER_ACTION_HANDLER(CHandlerPhraseSelectMemory2, "phrase_select_memory_2"); REGISTER_ACTION_HANDLER(CHandlerPhraseSelectMemory2, "phrase_select_memory_2");
// *************************************************************************** // ***************************************************************************

1
code/ryzom/client/src/interface_v3/chat_displayer.h
View file

@ -30,7 +30,6 @@
#undef LOG_WARNING #undef LOG_WARNING
#endif #endif
/** /**
* class used to display console text commands in the chat window * class used to display console text commands in the chat window
* \author Nicolas Brigand * \author Nicolas Brigand

3
code/ryzom/client/src/interface_v3/chat_text_manager.cpp
View file

@ -47,7 +47,6 @@ CChatTextManager::~CChatTextManager()
_TextShadowed = NULL; _TextShadowed = NULL;
delete _ShowTimestamps; delete _ShowTimestamps;
_ShowTimestamps = NULL; _ShowTimestamps = NULL;
} }
//================================================================================= //=================================================================================
uint CChatTextManager::getTextFontSize() const uint CChatTextManager::getTextFontSize() const
@ -96,6 +95,7 @@ bool CChatTextManager::showTimestamps() const
} }
return _ShowTimestamps->getValueBool(); return _ShowTimestamps->getValueBool();
} }
//================================================================================= //=================================================================================
static CInterfaceGroup *parseCommandTag(ucstring &line) static CInterfaceGroup *parseCommandTag(ucstring &line)
{ {
@ -186,7 +186,6 @@ CViewBase *CChatTextManager::createMsgText(const ucstring &cstMsg, NLMISC::CRGBA
msg = cur_time + msg; msg = cur_time + msg;
} }
vt->setTextFormatTaged(msg); vt->setTextFormatTaged(msg);
vt->setColor(NLMISC::CRGBA::White); vt->setColor(NLMISC::CRGBA::White);
} }

3
code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
View file

@ -652,7 +652,6 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
if (pPlayer == NULL) if (pPlayer == NULL)
needPvPLogo = false; needPvPLogo = false;
if (pPlayer != NULL && needPvPLogo) if (pPlayer != NULL && needPvPLogo)
{ {
if (pvpFactionLogo) if (pvpFactionLogo)
@ -756,7 +755,6 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
view = leftGroup->getView ("win_jauge_bot"); view = leftGroup->getView ("win_jauge_bot");
if (view) if (view)
leftGroup->delView (view); leftGroup->delView (view);
} }
// Delete remaining strings // Delete remaining strings
@ -772,7 +770,6 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
if (win_mid) if (win_mid)
{ {
win_mid->setH (win_mid->getH() - spaceBar/2); win_mid->setH (win_mid->getH() - spaceBar/2);
} }
// Set player name // Set player name

1
code/ryzom/client/src/interface_v3/guild_manager.cpp
View file

@ -398,7 +398,6 @@ void CGuildManager::update()
bool dummy; bool dummy;
PeopleInterraction.ChatInput.Guild.displayMessage(msg, col, 2, &dummy); PeopleInterraction.ChatInput.Guild.displayMessage(msg, col, 2, &dummy);
break; break;
} }
} }

2
code/ryzom/client/src/interface_v3/interface_manager.cpp
View file

@ -3982,5 +3982,3 @@ bool CInterfaceManager::parseTokens(ucstring& ucstr)
ucstr = str; ucstr = str;
return true;; return true;;
} }

1
code/ryzom/client/src/interface_v3/people_interraction.cpp
View file

@ -2193,7 +2193,6 @@ class CHandlerTellContact : public IActionHandler
CInterfaceGroup *ig = pCaller->getParent(); CInterfaceGroup *ig = pCaller->getParent();
if (!ig) return; if (!ig) return;
CGroupContainer *gc = static_cast< CGroupContainer* >( ig->getEnclosingContainer() ); CGroupContainer *gc = static_cast< CGroupContainer* >( ig->getEnclosingContainer() );
if (!gc) return; if (!gc) return;
CPeopleList *list; CPeopleList *list;
uint peopleIndex; uint peopleIndex;

16
code/ryzom/client/src/interface_v3/sphrase_manager.cpp
View file

@ -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) if(memoryLine<0)
memoryLine= -1; 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 // since memory selection changes then must update all the DB and the Ctrl states
updateMemoryDBAll(); updateMemoryDBAll();
updateAllMemoryCtrlState(); updateAllMemoryCtrlState();
updateAllMemoryCtrlRegenTickRange(); updateAllMemoryCtrlRegenTickRange();
@ -492,14 +492,14 @@ void CSPhraseManager::selectMemoryLineDBalt(sint32 memoryLine)
} }
} }
// *************************************************************************** void CSPhraseManager::selectMemoryLineDBalt(sint32 memoryLine)
void CSPhraseManager::selectMemoryLineDB(sint32 memoryLine)
{ {
if(memoryLine<0) if(memoryLine<0)
memoryLine= -1; 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 // since memory selection changes then must update all the DB and the Ctrl states
updateMemoryDBAll(); updateMemoryDBAll();
updateAllMemoryCtrlState(); updateAllMemoryCtrlState();