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 2012-10-28 13:47:09 +01:00
parent 3f9b920134
commit 49c988ccb5
32 changed files with 49 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/nel/src/georges/type.cpp
View file

@ -25,7 +25,6 @@
#include "nel/georges/form.h" #include "nel/georges/form.h"
#include "nel/georges/form_elm.h" #include "nel/georges/form_elm.h"
#include "nel/georges/form_loader.h" #include "nel/georges/form_loader.h"
#include "nel/georges/type.h" #include "nel/georges/type.h"
using namespace NLMISC; using namespace NLMISC;

1
code/nel/src/sound/CMakeLists.txt
View file

@ -1,4 +1,3 @@
FILE(GLOB SRC *.cpp *.h) FILE(GLOB SRC *.cpp *.h)
FILE(GLOB HEADERS ../../include/nel/sound/*.h) FILE(GLOB HEADERS ../../include/nel/sound/*.h)

1
code/nel/src/sound/audio_mixer_user.cpp
View file

@ -35,7 +35,6 @@
#include "nel/sound/driver/buffer.h" #include "nel/sound/driver/buffer.h"
#include "nel/sound/driver/effect.h" #include "nel/sound/driver/effect.h"
#include "nel/sound/background_sound_manager.h"
#include "nel/sound/background_sound_manager.h" #include "nel/sound/background_sound_manager.h"
#include "nel/sound/music_sound_manager.h" #include "nel/sound/music_sound_manager.h"
#include "nel/sound/background_source.h" #include "nel/sound/background_source.h"

1
code/nel/src/sound/background_source.cpp
View file

@ -16,7 +16,6 @@
#include "stdsound.h" #include "stdsound.h"
#include "nel/sound/background_sound_manager.h" #include "nel/sound/background_sound_manager.h"
#include "nel/sound/background_source.h" #include "nel/sound/background_source.h"
using namespace std; using namespace std;

2
code/nel/src/sound/driver/dsound/buffer_dsound.h
View file

@ -17,7 +17,7 @@
#ifndef NL_BUFFER_DSOUND_H #ifndef NL_BUFFER_DSOUND_H
#define NL_BUFFER_DSOUND_H #define NL_BUFFER_DSOUND_H
#include <nel/sound/driver/buffer.h> #include "nel/sound/driver/buffer.h"
namespace NLSOUND { namespace NLSOUND {

2
code/nel/src/sound/driver/dsound/listener_dsound.h
View file

@ -17,7 +17,7 @@
#ifndef NL_LISTENER_DSOUND_H #ifndef NL_LISTENER_DSOUND_H
#define NL_LISTENER_DSOUND_H #define NL_LISTENER_DSOUND_H
#include <nel/sound/driver/listener.h> #include "nel/sound/driver/listener.h"
namespace NLSOUND { namespace NLSOUND {

2
code/nel/src/sound/driver/dsound/sound_driver_dsound.h
View file

@ -17,7 +17,7 @@
#ifndef NL_SOUND_DRIVER_DSOUND_H #ifndef NL_SOUND_DRIVER_DSOUND_H
#define NL_SOUND_DRIVER_DSOUND_H #define NL_SOUND_DRIVER_DSOUND_H
#include <nel/sound/driver/sound_driver.h> #include "nel/sound/driver/sound_driver.h"
#include "source_dsound.h" #include "source_dsound.h"
#include "buffer_dsound.h" #include "buffer_dsound.h"

1
code/nel/src/sound/driver/dsound/source_dsound.cpp
View file

@ -616,7 +616,6 @@ void CSourceDSound::fadeOut(const TLockedBufferInfo &lbi)
ptr = lbi.Ptr2; ptr = lbi.Ptr2;
count = lbi.Size2/2; count = lbi.Size2/2;
while (fade && count) while (fade && count)
{ {
alpha = (fade<<16) / _XFadeSize; alpha = (fade<<16) / _XFadeSize;

6
code/nel/src/sound/driver/dsound/source_dsound.h
View file

@ -17,9 +17,9 @@
#ifndef NL_SOURCE_DSOUND_H #ifndef NL_SOURCE_DSOUND_H
#define NL_SOURCE_DSOUND_H #define NL_SOURCE_DSOUND_H
#include <nel/sound/driver/source.h> #include "nel/sound/driver/source.h"
#include <nel/sound/driver/sound_driver.h> #include "nel/sound/driver/sound_driver.h"
#include <nel/sound/driver/buffer.h> #include "nel/sound/driver/buffer.h"
namespace NLSOUND { namespace NLSOUND {

2
code/nel/src/sound/driver/fmod/buffer_fmod.h
View file

@ -18,7 +18,7 @@
#define NL_BUFFER_FMOD_H #define NL_BUFFER_FMOD_H
#include <nel/sound/driver/buffer.h> #include "nel/sound/driver/buffer.h"
namespace NLSOUND { namespace NLSOUND {

2
code/nel/src/sound/driver/fmod/music_channel_fmod.h
View file

@ -17,7 +17,7 @@
#ifndef NL_MUSIC_CHANNEL_FMOD_H #ifndef NL_MUSIC_CHANNEL_FMOD_H
#define NL_MUSIC_CHANNEL_FMOD_H #define NL_MUSIC_CHANNEL_FMOD_H
#include <nel/sound/driver/music_channel.h> #include "nel/sound/driver/music_channel.h"
struct FSOUND_STREAM; struct FSOUND_STREAM;

2
code/nel/src/sound/driver/fmod/sound_driver_fmod.h
View file

@ -17,7 +17,7 @@
#ifndef NL_SOUND_DRIVER_FMOD_H #ifndef NL_SOUND_DRIVER_FMOD_H
#define NL_SOUND_DRIVER_FMOD_H #define NL_SOUND_DRIVER_FMOD_H
#include <nel/sound/driver/sound_driver.h> #include "nel/sound/driver/sound_driver.h"
namespace NLSOUND { namespace NLSOUND {
class IListener; class IListener;

6
code/nel/src/sound/driver/fmod/source_fmod.h
View file

@ -17,9 +17,9 @@
#ifndef NL_SOURCE_FMOD_H #ifndef NL_SOURCE_FMOD_H
#define NL_SOURCE_FMOD_H #define NL_SOURCE_FMOD_H
#include <nel/sound/driver/source.h> #include "nel/sound/driver/source.h"
#include <nel/sound/driver/sound_driver.h> #include "nel/sound/driver/sound_driver.h"
#include <nel/sound/driver/buffer.h> #include "nel/sound/driver/buffer.h"
namespace NLSOUND { namespace NLSOUND {
class CBufferFMod; class CBufferFMod;

32
code/nel/src/sound/driver/fmod/stdfmod.h
View file

@ -24,22 +24,22 @@
#include <cmath> #include <cmath>
#include <limits> #include <limits>
#include <nel/misc/common.h> #include "nel/misc/common.h"
#include <nel/misc/time_nl.h> #include "nel/misc/time_nl.h"
#include <nel/misc/singleton.h> #include "nel/misc/singleton.h"
#include <nel/misc/fast_mem.h> #include "nel/misc/fast_mem.h"
#include <nel/misc/debug.h> #include "nel/misc/debug.h"
#include <nel/misc/vector.h> #include "nel/misc/vector.h"
#include <nel/misc/path.h> #include "nel/misc/path.h"
#include <nel/misc/file.h> #include "nel/misc/file.h"
#include <nel/misc/matrix.h> #include "nel/misc/matrix.h"
#include <nel/misc/big_file.h> #include "nel/misc/big_file.h"
#include <nel/misc/hierarchical_timer.h> #include "nel/misc/hierarchical_timer.h"
#include <nel/misc/dynloadlib.h> #include "nel/misc/dynloadlib.h"
#include <nel/sound/driver/sound_driver.h> #include "nel/sound/driver/sound_driver.h"
#include <nel/sound/driver/buffer.h> #include "nel/sound/driver/buffer.h"
#include <nel/sound/driver/source.h> #include "nel/sound/driver/source.h"
#include <nel/sound/driver/listener.h> #include "nel/sound/driver/listener.h"
/* end of file */ /* end of file */

2
code/nel/src/sound/driver/openal/buffer_al.h
View file

@ -17,7 +17,7 @@
#ifndef NL_BUFFER_AL_H #ifndef NL_BUFFER_AL_H
#define NL_BUFFER_AL_H #define NL_BUFFER_AL_H
#include <nel/sound/driver/buffer.h> #include "nel/sound/driver/buffer.h"
namespace NLSOUND namespace NLSOUND
{ {

6
code/nel/src/sound/driver/openal/sound_driver_al.h
View file

@ -17,7 +17,7 @@
#ifndef NL_SOUND_DRIVER_AL_H #ifndef NL_SOUND_DRIVER_AL_H
#define NL_SOUND_DRIVER_AL_H #define NL_SOUND_DRIVER_AL_H
#include <nel/sound/driver/sound_driver.h> #include "nel/sound/driver/sound_driver.h"
namespace NLSOUND { namespace NLSOUND {
class CBufferAL; class CBufferAL;
@ -126,7 +126,7 @@ public:
virtual void startBench(); virtual void startBench();
virtual void endBench(); virtual void endBench();
virtual void displayBench(NLMISC::CLog * /* log */); virtual void displayBench(NLMISC::CLog *log);
/// Change the rolloff factor and apply to all sources /// Change the rolloff factor and apply to all sources
@ -136,7 +136,7 @@ public:
virtual void commit3DChanges(); virtual void commit3DChanges();
/// Write information about the driver to the output stream. /// Write information about the driver to the output stream.
virtual void writeProfile(std::string& /* out */); virtual void writeProfile(std::string& out);
/// Remove a buffer /// Remove a buffer
void removeBuffer(CBufferAL *buffer); void removeBuffer(CBufferAL *buffer);

2
code/nel/src/sound/driver/openal/source_al.cpp
View file

@ -375,7 +375,7 @@ bool CSourceAL::isPaused() const
uint32 CSourceAL::getTime() uint32 CSourceAL::getTime()
{ {
if (!_StartTime) return 0; if (!_StartTime) return 0;
return (uint32)(CTime::getLocalTime() - _StartTime); return (uint32)(CTime::getLocalTime() - _StartTime);
} }
/// Set the position vector. /// Set the position vector.

2
code/nel/src/sound/driver/openal/source_al.h
View file

@ -17,7 +17,7 @@
#ifndef NL_SOURCE_AL_H #ifndef NL_SOURCE_AL_H
#define NL_SOURCE_AL_H #define NL_SOURCE_AL_H
#include <nel/sound/driver/source.h> #include "nel/sound/driver/source.h"
namespace NLSOUND { namespace NLSOUND {
class IBuffer; class IBuffer;

2
code/nel/src/sound/driver/xaudio2/adpcm_xaudio2.h
View file

@ -17,7 +17,7 @@
#ifndef NLSOUND_ADPCM_XAUDIO2_H #ifndef NLSOUND_ADPCM_XAUDIO2_H
#define NLSOUND_ADPCM_XAUDIO2_H #define NLSOUND_ADPCM_XAUDIO2_H
#include <nel/sound/driver/buffer.h> #include "nel/sound/driver/buffer.h"
namespace NLSOUND { namespace NLSOUND {
class CBufferXAudio2; class CBufferXAudio2;

2
code/nel/src/sound/driver/xaudio2/buffer_xaudio2.h
View file

@ -17,7 +17,7 @@
#ifndef NLSOUND_BUFFER_XAUDIO2_H #ifndef NLSOUND_BUFFER_XAUDIO2_H
#define NLSOUND_BUFFER_XAUDIO2_H #define NLSOUND_BUFFER_XAUDIO2_H
#include <nel/sound/driver/buffer.h> #include "nel/sound/driver/buffer.h"
namespace NLSOUND { namespace NLSOUND {
class CSoundDriverXAudio2; class CSoundDriverXAudio2;

4
code/nel/src/sound/driver/xaudio2/listener_xaudio2.h
View file

@ -17,8 +17,8 @@
#ifndef NLSOUND_LISTENER_XAUDIO2_H #ifndef NLSOUND_LISTENER_XAUDIO2_H
#define NLSOUND_LISTENER_XAUDIO2_H #define NLSOUND_LISTENER_XAUDIO2_H
#include <nel/sound/driver/listener.h> #include "nel/sound/driver/listener.h"
#include <nel/sound/driver/sound_driver.h> #include "nel/sound/driver/sound_driver.h"
namespace NLSOUND { namespace NLSOUND {
class CSoundDriverXAudio2; class CSoundDriverXAudio2;

6
code/nel/src/sound/driver/xaudio2/source_xaudio2.h
View file

@ -17,9 +17,9 @@
#ifndef NLSOUND_SOURCE_XAUDIO2_H #ifndef NLSOUND_SOURCE_XAUDIO2_H
#define NLSOUND_SOURCE_XAUDIO2_H #define NLSOUND_SOURCE_XAUDIO2_H
#include <nel/sound/driver/source.h> #include "nel/sound/driver/source.h"
#include <nel/sound/driver/sound_driver.h> #include "nel/sound/driver/sound_driver.h"
#include <nel/sound/driver/buffer.h> #include "nel/sound/driver/buffer.h"
namespace NLSOUND { namespace NLSOUND {
class CSoundDriverXAudio2; class CSoundDriverXAudio2;

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

@ -1620,7 +1620,6 @@ public:
} }
} }
}; };
REGISTER_ACTION_HANDLER(CHandlerPhraseSelectShortcutBar, "select_shortcut_bar"); REGISTER_ACTION_HANDLER(CHandlerPhraseSelectShortcutBar, "select_shortcut_bar");

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

@ -963,7 +963,6 @@ void impulseFarTell(NLMISC::CBitMemStream &impulse)
ChatMngr.processFarTellString(impulse, InterfaceChatDisplayer); ChatMngr.processFarTellString(impulse, InterfaceChatDisplayer);
} }
void impulseTell2(NLMISC::CBitMemStream &impulse) void impulseTell2(NLMISC::CBitMemStream &impulse)
{ {
ChatMngr.processTellString2(impulse, InterfaceChatDisplayer); ChatMngr.processTellString2(impulse, InterfaceChatDisplayer);

4
code/ryzom/server/src/server_share/char_name_mapper_itf.h
View file

@ -21,9 +21,7 @@
#ifndef CHAR_NAME_MAPPER_ITF #ifndef CHAR_NAME_MAPPER_ITF
#define CHAR_NAME_MAPPER_ITF #define CHAR_NAME_MAPPER_ITF
#include "nel/misc/types_nl.h" #include "nel/misc/types_nl.h"
#ifdef NL_COMP_VC8 #include <memory>
#include <memory>
#endif
#include "nel/misc/hierarchical_timer.h" #include "nel/misc/hierarchical_timer.h"
#include "nel/misc/string_conversion.h" #include "nel/misc/string_conversion.h"
#include "nel/net/message.h" #include "nel/net/message.h"

4
code/ryzom/server/src/server_share/chat_unifier_itf.h
View file

@ -21,9 +21,7 @@
#ifndef CHAT_UNIFIER_ITF #ifndef CHAT_UNIFIER_ITF
#define CHAT_UNIFIER_ITF #define CHAT_UNIFIER_ITF
#include "nel/misc/types_nl.h" #include "nel/misc/types_nl.h"
#ifdef NL_COMP_VC8 #include <memory>
#include <memory>
#endif
#include "nel/misc/hierarchical_timer.h" #include "nel/misc/hierarchical_timer.h"
#include "nel/misc/string_conversion.h" #include "nel/misc/string_conversion.h"
#include "nel/net/message.h" #include "nel/net/message.h"

4
code/ryzom/server/src/server_share/command_executor_itf.h
View file

@ -21,9 +21,7 @@
#ifndef COMMAND_EXECUTOR_ITF #ifndef COMMAND_EXECUTOR_ITF
#define COMMAND_EXECUTOR_ITF #define COMMAND_EXECUTOR_ITF
#include "nel/misc/types_nl.h" #include "nel/misc/types_nl.h"
#ifdef NL_COMP_VC8 #include <memory>
#include <memory>
#endif
#include "nel/misc/hierarchical_timer.h" #include "nel/misc/hierarchical_timer.h"
#include "nel/misc/string_conversion.h" #include "nel/misc/string_conversion.h"
#include "nel/net/message.h" #include "nel/net/message.h"

4
code/ryzom/server/src/server_share/entity_locator_itf.h
View file

@ -21,9 +21,7 @@
#ifndef ENTITY_LOCATOR_ITF #ifndef ENTITY_LOCATOR_ITF
#define ENTITY_LOCATOR_ITF #define ENTITY_LOCATOR_ITF
#include "nel/misc/types_nl.h" #include "nel/misc/types_nl.h"
#ifdef NL_COMP_VC8 #include <memory>
#include <memory>
#endif
#include "nel/misc/hierarchical_timer.h" #include "nel/misc/hierarchical_timer.h"
#include "nel/misc/string_conversion.h" #include "nel/misc/string_conversion.h"
#include "nel/net/message.h" #include "nel/net/message.h"

4
code/ryzom/server/src/server_share/logger_service_itf.h
View file

@ -21,9 +21,7 @@
#ifndef LOGGER_SERVICE_ITF #ifndef LOGGER_SERVICE_ITF
#define LOGGER_SERVICE_ITF #define LOGGER_SERVICE_ITF
#include "nel/misc/types_nl.h" #include "nel/misc/types_nl.h"
#ifdef NL_COMP_VC8 #include <memory>
#include <memory>
#endif
#include "nel/misc/hierarchical_timer.h" #include "nel/misc/hierarchical_timer.h"
#include "nel/misc/string_conversion.h" #include "nel/misc/string_conversion.h"
#include "nel/net/message.h" #include "nel/net/message.h"

1
code/ryzom/tools/leveldesign/export/export.cpp
View file

@ -1793,7 +1793,6 @@ bool CExport::generateIGFromFlora (const std::string &SrcFile, std::vector<SExpo
vi.Pos = pos; vi.Pos = pos;
if (pos.z > -90000.0f) if (pos.z > -90000.0f)
_FloraInsts.push_back (vi); _FloraInsts.push_back (vi);
} // End of Generate for a point } // End of Generate for a point
// Generate for a path // Generate for a path

2
code/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp
View file

@ -282,7 +282,7 @@ public:
string genCode(CMissionData &md) string genCode(CMissionData &md)
{ {
string ret = ""; string ret;
if (!_MissionName.empty()) if (!_MissionName.empty())
{ {
ret = "spawn_mission : " + _MissionName + " : " + _GiverName; ret = "spawn_mission : " + _MissionName + " : " + _GiverName;