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

Merge with develop

Browse source
This commit is contained in:
kervala 2016-05-17 11:02:02 +02:00
parent 3b4b071839
commit 0766c4766f
6 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/ryzom/client/src/init.cpp
View file

@ -1555,7 +1555,8 @@ void postlogInit()
{ {
nlwarning("init : Error when creating 'SoundMngr' : %s", e.what()); nlwarning("init : Error when creating 'SoundMngr' : %s", e.what());
// leak the alocated sound manager... // leak the alocated sound manager...
SoundMngr = 0; delete SoundMngr;
SoundMngr = NULL;
} }
// Play Music just after the SoundMngr is inited // Play Music just after the SoundMngr is inited

3
code/ryzom/client/src/main_loop_utilities.cpp
View file

@ -329,7 +329,8 @@ void updateFromClientCfg()
catch(const Exception &e) catch(const Exception &e)
{ {
nlwarning("init : Error when creating 'SoundMngr' : %s", e.what()); nlwarning("init : Error when creating 'SoundMngr' : %s", e.what());
SoundMngr = 0; delete SoundMngr;
SoundMngr = NULL;
} }
// re-init with good SFX/Music Volume // re-init with good SFX/Music Volume

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

@ -478,7 +478,7 @@ void releaseOutGame()
if(SoundMngr) if(SoundMngr)
{ {
delete SoundMngr; delete SoundMngr;
SoundMngr = 0; SoundMngr = NULL;
} }
// Delete the driver. // Delete the driver.
@ -573,7 +573,7 @@ void release()
if(SoundMngr) if(SoundMngr)
{ {
delete SoundMngr; delete SoundMngr;
SoundMngr = 0; SoundMngr = NULL;
} }
// Release the Entities Animation Manager // Release the Entities Animation Manager

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

@ -2381,7 +2381,7 @@ void CUserEntity::updateSound(const TTime &time)
H_AUTO_USE ( RZ_Client_Update_Sound ); H_AUTO_USE ( RZ_Client_Update_Sound );
// no sound manager, no need to update sound // no sound manager, no need to update sound
if (SoundMngr == 0) if (SoundMngr == NULL)
return; return;
if (!(StereoHMD && true)) // TODO: ClientCfg.Headphone if (!(StereoHMD && true)) // TODO: ClientCfg.Headphone

4
code/ryzom/tools/client/ryzom_installer/CMakeLists.txt
View file

@ -26,6 +26,8 @@ ELSE()
SET(QT_LIBRARIES Qt5::WinExtras ${QT_LIBRARIES}) SET(QT_LIBRARIES Qt5::WinExtras ${QT_LIBRARIES})
ENDIF() ENDIF()
# uncomment this line if you want to update original translations
# QT5_CREATE_TRANSLATION(CLIENT_INSTALL_Q ${CLIENT_INSTALL_UIS} ${SRC} ${CLIENT_INSTALL_TRANS})
QT5_ADD_TRANSLATION(CLIENT_INSTALL_QM ${CLIENT_INSTALL_TRANS}) QT5_ADD_TRANSLATION(CLIENT_INSTALL_QM ${CLIENT_INSTALL_TRANS})
QT5_ADD_RESOURCES(CLIENT_INSTALL_RC_SRCS ${CLIENT_INSTALL_RCS}) QT5_ADD_RESOURCES(CLIENT_INSTALL_RC_SRCS ${CLIENT_INSTALL_RCS})
QT5_WRAP_CPP(CLIENT_INSTALL_MOC_SRC ${CLIENT_INSTALL_HDR}) QT5_WRAP_CPP(CLIENT_INSTALL_MOC_SRC ${CLIENT_INSTALL_HDR})
@ -42,7 +44,7 @@ ADD_EXECUTABLE(ryzom_installer_qt WIN32 ${SRC} ${CLIENT_INSTALL_MOC_SRC} ${CLIEN
NL_DEFAULT_PROPS(ryzom_installer_qt "Ryzom, Tools: Ryzom Installer" ) NL_DEFAULT_PROPS(ryzom_installer_qt "Ryzom, Tools: Ryzom Installer" )
NL_ADD_RUNTIME_FLAGS(ryzom_installer_qt) NL_ADD_RUNTIME_FLAGS(ryzom_installer_qt)
NL_ADD_LIB_SUFFIX(ryzom_installer_qt) NL_ADD_LIB_SUFFIX(ryzom_installer_qt)
TARGET_LINK_LIBRARIES(ryzom_installer_qt nelmisc ryzom_sevenzip ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY}) TARGET_LINK_LIBRARIES(ryzom_installer_qt nelmisc ryzom_sevenzip ${QT_LIBRARIES})
IF(WITH_PCH) IF(WITH_PCH)
ADD_NATIVE_PRECOMPILED_HEADER(ryzom_installer_qt ${CMAKE_CURRENT_SOURCE_DIR}/src/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/src/stdpch.cpp) ADD_NATIVE_PRECOMPILED_HEADER(ryzom_installer_qt ${CMAKE_CURRENT_SOURCE_DIR}/src/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/src/stdpch.cpp)

1
code/ryzom/tools/client/ryzom_installer/src/main.cpp
View file

@ -37,7 +37,6 @@
Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin) Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)
#elif defined(Q_OS_UNIX) #elif defined(Q_OS_UNIX)
Q_IMPORT_PLUGIN(QXcbIntegrationPlugin) Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
Q_IMPORT_PLUGIN(QXcbGlxIntegrationPlugin)
#endif #endif
Q_IMPORT_PLUGIN(QICOPlugin) Q_IMPORT_PLUGIN(QICOPlugin)