From 63a6f0f83740257090cf8bbc08b71ba1fc811c81 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 6 Jan 2016 16:06:23 +0100 Subject: [PATCH] Merge with develop --- code/CMakeLists.txt | 8 +++++ .../nel/tools/3d/tile_edit_qt/tiles_model.cpp | 4 +++ code/ryzom/server/src/ai_share/ai_event.h | 23 +++++++------- .../mission_manager/missions_commands.cpp | 4 +-- .../screenshot_islands.cpp | 30 ++++++++++++------- 5 files changed, 46 insertions(+), 23 deletions(-) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index db5aa2ef5..0953164a7 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -242,6 +242,10 @@ IF(WITH_QT5) FIND_PACKAGE(Qt5LinguistTools) FIND_PACKAGE(Qt5Network) + IF(WIN32) + FIND_PACKAGE(Qt5WinExtras) + ENDIF() + IF(QT_STATIC) ADD_DEFINITIONS(-DQT_STATICPLUGIN) @@ -250,6 +254,10 @@ IF(WITH_QT5) # Gui SET(QT_LIBRARIES ${QT_LIBRARIES} Qt5::Gui Qt5::OpenGL) + IF(WIN32) + SET(QT_LIBRARIES ${QT_LIBRARIES} Qt5::WinExtras) + ENDIF() + ADD_QT_LIBRARY(PrintSupport) IF(WIN32) diff --git a/code/nel/tools/3d/tile_edit_qt/tiles_model.cpp b/code/nel/tools/3d/tile_edit_qt/tiles_model.cpp index cbe6e05a1..d05495eb7 100644 --- a/code/nel/tools/3d/tile_edit_qt/tiles_model.cpp +++ b/code/nel/tools/3d/tile_edit_qt/tiles_model.cpp @@ -60,7 +60,11 @@ QVariant tiles_model::data(const QModelIndex &index, int role) const { CTile_Widget wiwi; wiwi.initWidget(tiles.value(index.row()).getPixmap(), tiles.value(index.row()).getPixmapSide(), tiles.value(index.row()).getTileLabel()); +#ifdef USE_QT5 QPixmap pixpix = wiwi.grab(wiwi.contentsRect()); +#else + QPixmap::grabWidget(wiwi, wiwi.contentsRect()); +#endif return pixpix; } else if (role == Qt::UserRole + 1) diff --git a/code/ryzom/server/src/ai_share/ai_event.h b/code/ryzom/server/src/ai_share/ai_event.h index 267d0f456..55f179861 100644 --- a/code/ryzom/server/src/ai_share/ai_event.h +++ b/code/ryzom/server/src/ai_share/ai_event.h @@ -65,7 +65,7 @@ public: { *this=other; } - + CAIEventType(const char *typeName) { // copy text from input string to _val variable @@ -75,7 +75,7 @@ public: // if type name is longer than 8 characters it won't fit in an int64! nlassert(typeName[i]==0); - + // pad out _val variable with 0s while(i<8) ((char *)&_val)[i++]=0; @@ -88,7 +88,8 @@ public: const CAIEventType &operator=(const CAIEventType &other) { _val=other._val; - } + return *this; + } bool operator==(const CAIEventType &other) const { return _val==other._val; @@ -133,7 +134,7 @@ private: // base class IAIEvent //----------------------------------------------------------------------------------- // This is the base class for classes of event sent from the game dev services to -// the AI. Note that the serial has a special syntax to allow for skipping of +// the AI. Note that the serial has a special syntax to allow for skipping of // unrecognised events. class IAIEvent @@ -173,7 +174,7 @@ public: // note serial should serialise: // the 'read' version of the serial should test the to ensure version robustness virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); - + public: /// the stunned creature id NLMISC::CEntityId CreatureId; @@ -199,7 +200,7 @@ public: // note serial should serialise: // the 'read' version of the serial should test the to ensure version robustness virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); - + public: /// the waked creature id NLMISC::CEntityId CreatureId; @@ -227,7 +228,7 @@ public: // note serial should serialise: // the 'read' version of the serial should test the to ensure version robustness virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); - + public: /// the creature Id NLMISC::CEntityId CreatureId; @@ -259,7 +260,7 @@ public: // note serial should serialise: // the 'read' version of the serial should test the to ensure version robustness virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); - + public: /// the affected creature id NLMISC::CEntityId CreatureId; @@ -291,7 +292,7 @@ public: // note serial should serialise: // the 'read' version of the serial should test the to ensure version robustness virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); - + public: /// the creature id NLMISC::CEntityId CreatureId; @@ -317,7 +318,7 @@ public: // note serial should serialise: // the 'read' version of the serial should test the to ensure version robustness virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); - + public: /// the creature id NLMISC::CEntityId CreatureId; @@ -342,7 +343,7 @@ public: // note serial should serialise: // the 'read' version of the serial should test the to ensure version robustness virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); - + public: /// the affected creature id NLMISC::CEntityId CreatureId; diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/missions_commands.cpp b/code/ryzom/server/src/entities_game_service/mission_manager/missions_commands.cpp index 8844f0484..ef0ffa25b 100644 --- a/code/ryzom/server/src/entities_game_service/mission_manager/missions_commands.cpp +++ b/code/ryzom/server/src/entities_game_service/mission_manager/missions_commands.cpp @@ -1067,7 +1067,7 @@ NLMISC_COMMAND(accessPowo, "give access to the powo", " player_name number" uint16 ownerId = buildingPlayer->getOwnerIdx( entityBase->getId() ); sint32 cell; buildingPlayer->addUser(c, 0, ownerId, cell); - c->setPowoCell(cell); +// c->setPowoCell(cell); CBuildingManager::getInstance()->setRoomLifeTime(cell, TGameCycle(NLMISC::TGameTime(4*60*60) / CTickEventHandler::getGameTimeStep())); log.displayNL("%d", cell); } @@ -1098,7 +1098,7 @@ NLMISC_COMMAND(slide, "slide to the powo", " x y cell [z] [h]") sint32 x; sint32 y; - sint32 cell = c->getPowoCell(); + sint32 cell = 0; // c->getPowoCell(); sint32 z = 0; float h = 0; diff --git a/code/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp b/code/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp index 617605399..cd0e4581c 100644 --- a/code/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp +++ b/code/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp @@ -844,6 +844,7 @@ void CScreenshotIslands::processProximityBuffer(TBuffer & inputBuffer, uint32 li bool lastValue = false; CVector2f firstPixelBorder; + firstPixelBorder.set(0.f, 0.f); uint32 nbPixelsBorder = 0; for (uint32 x=0;x sortedHLS; list< CRGBA >::iterator itCol, itHLS;