Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

merge

Browse source
This commit is contained in:
sfb 2013-05-02 14:34:40 -05:00
commit 70397fe3bd
15 changed files with 80 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
code/CMakeLists.txt
View file

@ -41,6 +41,11 @@ INCLUDE(${CMAKE_ROOT}/Modules/Documentation.cmake OPTIONAL)
# Force out of source builds.
CHECK_OUT_OF_SOURCE()
# Specify Mac OS X deployment target before including Darwin.cmake
IF(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.6")
ENDIF(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
PROJECT(RyzomCore CXX C)
SET(NL_VERSION_MAJOR 0)

2
code/nel/include/nel/misc/event_emitter_multi.h
View file

@ -33,7 +33,7 @@ class CEventEmitterMulti : public IEventEmitter
{
public:
/// dtor
~CEventEmitterMulti();
virtual ~CEventEmitterMulti();
/// add an emitter
void addEmitter(IEventEmitter *e, bool mustDelete);
/// remove an emitter (and delete it if necessary)

14
code/nel/include/nel/misc/events.h
View file

@ -65,6 +65,7 @@ const CClassId EventStringId (0x49b5af8f, 0x7f52cd26);
const CClassId EventActivateId (0x7da66b0a, 0x1ef74519);
const CClassId EventSetFocusId (0x17650fac, 0x19f85dde);
const CClassId EventDestroyWindowId (0x69be73fe, 0x4b07603b);
const CClassId EventCloseWindowId (0xb5cb1333, 0xd092e63a);
// Mouse events
const CClassId EventMouseMoveId (0x3dd12fdb, 0x472f548b);
@ -504,6 +505,19 @@ public:
virtual CEvent *clone() const {return new CEventDestroyWindow(*this);}
};
/**
* CEventCloseWindow
*/
class CEventCloseWindow : public CEvent
{
public:
CEventCloseWindow (IEventEmitter* emitter) : CEvent (emitter, EventCloseWindowId)
{
}
virtual CEvent *clone() const {return new CEventCloseWindow(*this);}
};
/**
* CEventIME
*/

33
code/nel/src/gui/libwww.cpp
View file

@ -29,10 +29,6 @@ extern "C"
#include "nel/gui/group_html.h"
#include "nel/gui/libwww_nel_stream.h"
#ifdef HAVE_REVISION_H
#include "revision.h"
#endif
using namespace NLMISC;
// The HText structure for libwww
@ -554,35 +550,6 @@ namespace NLGUI
HTTrace_setCallback(NelTracer);
/* Initiate libwww */
#if defined(HAVE_X86_64)
#define RYZOM_ARCH "x64"
#elif defined(HAVE_X86)
#define RYZOM_ARCH "x86"
#elif defined(HAVE_ARM)
#define RYZOM_ARCH "arm"
#else
#define RYZOM_ARCH "unknow"
#endif
#if defined(NL_OS_WINDOWS)
#define RYZOM_SYSTEM "windows"
#elif defined(NL_OS_MAC)
#define RYZOM_SYSTEM "mac"
#elif defined(NL_OS_UNIX)
#define RYZOM_SYSTEM "unix"
#else
#define RYZOM_SYSTEM "unkown"
#endif
/*
char buffer[256];
#ifdef REVISION
sprintf(buffer, "%s.%s-%s-%s", RYZOM_VERSION, REVISION, RYZOM_SYSTEM, RYZOM_ARCH);
#else
sprintf(buffer, "%s-%s-%s", RYZOM_VERSION, RYZOM_SYSTEM, RYZOM_ARCH);
#endif
*/
HTLib_setAppName( CGroupHTML::options.appName.c_str() );
HTLib_setAppVersion( CGroupHTML::options.appVersion.c_str() );

3
code/nel/src/gui/stdpch.h
View file

@ -29,8 +29,9 @@
#include "nel/misc/uv.h"
#include "nel/misc/hierarchical_timer.h"
#if NL_OS_WINDOWS
#ifdef NL_OS_WINDOWS
#define NOMINMAX
#include <WinSock2.h>
#include <windows.h>
#endif

3
code/nel/src/misc/win_event_emitter.cpp
View file

@ -281,6 +281,9 @@ bool CWinEventEmitter::processMessage (HWND hWnd, uint32 msg, WPARAM wParam, LPA
case WM_DESTROY:
server->postEvent (new CEventDestroyWindow (this));
break;
case WM_CLOSE:
server->postEvent (new CEventCloseWindow (this));
return true;
case WM_DISPLAYCHANGE:
server->postEvent (new CEventDisplayChange (LOWORD(lParam), HIWORD(lParam), (uint)wParam, this));
break;

4
code/nel/tools/3d/object_viewer_qt/src/plugins/CMakeLists.txt
View file

@ -6,7 +6,11 @@ ADD_SUBDIRECTORY(log)
ADD_SUBDIRECTORY(disp_sheet_id)
ADD_SUBDIRECTORY(object_viewer)
ADD_SUBDIRECTORY(georges_editor)
IF(WITH_GUI)
ADD_SUBDIRECTORY(gui_editor)
ENDIF(WITH_GUI)
ADD_SUBDIRECTORY(translation_manager)
ADD_SUBDIRECTORY(bnp_manager)
# Note: Temporarily disabled until development continues.

2
code/nelns/naming_service/naming_service.cpp
View file

@ -1139,7 +1139,7 @@ NLMISC_COMMAND (kill, "kill a service and send an unregister broadcast to other
NLMISC_DYNVARIABLE(uint32, NbRegisteredServices, "display the number of service that are registered in naming service")
{
if (get) *pointer = RegisteredServices.size();
if (get) *pointer = (uint32)RegisteredServices.size();
}
NLMISC_COMMAND( displayServiceInstances, "SIM: Display info on service instances", "" )

7
code/ryzom/client/src/events_listener.cpp
View file

@ -90,6 +90,7 @@ void CEventsListener::addToServer(CEventServer& server)
server.addListener(EventKeyDownId, this);
server.addListener(EventKeyUpId, this);
server.addListener(EventDestroyWindowId,this);
server.addListener(EventCloseWindowId, this);
server.addListener(EventSetFocusId, this);
server.addListener(EventDisplayChangeId, this);
}// addToServer //
@ -108,6 +109,7 @@ void CEventsListener::removeFromServer (CEventServer& server)
server.removeListener(EventKeyDownId, this);
server.removeListener(EventKeyUpId, this);
server.removeListener(EventDestroyWindowId,this);
server.removeListener(EventCloseWindowId, this);
server.removeListener(EventSetFocusId, this);
}// removeFromServer //
@ -141,6 +143,11 @@ void CEventsListener::operator()(const CEvent& event)
// kill process
exit(EXIT_SUCCESS);
}
// Window close button pressed.
if(event == EventCloseWindowId)
{
CAHManager::getInstance()->runActionHandler("enter_modal", NULL, "group=ui:interface:quit_dialog");
}
// Event from the Mouse (ANGLE)
if(event == EventGDMouseMove)
{

4
code/ryzom/client/src/interface_v3/input_handler_manager.cpp
View file

@ -94,6 +94,7 @@ void CInputHandlerManager::addToServer(NLMISC::CEventServer * server)
// System
server->addListener(EventGDMouseMove, this);
server->addListener(EventDestroyWindowId, this);
server->addListener(EventCloseWindowId, this);
server->addListener(EventSetFocusId, this);
server->addListener(EventDisplayChangeId, this);
@ -118,6 +119,7 @@ void CInputHandlerManager::release()
// System
_EventServer->removeListener(EventGDMouseMove, this);
_EventServer->removeListener(EventDestroyWindowId, this);
_EventServer->removeListener(EventCloseWindowId, this);
_EventServer->removeListener(EventSetFocusId, this);
_EventServer->removeListener(EventDisplayChangeId, this);
@ -133,10 +135,8 @@ void CInputHandlerManager::release()
_EventServer->removeListener(EventCharId, this);
_EventServer->removeListener(EventKeyDownId, this);
_EventServer->removeListener(EventKeyUpId, this);
}
// ***************************************************************************
void CInputHandlerManager::operator ()(const NLMISC::CEvent &event)
{

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

@ -132,6 +132,29 @@ using namespace NLGUI;
#include "../global.h"
#ifdef HAVE_REVISION_H
#include "revision.h"
#endif
#if defined(HAVE_X86_64)
#define RYZOM_ARCH "x64"
#elif defined(HAVE_X86)
#define RYZOM_ARCH "x86"
#elif defined(HAVE_ARM)
#define RYZOM_ARCH "arm"
#else
#define RYZOM_ARCH "unknow"
#endif
#if defined(NL_OS_WINDOWS)
#define RYZOM_SYSTEM "windows"
#elif defined(NL_OS_MAC)
#define RYZOM_SYSTEM "mac"
#elif defined(NL_OS_UNIX)
#define RYZOM_SYSTEM "unix"
#else
#define RYZOM_SYSTEM "unkown"
#endif
using namespace NLMISC;
namespace NLGUI
@ -465,10 +488,19 @@ CInterfaceManager::CInterfaceManager()
CViewRenderer::getInstance();
CViewTextID::setTextProvider( &SMTextProvider );
CViewTextFormated::setFormatter( &RyzomTextFormatter );
char buffer[256];
#ifdef REVISION
sprintf(buffer, "%s.%s-%s-%s", RYZOM_VERSION, REVISION, RYZOM_SYSTEM, RYZOM_ARCH);
#else
sprintf(buffer, "%s-%s-%s", RYZOM_VERSION, RYZOM_SYSTEM, RYZOM_ARCH);
#endif
CGroupHTML::options.trustedDomains = ClientCfg.WebIgTrustedDomains;
CGroupHTML::options.languageCode = ClientCfg.getHtmlLanguageCode();
CGroupHTML::options.appName = "Ryzom";
CGroupHTML::options.appVersion = RYZOM_VERSION;
CGroupHTML::options.appVersion = buffer;
NLGUI::CDBManager::getInstance()->resizeBanks( NB_CDB_BANKS );
interfaceLinkUpdater = new CInterfaceLink::CInterfaceLinkUpdater();

2
code/ryzom/common/src/game_share/object.cpp
View file

@ -507,7 +507,7 @@ bool CObject::getShortestName(std::string &instanceId, std::string &attrName, si
return false;
}
instanceId = parent2->getAttr("InstanceId")->toString();
attrName == parent2->getKey(index2);
attrName = parent2->getKey(index2);
position = index;
return true;
}

2
code/ryzom/server/src/ai_service/group_profile.cpp
View file

@ -135,7 +135,7 @@ void CGrpProfileDynFollowPath::updateProfile(uint ticksSinceLastUpdate)
_FollowRoute.setAIProfile(fr);
// faire gaffe à l'init du CGrpProfileFollowRouteSpawn dans le cadre statique .. :\ (adapter?)
// pay attention to CGrpProfileFollowRouteSpawn init in static case .. :\ (to adapt ?)
#ifdef NL_DEBUG
nlassert(_CurrentZone==_CurrentRoad->startZone() || _CurrentZone==_CurrentRoad->endZone());
#endif

2
code/ryzom/server/src/ai_share/ai_alias_description_node.h
View file

@ -50,7 +50,7 @@ extern bool VerboseAliasDescriptionNodeLog;
class CAIAliasDescriptionNode;
// à faire ..
// TODO...
class CAIAliasDescriptionNode : public NLMISC::CRefCount
{
public:

10
code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.h
View file

@ -157,11 +157,11 @@ public:
/// params as strings
std::vector<std::string> StringParams;
//* Break when hit: Si une créature frappe le joueur, la consommation est immédiatement interrompue
//* Assis: le joueur peut consommer assis.
//* Debout: Le joueur peut consommer l'item debout, y compris en combat
//* Nage: le joueur peut consommer l'item lorsqu'il nage
//* Mektoub: le joueur peut consommer l'item lorsqu'il chevauche un mektoub
//* Break when hit: If a creature hits the player, consumption is immediatly aborted
//* Sit: player can consume item sit down
//* Stand Up: player can consume item stand up, including while fighting
//* Swim: player can consume item while swiming
//* Mektoub: player can consume item while riding a mektoub
union
{
uint16 Data;