mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-17 13:01:42 +00:00
Changed: Minor changes
This commit is contained in:
parent
7987db85ca
commit
d6a2af6abd
35 changed files with 132 additions and 116 deletions
|
@ -218,13 +218,13 @@ public:
|
||||||
static bool isServiceInitialized() { return _Instance != NULL; }
|
static bool isServiceInitialized() { return _Instance != NULL; }
|
||||||
|
|
||||||
/// Returns the current service short name (ie: TS)
|
/// Returns the current service short name (ie: TS)
|
||||||
const std::string &getServiceShortName () const { return _ShortName; };
|
const std::string &getServiceShortName () const { return _ShortName; }
|
||||||
|
|
||||||
/// Returns the current service long name (ie: test_serivce)
|
/// Returns the current service long name (ie: test_serivce)
|
||||||
const std::string &getServiceLongName () const { return _LongName; };
|
const std::string &getServiceLongName () const { return _LongName; }
|
||||||
|
|
||||||
/// Returns the current service alias name setted by AES
|
/// Returns the current service alias name setted by AES
|
||||||
const std::string &getServiceAliasName () const { return _AliasName; };
|
const std::string &getServiceAliasName () const { return _AliasName; }
|
||||||
|
|
||||||
/// Returns the current service unified name that is alias/short-id or short-id if alias is empty
|
/// Returns the current service unified name that is alias/short-id or short-id if alias is empty
|
||||||
std::string getServiceUnifiedName () const;
|
std::string getServiceUnifiedName () const;
|
||||||
|
@ -242,10 +242,10 @@ public:
|
||||||
uint32 getLaunchingDate () const;
|
uint32 getLaunchingDate () const;
|
||||||
|
|
||||||
/// Return true if this service don't use the NS (naming service)
|
/// Return true if this service don't use the NS (naming service)
|
||||||
bool getDontUseNS() const { return _DontUseNS; };
|
bool getDontUseNS() const { return _DontUseNS; }
|
||||||
|
|
||||||
/// Return true if this service don't use the AES (admin executor service)
|
/// Return true if this service don't use the AES (admin executor service)
|
||||||
bool getDontUseAES() const { return _DontUseAES; };
|
bool getDontUseAES() const { return _DontUseAES; }
|
||||||
|
|
||||||
/// Returns arguments of the program pass from the user to the program using parameters (ie: "myprog param1 param2")
|
/// Returns arguments of the program pass from the user to the program using parameters (ie: "myprog param1 param2")
|
||||||
const NLMISC::CVectorSString &getArgs () const { return _Args; }
|
const NLMISC::CVectorSString &getArgs () const { return _Args; }
|
||||||
|
|
|
@ -583,7 +583,6 @@ void CLandscape::setDriver(IDriver *drv)
|
||||||
// Does the driver has sufficient requirements for Vegetable???
|
// Does the driver has sufficient requirements for Vegetable???
|
||||||
// only if VP supported by GPU, and Only if max vertices allowed.
|
// only if VP supported by GPU, and Only if max vertices allowed.
|
||||||
_DriverOkForVegetable = _VertexShaderOk && (_Driver->getMaxVerticesByVertexBufferHard()>=(uint)NL3D_LANDSCAPE_VEGETABLE_MAX_AGP_VERTEX_MAX);
|
_DriverOkForVegetable = _VertexShaderOk && (_Driver->getMaxVerticesByVertexBufferHard()>=(uint)NL3D_LANDSCAPE_VEGETABLE_MAX_AGP_VERTEX_MAX);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -611,7 +611,6 @@ void CLandscapeVBAllocator::setupVBFormatAndVertexProgram(bool withVertexProgr
|
||||||
nlverify(_Driver->compileVertexProgram(_VertexProgram[1]));
|
nlverify(_Driver->compileVertexProgram(_VertexProgram[1]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
# Need clientsheets lib for sheets packer tool
|
# Need clientsheets lib for sheets packer tool
|
||||||
ADD_SUBDIRECTORY(client_sheets)
|
ADD_SUBDIRECTORY(client_sheets)
|
||||||
|
|
||||||
|
|
|
@ -3890,7 +3890,6 @@ NLMISC_COMMAND(displayInventoryCounter, "display the Inventory counter to compar
|
||||||
|
|
||||||
NLMISC_COMMAND(displayActionCounter, "display the action counters", "")
|
NLMISC_COMMAND(displayActionCounter, "display the action counters", "")
|
||||||
{
|
{
|
||||||
|
|
||||||
CInterfaceManager *pIM= CInterfaceManager::getInstance();
|
CInterfaceManager *pIM= CInterfaceManager::getInstance();
|
||||||
CSPhraseManager *pPM= CSPhraseManager::getInstance();
|
CSPhraseManager *pPM= CSPhraseManager::getInstance();
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
// 3D Interface.
|
// 3D Interface.
|
||||||
#include "nel/3d/u_driver.h"
|
#include "nel/3d/u_driver.h"
|
||||||
#include "nel/3d/u_text_context.h"
|
#include "nel/3d/u_text_context.h"
|
||||||
#include <nel/3d/stereo_display.h>
|
#include "nel/3d/stereo_display.h"
|
||||||
// Game Share
|
// Game Share
|
||||||
//#include "game_share/gd_time.h" // \todo GUIGUI : TO DELETE/CHANGE
|
//#include "game_share/gd_time.h" // \todo GUIGUI : TO DELETE/CHANGE
|
||||||
#include "game_share/gender.h"
|
#include "game_share/gender.h"
|
||||||
|
|
|
@ -788,7 +788,7 @@ void prelogInit()
|
||||||
#ifdef NL_OS_WINDOWS
|
#ifdef NL_OS_WINDOWS
|
||||||
_control87 (_EM_INVALID|_EM_DENORMAL/*|_EM_ZERODIVIDE|_EM_OVERFLOW*/|_EM_UNDERFLOW|_EM_INEXACT, _MCW_EM);
|
_control87 (_EM_INVALID|_EM_DENORMAL/*|_EM_ZERODIVIDE|_EM_OVERFLOW*/|_EM_UNDERFLOW|_EM_INEXACT, _MCW_EM);
|
||||||
#endif // NL_OS_WINDOWS
|
#endif // NL_OS_WINDOWS
|
||||||
|
|
||||||
CTime::CTimerInfo timerInfo;
|
CTime::CTimerInfo timerInfo;
|
||||||
NLMISC::CTime::probeTimerInfo(timerInfo);
|
NLMISC::CTime::probeTimerInfo(timerInfo);
|
||||||
if (timerInfo.RequiresSingleCore) // TODO: Also have a FV configuration value to force single core.
|
if (timerInfo.RequiresSingleCore) // TODO: Also have a FV configuration value to force single core.
|
||||||
|
@ -930,7 +930,6 @@ void prelogInit()
|
||||||
switch(ClientCfg.Driver3D)
|
switch(ClientCfg.Driver3D)
|
||||||
{
|
{
|
||||||
#ifdef NL_OS_WINDOWS
|
#ifdef NL_OS_WINDOWS
|
||||||
|
|
||||||
case CClientConfig::Direct3D:
|
case CClientConfig::Direct3D:
|
||||||
driver = UDriver::Direct3d;
|
driver = UDriver::Direct3d;
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -815,7 +815,6 @@ public:
|
||||||
CurrentStackDst= NULL;
|
CurrentStackDst= NULL;
|
||||||
validateStackItem(pCSSrc, pCSDst, val, CurrentStackMode);
|
validateStackItem(pCSSrc, pCSDst, val, CurrentStackMode);
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
};
|
||||||
REGISTER_ACTION_HANDLER( CHandlerStackOk, "stack_item");
|
REGISTER_ACTION_HANDLER( CHandlerStackOk, "stack_item");
|
||||||
|
|
||||||
|
@ -826,17 +825,17 @@ class CPlayerTradePutBagItemToExchange : public IActionHandler
|
||||||
public:
|
public:
|
||||||
virtual void execute (CCtrlBase *pCaller, const string &/* Params */)
|
virtual void execute (CCtrlBase *pCaller, const string &/* Params */)
|
||||||
{
|
{
|
||||||
CInterfaceManager *im = CInterfaceManager::getInstance();
|
CInterfaceManager *im = CInterfaceManager::getInstance();
|
||||||
CDBCtrlSheet *src = dynamic_cast<CDBCtrlSheet *>(pCaller);
|
CDBCtrlSheet *src = dynamic_cast<CDBCtrlSheet *>(pCaller);
|
||||||
CDBCtrlSheet *dest = dynamic_cast<CDBCtrlSheet *>(CWidgetManager::getInstance()->getCtrlLaunchingModal());
|
CDBCtrlSheet *dest = dynamic_cast<CDBCtrlSheet *>(CWidgetManager::getInstance()->getCtrlLaunchingModal());
|
||||||
if (src->getSheetId() == 0)
|
if (src->getSheetId() == 0)
|
||||||
{
|
{
|
||||||
putExchangedItemToInventory(dest);
|
putExchangedItemToInventory(dest);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
putInventoryItemToExchange(src, dest);
|
putInventoryItemToExchange(src, dest);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
REGISTER_ACTION_HANDLER(CPlayerTradePutBagItemToExchange, "put_bag_item_to_exchange");
|
REGISTER_ACTION_HANDLER(CPlayerTradePutBagItemToExchange, "put_bag_item_to_exchange");
|
||||||
|
|
|
@ -53,7 +53,6 @@ void CBotChatPageMission::init()
|
||||||
NLGUI::CDBManager::getInstance()->addBranchObserver("SERVER:CHOOSE_MISSIONS", &_MissionPagesObs);
|
NLGUI::CDBManager::getInstance()->addBranchObserver("SERVER:CHOOSE_MISSIONS", &_MissionPagesObs);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// ***************************************************************************************
|
// ***************************************************************************************
|
||||||
void CBotChatPageMission::begin()
|
void CBotChatPageMission::begin()
|
||||||
{
|
{
|
||||||
|
|
|
@ -1808,7 +1808,6 @@ void CBotChatPageTrade::giveFocusToMaxEBChangeBuyFilterDialog()
|
||||||
setFocusOnEditBox(ig->getGroup("edit_max:eb"));
|
setFocusOnEditBox(ig->getGroup("edit_max:eb"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// ***************************************************************************
|
// ***************************************************************************
|
||||||
void CBotChatPageTrade::startChangeBuyFilterMPDialog()
|
void CBotChatPageTrade::startChangeBuyFilterMPDialog()
|
||||||
{
|
{
|
||||||
|
@ -1822,7 +1821,6 @@ void CBotChatPageTrade::startChangeBuyFilterMPDialog()
|
||||||
CWidgetManager::getInstance()->enableModalWindow(NULL, ig);
|
CWidgetManager::getInstance()->enableModalWindow(NULL, ig);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// ***************************************************************************
|
// ***************************************************************************
|
||||||
void CBotChatPageTrade::confirmChangeBuyFilterMPDialog(uint ft)
|
void CBotChatPageTrade::confirmChangeBuyFilterMPDialog(uint ft)
|
||||||
{
|
{
|
||||||
|
@ -1840,7 +1838,6 @@ void CBotChatPageTrade::confirmChangeBuyFilterMPDialog(uint ft)
|
||||||
CWidgetManager::getInstance()->disableModalWindow();
|
CWidgetManager::getInstance()->disableModalWindow();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// ***************************************************************************
|
// ***************************************************************************
|
||||||
void CBotChatPageTrade::resetItemPartAndTypeFilters()
|
void CBotChatPageTrade::resetItemPartAndTypeFilters()
|
||||||
{
|
{
|
||||||
|
|
|
@ -601,7 +601,7 @@ void CChatGroupWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CC
|
||||||
if (pos == ucstring::npos || (colonpos < pos))
|
if (pos == ucstring::npos || (colonpos < pos))
|
||||||
{
|
{
|
||||||
// No timestamp, so put it right after the color and add a space
|
// No timestamp, so put it right after the color and add a space
|
||||||
pos = newmsg.find(ucstring("}"));;
|
pos = newmsg.find(ucstring("}"));
|
||||||
prefix += " ";
|
prefix += " ";
|
||||||
}
|
}
|
||||||
newmsg = newmsg.substr(0, pos + 1) + prefix + newmsg.substr(pos + 1);
|
newmsg = newmsg.substr(0, pos + 1) + prefix + newmsg.substr(pos + 1);
|
||||||
|
|
|
@ -1741,7 +1741,6 @@ void CDBCtrlSheet::resetCharBitmaps()
|
||||||
_CharBitmaps.clear();
|
_CharBitmaps.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// ***************************************************************************
|
// ***************************************************************************
|
||||||
void CDBCtrlSheet::setupCharBitmaps(sint32 maxW, sint32 maxLine, sint32 maxWChar, bool topDown)
|
void CDBCtrlSheet::setupCharBitmaps(sint32 maxW, sint32 maxLine, sint32 maxWChar, bool topDown)
|
||||||
{
|
{
|
||||||
|
|
|
@ -175,7 +175,6 @@ void CDBGroupListSheetTextShare::CSheetChildShare::init(CDBGroupListSheetText *p
|
||||||
pNL = NLGUI::CDBManager::getInstance()->getDbProp(sTmp, false);
|
pNL = NLGUI::CDBManager::getInstance()->getDbProp(sTmp, false);
|
||||||
nlassert(pNL != NULL);
|
nlassert(pNL != NULL);
|
||||||
CurrentWanted.link ( sTmp.c_str() );
|
CurrentWanted.link ( sTmp.c_str() );
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -728,7 +728,6 @@ void CDBGroupListSheetTrade::sort()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool CDBGroupListSheetTrade::needCheckAllItems()
|
bool CDBGroupListSheetTrade::needCheckAllItems()
|
||||||
{
|
{
|
||||||
if (_LastFamePriceFactor != _FamePriceFactorLeaf->getValue16())
|
if (_LastFamePriceFactor != _FamePriceFactorLeaf->getValue16())
|
||||||
|
|
|
@ -159,10 +159,8 @@ void CSkillManager::initInGame()
|
||||||
_TrackSkillChange= NLGUI::CDBManager::getInstance()->getDbProp("UI:VARIABLES:TRACK_SKILL_CHANGE", true);
|
_TrackSkillChange= NLGUI::CDBManager::getInstance()->getDbProp("UI:VARIABLES:TRACK_SKILL_CHANGE", true);
|
||||||
// Add a branch observer on skill value change
|
// Add a branch observer on skill value change
|
||||||
NLGUI::CDBManager::getInstance()->addBranchObserver( "SERVER:CHARACTER_INFO:SKILLS", &_SkillChangeObs );
|
NLGUI::CDBManager::getInstance()->addBranchObserver( "SERVER:CHARACTER_INFO:SKILLS", &_SkillChangeObs );
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// ***************************************************************************
|
// ***************************************************************************
|
||||||
void CSkillManager::uninitInGame()
|
void CSkillManager::uninitInGame()
|
||||||
{
|
{
|
||||||
|
|
|
@ -177,7 +177,7 @@ void CViewRadar::draw ()
|
||||||
// Select the icon to display and draw it
|
// Select the icon to display and draw it
|
||||||
uint spotId = CNPCIconCache::getInstance().getNPCIcon(entity).getSpotId();
|
uint spotId = CNPCIconCache::getInstance().getNPCIcon(entity).getSpotId();
|
||||||
CRadarSpotDesc spotDesc = _SpotDescriptions[spotId];
|
CRadarSpotDesc spotDesc = _SpotDescriptions[spotId];
|
||||||
|
|
||||||
if (!_MissionIconsObs._displayMissionSpots)
|
if (!_MissionIconsObs._displayMissionSpots)
|
||||||
spotDesc = _SpotDescriptions[0];
|
spotDesc = _SpotDescriptions[0];
|
||||||
|
|
||||||
|
|
|
@ -225,6 +225,7 @@ uint getCurrentColorDepth();
|
||||||
// get maximized
|
// get maximized
|
||||||
bool isWindowMaximized();
|
bool isWindowMaximized();
|
||||||
|
|
||||||
|
// get all supported video modes
|
||||||
sint getRyzomModes(std::vector<NL3D::UDriver::CMode> &videoModes, std::vector<std::string> &stringModeList);
|
sint getRyzomModes(std::vector<NL3D::UDriver::CMode> &videoModes, std::vector<std::string> &stringModeList);
|
||||||
|
|
||||||
#endif // CL_MISC_H
|
#endif // CL_MISC_H
|
||||||
|
|
|
@ -673,7 +673,7 @@ void CPlayerCL::updateVisualPropertyVpa(const NLMISC::TGameCycle &/* gameCycle *
|
||||||
}
|
}
|
||||||
|
|
||||||
// update title when gender changed
|
// update title when gender changed
|
||||||
const ucstring replacement(STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw,_Gender == GSGENDER::female));
|
const ucstring replacement(STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw, _Gender == GSGENDER::female));
|
||||||
if (!replacement.empty() || !ClientCfg.DebugStringManager)
|
if (!replacement.empty() || !ClientCfg.DebugStringManager)
|
||||||
{
|
{
|
||||||
// Get extended name
|
// Get extended name
|
||||||
|
|
|
@ -5293,10 +5293,8 @@ void CEditor::onTestModeDisconnected(TSessionId sessionId, uint32 lastAct, TSce
|
||||||
//H_AUTO(R2_CEditor_onTestModeDisconnected)
|
//H_AUTO(R2_CEditor_onTestModeDisconnected)
|
||||||
CHECK_EDITOR
|
CHECK_EDITOR
|
||||||
_DMC->CDynamicMapClient::onTestModeDisconnected(sessionId, lastAct, sessionType);
|
_DMC->CDynamicMapClient::onTestModeDisconnected(sessionId, lastAct, sessionType);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// *********************************************************************************************************
|
// *********************************************************************************************************
|
||||||
void CEditor::nodeInserted(const std::string& instanceId, const std::string& attrName, sint32 position, const std::string& key, CObject* value)
|
void CEditor::nodeInserted(const std::string& instanceId, const std::string& attrName, sint32 position, const std::string& key, CObject* value)
|
||||||
{
|
{
|
||||||
|
@ -6611,7 +6609,7 @@ NLMISC::CVectorD getVectorD(const CObject *obj)
|
||||||
CObject *buildVector(const NLMISC::CVectorD &vector, const std::string &instanceId /*= ""*/)
|
CObject *buildVector(const NLMISC::CVectorD &vector, const std::string &instanceId /*= ""*/)
|
||||||
{
|
{
|
||||||
CObject *table;
|
CObject *table;
|
||||||
if (instanceId.empty() )
|
if (instanceId.empty())
|
||||||
{
|
{
|
||||||
table = getEditor().getDMC().newComponent("Position");
|
table = getEditor().getDMC().newComponent("Position");
|
||||||
table->set("x", vector.x);
|
table->set("x", vector.x);
|
||||||
|
|
|
@ -48,7 +48,7 @@ extern sint64 DT64; // Diff time with current and last frame in ms.
|
||||||
extern float DT; // Diff time with current and last frame in sec.
|
extern float DT; // Diff time with current and last frame in sec.
|
||||||
extern TTime TSend; // Next Time to send motions.
|
extern TTime TSend; // Next Time to send motions.
|
||||||
extern TTime DTSend; // Delta of time to generate the next time to send motions.
|
extern TTime DTSend; // Delta of time to generate the next time to send motions.
|
||||||
extern double TimeInSec; // Time for the current frame in second.
|
extern double TimeInSec; // Time for the current frame in second.
|
||||||
extern double FirstTimeInSec; // Game local origin time
|
extern double FirstTimeInSec; // Game local origin time
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -875,9 +875,9 @@ Colors are something like that:
|
||||||
2: VERT CITRON VERT CITRON GREEN
|
2: VERT CITRON VERT CITRON GREEN
|
||||||
3: VERT VERT TURQUOISE
|
3: VERT VERT TURQUOISE
|
||||||
4: BLEU BLEU BLUE
|
4: BLEU BLEU BLUE
|
||||||
5: ROUGE fonce ROUGE (tout court) CRIMSON
|
5: ROUGE dark ROUGE (normal) CRIMSON
|
||||||
6: BLANC JAUNE WHITE
|
6: BLANC JAUNE WHITE
|
||||||
7: NOIR BLEU tres fonce BLACK
|
7: NOIR BLEU very dark BLACK
|
||||||
|
|
||||||
3D column is (probably) used for equipment
|
3D column is (probably) used for equipment
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1407,8 +1407,8 @@ public:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// check if its a number or a var.
|
// check if it's a number or a var.
|
||||||
//TODO: et les variables negatives?
|
//TODO: and negative values ?
|
||||||
if ((str[0]<='9' && str[0]>='0')||(str[0]=='-')) // its a number
|
if ((str[0]<='9' && str[0]>='0')||(str[0]=='-')) // its a number
|
||||||
{
|
{
|
||||||
var.Type = constant;
|
var.Type = constant;
|
||||||
|
|
|
@ -507,7 +507,7 @@ void CDynChatEGS::iosSetHideBubble(TChanID chan, bool hideBubble)
|
||||||
void CDynChatEGS::iosSetUniversalChannel(TChanID chan, bool universalChannel)
|
void CDynChatEGS::iosSetUniversalChannel(TChanID chan, bool universalChannel)
|
||||||
{
|
{
|
||||||
CMessage msg("DYN_CHAT:SET_UNIVERSAL_CHANNEL");
|
CMessage msg("DYN_CHAT:SET_UNIVERSAL_CHANNEL");
|
||||||
msg.serial(chan);
|
msg.serial(chan);
|
||||||
msg.serial(universalChannel);
|
msg.serial(universalChannel);
|
||||||
sendMessageViaMirror( "IOS", msg);
|
sendMessageViaMirror( "IOS", msg);
|
||||||
}
|
}
|
||||||
|
|
|
@ -211,13 +211,16 @@ std::vector<TChanID> CPVPManager2::getCharacterChannels(CCharacter * user)
|
||||||
result.clear();
|
result.clear();
|
||||||
|
|
||||||
// Add lang channel, should be first.
|
// Add lang channel, should be first.
|
||||||
if (!user->getLangChannel().empty()) {
|
if (!user->getLangChannel().empty())
|
||||||
|
{
|
||||||
TMAPExtraFactionChannel::iterator it = _ExtraFactionChannel.find(user->getLangChannel());
|
TMAPExtraFactionChannel::iterator it = _ExtraFactionChannel.find(user->getLangChannel());
|
||||||
if (it != _ExtraFactionChannel.end())
|
if (it != _ExtraFactionChannel.end())
|
||||||
{
|
{
|
||||||
result.push_back((*it).second);
|
result.push_back((*it).second);
|
||||||
}
|
}
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
TMAPExtraFactionChannel::iterator it = _ExtraFactionChannel.find("en");
|
TMAPExtraFactionChannel::iterator it = _ExtraFactionChannel.find("en");
|
||||||
if (it != _ExtraFactionChannel.end())
|
if (it != _ExtraFactionChannel.end())
|
||||||
{
|
{
|
||||||
|
|
|
@ -460,9 +460,9 @@ void CCharacterShoppingList::initPageToUpdate( uint32 nbSlotPerPage )
|
||||||
void CCharacterShoppingList::fillTradePage( uint16 session )
|
void CCharacterShoppingList::fillTradePage( uint16 session )
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
- Ajout de TRADING:*:PRICE_RETIRE (utile que si SELLER_TYPE == User ou ResaleAndUser). Note: Prix UNITAIRE (si MP, Ammo etc..)
|
- Added TRADING:*:PRICE_RETIRE (only useful if SELLER_TYPE == User or ResaleAndUser). Note: UNIT price (if Raw Mats, Ammo, etc..)
|
||||||
- Si SELLER_TYPE==User seulement: Si PRICE==-1, alors cela veut dire " Item Sold " (pour afficher la liste des items vendus les plus récents)
|
- If SELLER_TYPE==User only: if PRICE==-1, then it means " Item Sold " (to display list of more recent sold items)
|
||||||
- Note: TRADING:*:PRICE reste un Prix UNITAIRE (si MP, Ammo etc..) (cela devait déja être le cas)
|
- Note: TRADING:*:PRICE is wtill a UNIT price (if Raw Mats, Ammo, etc..) (it should already be the case)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// get page to update if any
|
// get page to update if any
|
||||||
|
|
|
@ -53,7 +53,8 @@ namespace NLQT {
|
||||||
{
|
{
|
||||||
// load config
|
// load config
|
||||||
QFile file(NLQT_CONFIG_FILE);
|
QFile file(NLQT_CONFIG_FILE);
|
||||||
if (!file.exists()) {
|
if (!file.exists())
|
||||||
|
{
|
||||||
file.open( QIODevice::WriteOnly | QIODevice::Text );
|
file.open( QIODevice::WriteOnly | QIODevice::Text );
|
||||||
file.write("GraphicsDrivers = { \"OpenGL\", \"Direct3D\" };");
|
file.write("GraphicsDrivers = { \"OpenGL\", \"Direct3D\" };");
|
||||||
file.write("\nSearchPaths = {\"\"};");
|
file.write("\nSearchPaths = {\"\"};");
|
||||||
|
@ -64,9 +65,12 @@ namespace NLQT {
|
||||||
file.close();
|
file.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try
|
||||||
|
{
|
||||||
ConfigFile.load(NLQT_CONFIG_FILE);
|
ConfigFile.load(NLQT_CONFIG_FILE);
|
||||||
} catch(...) {
|
}
|
||||||
|
catch(...)
|
||||||
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
addLeveldesignPath();
|
addLeveldesignPath();
|
||||||
|
@ -213,16 +217,17 @@ namespace NLQT {
|
||||||
uint listsize = tmpList->size();
|
uint listsize = tmpList->size();
|
||||||
for (uint i = 0; i < listsize; ++i)
|
for (uint i = 0; i < listsize; ++i)
|
||||||
{
|
{
|
||||||
if(_progressCB) {
|
if(_progressCB)
|
||||||
_progressCB->DisplayString = tmpList->at(i);
|
{
|
||||||
CPath::addSearchPath(tmpList->at(i), true, false, _progressCB);
|
_progressCB->DisplayString = tmpList->at(i);
|
||||||
|
CPath::addSearchPath(tmpList->at(i), true, false, _progressCB);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
CProgressDialog pcb;
|
CProgressDialog pcb;
|
||||||
pcb.DisplayString = tmpList->at(i);
|
pcb.DisplayString = tmpList->at(i);
|
||||||
pcb.show();
|
pcb.show();
|
||||||
CPath::addSearchPath(tmpList->at(i), true, false, &pcb);
|
CPath::addSearchPath(tmpList->at(i), true, false, &pcb);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!list)
|
if (!list)
|
||||||
|
|
|
@ -60,7 +60,8 @@ namespace NLQT
|
||||||
|
|
||||||
CFormItem* curItem = m->getItem(mp->mapToSource(index));
|
CFormItem* curItem = m->getItem(mp->mapToSource(index));
|
||||||
NLGEORGES::UFormElm *curElm = curItem->getFormElm();
|
NLGEORGES::UFormElm *curElm = curItem->getFormElm();
|
||||||
if (!curElm) {
|
if (!curElm)
|
||||||
|
{
|
||||||
// TODO: create new Element
|
// TODO: create new Element
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -377,7 +377,8 @@ namespace NLQT
|
||||||
nlinfo("CGeorgesTreeViewDialog::filterRows");
|
nlinfo("CGeorgesTreeViewDialog::filterRows");
|
||||||
CGeorgesFormProxyModel * mp = dynamic_cast<CGeorgesFormProxyModel *>(_ui.treeView->model());
|
CGeorgesFormProxyModel * mp = dynamic_cast<CGeorgesFormProxyModel *>(_ui.treeView->model());
|
||||||
CGeorgesFormModel *m = dynamic_cast<CGeorgesFormModel *>(mp->sourceModel());
|
CGeorgesFormModel *m = dynamic_cast<CGeorgesFormModel *>(mp->sourceModel());
|
||||||
if (m) {
|
if (m)
|
||||||
|
{
|
||||||
m->setShowParents(_ui.checkBoxParent->isChecked());
|
m->setShowParents(_ui.checkBoxParent->isChecked());
|
||||||
m->setShowDefaults(_ui.checkBoxDefaults->isChecked());
|
m->setShowDefaults(_ui.checkBoxDefaults->isChecked());
|
||||||
}
|
}
|
||||||
|
|
|
@ -352,7 +352,8 @@ namespace NLQT
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
||||||
void CGeorgesFormModel::loadFormData(UFormElm *root, CFormItem *parent) {
|
void CGeorgesFormModel::loadFormData(UFormElm *root, CFormItem *parent)
|
||||||
|
{
|
||||||
|
|
||||||
if (!root)
|
if (!root)
|
||||||
return;
|
return;
|
||||||
|
@ -390,7 +391,8 @@ namespace NLQT
|
||||||
elmtType = "Array";
|
elmtType = "Array";
|
||||||
if (elmt->isStruct())
|
if (elmt->isStruct())
|
||||||
elmtType = "Struct";
|
elmtType = "Struct";
|
||||||
if (elmt->isAtom()) {
|
if (elmt->isAtom())
|
||||||
|
{
|
||||||
elmtType = "Atom";
|
elmtType = "Atom";
|
||||||
uint numDefinitions = 0;
|
uint numDefinitions = 0;
|
||||||
const UType *type = elmt->getType();
|
const UType *type = elmt->getType();
|
||||||
|
@ -433,7 +435,8 @@ namespace NLQT
|
||||||
tmpValue = v.c_str();
|
tmpValue = v.c_str();
|
||||||
if (type->getType() == UType::SignedInt)
|
if (type->getType() == UType::SignedInt)
|
||||||
{
|
{
|
||||||
if (QString("%1").arg(value.c_str()).toDouble() == tmpValue.toDouble()) {
|
if (QString("%1").arg(value.c_str()).toDouble() == tmpValue.toDouble())
|
||||||
|
{
|
||||||
value = l;
|
value = l;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -482,7 +485,8 @@ namespace NLQT
|
||||||
}
|
}
|
||||||
columnData << QString(elmName.c_str()) << QString(value.c_str()) << "" << elmtType;
|
columnData << QString(elmName.c_str()) << QString(value.c_str()) << "" << elmtType;
|
||||||
parent->appendChild(new CFormItem(elmt, columnData, parent, *whereV, *whereN));
|
parent->appendChild(new CFormItem(elmt, columnData, parent, *whereV, *whereN));
|
||||||
//if (parents.last()->childCount() > 0) {
|
//if (parents.last()->childCount() > 0)
|
||||||
|
//{
|
||||||
// parents << parents.last()->child(parents.last()->childCount()-1);
|
// parents << parents.last()->child(parents.last()->childCount()-1);
|
||||||
//}
|
//}
|
||||||
loadFormData(elmt, parent->child(parent->childCount()-1));
|
loadFormData(elmt, parent->child(parent->childCount()-1));
|
||||||
|
@ -549,7 +553,8 @@ namespace NLQT
|
||||||
{
|
{
|
||||||
if (elmt->isArray())
|
if (elmt->isArray())
|
||||||
elmtType = "Array";
|
elmtType = "Array";
|
||||||
if (elmt->isStruct()) {
|
if (elmt->isStruct())
|
||||||
|
{
|
||||||
elmtType = "Struct";
|
elmtType = "Struct";
|
||||||
}
|
}
|
||||||
if (elmt->isAtom())
|
if (elmt->isAtom())
|
||||||
|
@ -593,28 +598,35 @@ namespace NLQT
|
||||||
CFormItem *fi_dep = new CFormItem(_rootElm, QList<QVariant>() << "dependencies", _rootItem);
|
CFormItem *fi_dep = new CFormItem(_rootElm, QList<QVariant>() << "dependencies", _rootItem);
|
||||||
_rootItem->appendChild(fi_dep);
|
_rootItem->appendChild(fi_dep);
|
||||||
|
|
||||||
if (!dfns.isEmpty()) {
|
if (!dfns.isEmpty())
|
||||||
CFormItem *fi_dfn = new CFormItem(_rootElm, QList<QVariant>() << "dfn", fi_dep);
|
{
|
||||||
fi_dep->appendChild(fi_dfn);
|
CFormItem *fi_dfn = new CFormItem(_rootElm, QList<QVariant>() << "dfn", fi_dep);
|
||||||
foreach(QString str, dfns) {
|
fi_dep->appendChild(fi_dfn);
|
||||||
fi_dfn->appendChild(new CFormItem(_rootElm, QList<QVariant>() << str, fi_dfn));
|
foreach(QString str, dfns)
|
||||||
}
|
{
|
||||||
}
|
fi_dfn->appendChild(new CFormItem(_rootElm, QList<QVariant>() << str, fi_dfn));
|
||||||
if (!typs.isEmpty()) {
|
}
|
||||||
CFormItem *fi_typ = new CFormItem(_rootElm, QList<QVariant>() << "typ", fi_dep);
|
|
||||||
fi_dep->appendChild(fi_typ);
|
|
||||||
foreach(QString str, typs) {
|
|
||||||
fi_typ->appendChild(new CFormItem(_rootElm, QList<QVariant>() << str, fi_typ));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!_dependencies.isEmpty()) {
|
|
||||||
CFormItem *fi_other = new CFormItem(_rootElm, QList<QVariant>() << "other", fi_dep);
|
|
||||||
fi_dep->appendChild(fi_other);
|
|
||||||
foreach(QStringList list, _dependencies) {
|
|
||||||
foreach(QString str, list) {
|
|
||||||
fi_other->appendChild(new CFormItem(_rootElm, QList<QVariant>() << str, fi_other));
|
|
||||||
}
|
}
|
||||||
|
if (!typs.isEmpty())
|
||||||
|
{
|
||||||
|
CFormItem *fi_typ = new CFormItem(_rootElm, QList<QVariant>() << "typ", fi_dep);
|
||||||
|
fi_dep->appendChild(fi_typ);
|
||||||
|
foreach(QString str, typs)
|
||||||
|
{
|
||||||
|
fi_typ->appendChild(new CFormItem(_rootElm, QList<QVariant>() << str, fi_typ));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
if (!_dependencies.isEmpty())
|
||||||
|
{
|
||||||
|
CFormItem *fi_other = new CFormItem(_rootElm, QList<QVariant>() << "other", fi_dep);
|
||||||
|
fi_dep->appendChild(fi_other);
|
||||||
|
foreach(QStringList list, _dependencies)
|
||||||
|
{
|
||||||
|
foreach(QString str, list)
|
||||||
|
{
|
||||||
|
fi_other->appendChild(new CFormItem(_rootElm, QList<QVariant>() << str, fi_other));
|
||||||
|
}
|
||||||
|
}
|
||||||
}*/
|
}*/
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -338,7 +338,8 @@ namespace NLQT
|
||||||
_aboutQtAction->setStatusTip(tr("Show the Qt library's About box"));
|
_aboutQtAction->setStatusTip(tr("Show the Qt library's About box"));
|
||||||
connect(_aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
|
connect(_aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
|
||||||
|
|
||||||
for (int i = 0; i < MaxRecentFiles; ++i) {
|
for (int i = 0; i < MaxRecentFiles; ++i)
|
||||||
|
{
|
||||||
recentFileActs[i] = new QAction(this);
|
recentFileActs[i] = new QAction(this);
|
||||||
recentFileActs[i]->setVisible(false);
|
recentFileActs[i]->setVisible(false);
|
||||||
connect(recentFileActs[i], SIGNAL(triggered()),
|
connect(recentFileActs[i], SIGNAL(triggered()),
|
||||||
|
|
|
@ -333,7 +333,8 @@ namespace NLQT
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CGeorgesNewDialog::validateParentCombo() {
|
void CGeorgesNewDialog::validateParentCombo()
|
||||||
|
{
|
||||||
// TODO: clear if no valid text
|
// TODO: clear if no valid text
|
||||||
//if (!_filelist.contains(_ui.parentLineEdit->text()))
|
//if (!_filelist.contains(_ui.parentLineEdit->text()))
|
||||||
// _ui.parentLineEdit->clear();
|
// _ui.parentLineEdit->clear();
|
||||||
|
|
|
@ -77,7 +77,8 @@ namespace NLQT
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void CObjectViewerDialog::topLevelChanged ( bool topLevel ) {
|
void CObjectViewerDialog::topLevelChanged ( bool topLevel )
|
||||||
|
{
|
||||||
//nldebug("topLevel:%d",topLevel);
|
//nldebug("topLevel:%d",topLevel);
|
||||||
//_georges->init();
|
//_georges->init();
|
||||||
}
|
}
|
||||||
|
@ -100,7 +101,8 @@ namespace NLQT
|
||||||
{
|
{
|
||||||
//nldebug("%d %d",_nlw->width(), _nlw->height());
|
//nldebug("%d %d",_nlw->width(), _nlw->height());
|
||||||
QDockWidget::resizeEvent(resizeEvent);
|
QDockWidget::resizeEvent(resizeEvent);
|
||||||
if (Modules::objViewInt()) {
|
if (Modules::objViewInt())
|
||||||
|
{
|
||||||
if (Modules::objViewInt()->getDriver())
|
if (Modules::objViewInt()->getDriver())
|
||||||
Modules::objViewInt()->setSizeViewport(resizeEvent->size().width(), resizeEvent->size().height());
|
Modules::objViewInt()->setSizeViewport(resizeEvent->size().width(), resizeEvent->size().height());
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,8 +39,8 @@ namespace NLQT
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
CQtDisplayer::~CQtDisplayer() {
|
CQtDisplayer::~CQtDisplayer()
|
||||||
;
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void CQtDisplayer::setParam (QPlainTextEdit *dlgDebug, bool eraseLastLog)
|
void CQtDisplayer::setParam (QPlainTextEdit *dlgDebug, bool eraseLastLog)
|
||||||
|
@ -59,7 +59,8 @@ namespace NLQT
|
||||||
|
|
||||||
QTextCharFormat format;
|
QTextCharFormat format;
|
||||||
|
|
||||||
if (args.Date != 0 && !_Raw) {
|
if (args.Date != 0 && !_Raw)
|
||||||
|
{
|
||||||
str += dateToHumanString(args.Date);
|
str += dateToHumanString(args.Date);
|
||||||
needSpace = true;
|
needSpace = true;
|
||||||
}
|
}
|
||||||
|
@ -76,27 +77,31 @@ namespace NLQT
|
||||||
}
|
}
|
||||||
|
|
||||||
// Write thread identifier
|
// Write thread identifier
|
||||||
/*if ( args.ThreadId != 0 && !_Raw) {
|
/*if ( args.ThreadId != 0 && !_Raw)
|
||||||
if (needSpace) { str += " "; needSpace = false; }
|
{
|
||||||
str += NLMISC::toString(args.ThreadId);
|
if (needSpace) { str += " "; needSpace = false; }
|
||||||
needSpace = true;
|
str += NLMISC::toString(args.ThreadId);
|
||||||
|
needSpace = true;
|
||||||
}*/
|
}*/
|
||||||
/*if (!args.ProcessName.empty() && !_Raw) {
|
/*if (!args.ProcessName.empty() && !_Raw)
|
||||||
if (needSpace) { str += " "; needSpace = false; }
|
{
|
||||||
str += args.ProcessName;
|
if (needSpace) { str += " "; needSpace = false; }
|
||||||
needSpace = true;
|
str += args.ProcessName;
|
||||||
|
needSpace = true;
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
//if (args.FileName != NULL && !_Raw) {
|
//if (args.FileName != NULL && !_Raw)
|
||||||
|
//{
|
||||||
// if (needSpace) { str += " "; needSpace = false; }
|
// if (needSpace) { str += " "; needSpace = false; }
|
||||||
// str += NLMISC::CFile::getFilename(args.FileName);
|
// str += NLMISC::CFile::getFilename(args.FileName);
|
||||||
// needSpace = true;
|
// needSpace = true;
|
||||||
//}
|
//}
|
||||||
|
|
||||||
/*if (args.Line != -1 && !_Raw) {
|
/*if (args.Line != -1 && !_Raw)
|
||||||
if (needSpace) { str += " "; needSpace = false; }
|
{
|
||||||
str += NLMISC::toString(args.Line);
|
if (needSpace) { str += " "; needSpace = false; }
|
||||||
needSpace = true;
|
str += NLMISC::toString(args.Line);
|
||||||
|
needSpace = true;
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
if (args.FuncName != NULL && !_Raw)
|
if (args.FuncName != NULL && !_Raw)
|
||||||
|
|
|
@ -2595,8 +2595,8 @@ void CExport::transformAdditionnalIG (const std::string &name, const NLMISC::CMa
|
||||||
inStream.close();
|
inStream.close();
|
||||||
if (_ExportCB != NULL)
|
if (_ExportCB != NULL)
|
||||||
{
|
{
|
||||||
_ExportCB->dispWarning("Error while reading " + igName);
|
_ExportCB->dispWarning("Error while reading " + igName);
|
||||||
_ExportCB->dispWarning(e.what());
|
_ExportCB->dispWarning(e.what());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -96,13 +96,14 @@ const std::string historyDir("history/");
|
||||||
string diffVersion;
|
string diffVersion;
|
||||||
|
|
||||||
#ifndef NL_OS_WINDOWS
|
#ifndef NL_OS_WINDOWS
|
||||||
char* itoa(int val, char *buffer, int base){
|
char* itoa(int val, char *buffer, int base)
|
||||||
static char buf[32] = {0};
|
{
|
||||||
int i = 30;
|
static char buf[32] = {0};
|
||||||
for(; val && i ; --i, val /= base)
|
int i = 30;
|
||||||
buf[i] = "0123456789abcdef"[val % base];
|
for(; val && i ; --i, val /= base)
|
||||||
return &buf[i+1];
|
buf[i] = "0123456789abcdef"[val % base];
|
||||||
}
|
return &buf[i+1];
|
||||||
|
}
|
||||||
#endif // NL_OS_WINDOWS
|
#endif // NL_OS_WINDOWS
|
||||||
|
|
||||||
#ifdef NL_DEBUG
|
#ifdef NL_DEBUG
|
||||||
|
|
Loading…
Reference in a new issue