mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-29 23:26:00 +00:00
Changed: Minor changes
This commit is contained in:
parent
89e78b8ad2
commit
05ae6371c1
32 changed files with 49 additions and 67 deletions
|
@ -25,7 +25,6 @@
|
|||
#include "nel/georges/form.h"
|
||||
#include "nel/georges/form_elm.h"
|
||||
#include "nel/georges/form_loader.h"
|
||||
|
||||
#include "nel/georges/type.h"
|
||||
|
||||
using namespace NLMISC;
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
FILE(GLOB SRC *.cpp *.h)
|
||||
FILE(GLOB HEADERS ../../include/nel/sound/*.h)
|
||||
|
||||
|
|
|
@ -35,7 +35,6 @@
|
|||
#include "nel/sound/driver/buffer.h"
|
||||
#include "nel/sound/driver/effect.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/background_source.h"
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
|
||||
#include "stdsound.h"
|
||||
#include "nel/sound/background_sound_manager.h"
|
||||
|
||||
#include "nel/sound/background_source.h"
|
||||
|
||||
using namespace std;
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#ifndef NL_BUFFER_DSOUND_H
|
||||
#define NL_BUFFER_DSOUND_H
|
||||
|
||||
#include <nel/sound/driver/buffer.h>
|
||||
#include "nel/sound/driver/buffer.h"
|
||||
|
||||
namespace NLSOUND {
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#ifndef NL_LISTENER_DSOUND_H
|
||||
#define NL_LISTENER_DSOUND_H
|
||||
|
||||
#include <nel/sound/driver/listener.h>
|
||||
#include "nel/sound/driver/listener.h"
|
||||
|
||||
namespace NLSOUND {
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#ifndef 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 "buffer_dsound.h"
|
||||
|
|
|
@ -616,7 +616,6 @@ void CSourceDSound::fadeOut(const TLockedBufferInfo &lbi)
|
|||
ptr = lbi.Ptr2;
|
||||
count = lbi.Size2/2;
|
||||
|
||||
|
||||
while (fade && count)
|
||||
{
|
||||
alpha = (fade<<16) / _XFadeSize;
|
||||
|
|
|
@ -17,9 +17,9 @@
|
|||
#ifndef NL_SOURCE_DSOUND_H
|
||||
#define NL_SOURCE_DSOUND_H
|
||||
|
||||
#include <nel/sound/driver/source.h>
|
||||
#include <nel/sound/driver/sound_driver.h>
|
||||
#include <nel/sound/driver/buffer.h>
|
||||
#include "nel/sound/driver/source.h"
|
||||
#include "nel/sound/driver/sound_driver.h"
|
||||
#include "nel/sound/driver/buffer.h"
|
||||
|
||||
namespace NLSOUND {
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#define NL_BUFFER_FMOD_H
|
||||
|
||||
|
||||
#include <nel/sound/driver/buffer.h>
|
||||
#include "nel/sound/driver/buffer.h"
|
||||
|
||||
|
||||
namespace NLSOUND {
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#ifndef 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;
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#ifndef 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 {
|
||||
class IListener;
|
||||
|
|
|
@ -17,9 +17,9 @@
|
|||
#ifndef NL_SOURCE_FMOD_H
|
||||
#define NL_SOURCE_FMOD_H
|
||||
|
||||
#include <nel/sound/driver/source.h>
|
||||
#include <nel/sound/driver/sound_driver.h>
|
||||
#include <nel/sound/driver/buffer.h>
|
||||
#include "nel/sound/driver/source.h"
|
||||
#include "nel/sound/driver/sound_driver.h"
|
||||
#include "nel/sound/driver/buffer.h"
|
||||
|
||||
namespace NLSOUND {
|
||||
class CBufferFMod;
|
||||
|
|
|
@ -24,22 +24,22 @@
|
|||
#include <cmath>
|
||||
#include <limits>
|
||||
|
||||
#include <nel/misc/common.h>
|
||||
#include <nel/misc/time_nl.h>
|
||||
#include <nel/misc/singleton.h>
|
||||
#include <nel/misc/fast_mem.h>
|
||||
#include <nel/misc/debug.h>
|
||||
#include <nel/misc/vector.h>
|
||||
#include <nel/misc/path.h>
|
||||
#include <nel/misc/file.h>
|
||||
#include <nel/misc/matrix.h>
|
||||
#include <nel/misc/big_file.h>
|
||||
#include <nel/misc/hierarchical_timer.h>
|
||||
#include <nel/misc/dynloadlib.h>
|
||||
#include "nel/misc/common.h"
|
||||
#include "nel/misc/time_nl.h"
|
||||
#include "nel/misc/singleton.h"
|
||||
#include "nel/misc/fast_mem.h"
|
||||
#include "nel/misc/debug.h"
|
||||
#include "nel/misc/vector.h"
|
||||
#include "nel/misc/path.h"
|
||||
#include "nel/misc/file.h"
|
||||
#include "nel/misc/matrix.h"
|
||||
#include "nel/misc/big_file.h"
|
||||
#include "nel/misc/hierarchical_timer.h"
|
||||
#include "nel/misc/dynloadlib.h"
|
||||
|
||||
#include <nel/sound/driver/sound_driver.h>
|
||||
#include <nel/sound/driver/buffer.h>
|
||||
#include <nel/sound/driver/source.h>
|
||||
#include <nel/sound/driver/listener.h>
|
||||
#include "nel/sound/driver/sound_driver.h"
|
||||
#include "nel/sound/driver/buffer.h"
|
||||
#include "nel/sound/driver/source.h"
|
||||
#include "nel/sound/driver/listener.h"
|
||||
|
||||
/* end of file */
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#ifndef NL_BUFFER_AL_H
|
||||
#define NL_BUFFER_AL_H
|
||||
|
||||
#include <nel/sound/driver/buffer.h>
|
||||
#include "nel/sound/driver/buffer.h"
|
||||
|
||||
namespace NLSOUND
|
||||
{
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#ifndef 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 {
|
||||
class CBufferAL;
|
||||
|
@ -126,7 +126,7 @@ public:
|
|||
|
||||
virtual void startBench();
|
||||
virtual void endBench();
|
||||
virtual void displayBench(NLMISC::CLog * /* log */);
|
||||
virtual void displayBench(NLMISC::CLog *log);
|
||||
|
||||
|
||||
/// Change the rolloff factor and apply to all sources
|
||||
|
@ -136,7 +136,7 @@ public:
|
|||
virtual void commit3DChanges();
|
||||
|
||||
/// Write information about the driver to the output stream.
|
||||
virtual void writeProfile(std::string& /* out */);
|
||||
virtual void writeProfile(std::string& out);
|
||||
|
||||
/// Remove a buffer
|
||||
void removeBuffer(CBufferAL *buffer);
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#ifndef NL_SOURCE_AL_H
|
||||
#define NL_SOURCE_AL_H
|
||||
|
||||
#include <nel/sound/driver/source.h>
|
||||
#include "nel/sound/driver/source.h"
|
||||
|
||||
namespace NLSOUND {
|
||||
class IBuffer;
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#ifndef NLSOUND_ADPCM_XAUDIO2_H
|
||||
#define NLSOUND_ADPCM_XAUDIO2_H
|
||||
|
||||
#include <nel/sound/driver/buffer.h>
|
||||
#include "nel/sound/driver/buffer.h"
|
||||
|
||||
namespace NLSOUND {
|
||||
class CBufferXAudio2;
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#ifndef NLSOUND_BUFFER_XAUDIO2_H
|
||||
#define NLSOUND_BUFFER_XAUDIO2_H
|
||||
|
||||
#include <nel/sound/driver/buffer.h>
|
||||
#include "nel/sound/driver/buffer.h"
|
||||
|
||||
namespace NLSOUND {
|
||||
class CSoundDriverXAudio2;
|
||||
|
|
|
@ -17,8 +17,8 @@
|
|||
#ifndef NLSOUND_LISTENER_XAUDIO2_H
|
||||
#define NLSOUND_LISTENER_XAUDIO2_H
|
||||
|
||||
#include <nel/sound/driver/listener.h>
|
||||
#include <nel/sound/driver/sound_driver.h>
|
||||
#include "nel/sound/driver/listener.h"
|
||||
#include "nel/sound/driver/sound_driver.h"
|
||||
|
||||
namespace NLSOUND {
|
||||
class CSoundDriverXAudio2;
|
||||
|
|
|
@ -17,9 +17,9 @@
|
|||
#ifndef NLSOUND_SOURCE_XAUDIO2_H
|
||||
#define NLSOUND_SOURCE_XAUDIO2_H
|
||||
|
||||
#include <nel/sound/driver/source.h>
|
||||
#include <nel/sound/driver/sound_driver.h>
|
||||
#include <nel/sound/driver/buffer.h>
|
||||
#include "nel/sound/driver/source.h"
|
||||
#include "nel/sound/driver/sound_driver.h"
|
||||
#include "nel/sound/driver/buffer.h"
|
||||
|
||||
namespace NLSOUND {
|
||||
class CSoundDriverXAudio2;
|
||||
|
|
|
@ -1620,7 +1620,6 @@ public:
|
|||
}
|
||||
}
|
||||
};
|
||||
|
||||
REGISTER_ACTION_HANDLER(CHandlerPhraseSelectShortcutBar, "select_shortcut_bar");
|
||||
|
||||
|
||||
|
|
|
@ -963,7 +963,6 @@ void impulseFarTell(NLMISC::CBitMemStream &impulse)
|
|||
ChatMngr.processFarTellString(impulse, InterfaceChatDisplayer);
|
||||
}
|
||||
|
||||
|
||||
void impulseTell2(NLMISC::CBitMemStream &impulse)
|
||||
{
|
||||
ChatMngr.processTellString2(impulse, InterfaceChatDisplayer);
|
||||
|
|
|
@ -21,9 +21,7 @@
|
|||
#ifndef CHAR_NAME_MAPPER_ITF
|
||||
#define CHAR_NAME_MAPPER_ITF
|
||||
#include "nel/misc/types_nl.h"
|
||||
#ifdef NL_COMP_VC8
|
||||
#include <memory>
|
||||
#endif
|
||||
#include "nel/misc/hierarchical_timer.h"
|
||||
#include "nel/misc/string_conversion.h"
|
||||
#include "nel/net/message.h"
|
||||
|
|
|
@ -21,9 +21,7 @@
|
|||
#ifndef CHAT_UNIFIER_ITF
|
||||
#define CHAT_UNIFIER_ITF
|
||||
#include "nel/misc/types_nl.h"
|
||||
#ifdef NL_COMP_VC8
|
||||
#include <memory>
|
||||
#endif
|
||||
#include "nel/misc/hierarchical_timer.h"
|
||||
#include "nel/misc/string_conversion.h"
|
||||
#include "nel/net/message.h"
|
||||
|
|
|
@ -21,9 +21,7 @@
|
|||
#ifndef COMMAND_EXECUTOR_ITF
|
||||
#define COMMAND_EXECUTOR_ITF
|
||||
#include "nel/misc/types_nl.h"
|
||||
#ifdef NL_COMP_VC8
|
||||
#include <memory>
|
||||
#endif
|
||||
#include "nel/misc/hierarchical_timer.h"
|
||||
#include "nel/misc/string_conversion.h"
|
||||
#include "nel/net/message.h"
|
||||
|
|
|
@ -21,9 +21,7 @@
|
|||
#ifndef ENTITY_LOCATOR_ITF
|
||||
#define ENTITY_LOCATOR_ITF
|
||||
#include "nel/misc/types_nl.h"
|
||||
#ifdef NL_COMP_VC8
|
||||
#include <memory>
|
||||
#endif
|
||||
#include "nel/misc/hierarchical_timer.h"
|
||||
#include "nel/misc/string_conversion.h"
|
||||
#include "nel/net/message.h"
|
||||
|
|
|
@ -21,9 +21,7 @@
|
|||
#ifndef LOGGER_SERVICE_ITF
|
||||
#define LOGGER_SERVICE_ITF
|
||||
#include "nel/misc/types_nl.h"
|
||||
#ifdef NL_COMP_VC8
|
||||
#include <memory>
|
||||
#endif
|
||||
#include "nel/misc/hierarchical_timer.h"
|
||||
#include "nel/misc/string_conversion.h"
|
||||
#include "nel/net/message.h"
|
||||
|
|
|
@ -1793,7 +1793,6 @@ bool CExport::generateIGFromFlora (const std::string &SrcFile, std::vector<SExpo
|
|||
vi.Pos = pos;
|
||||
if (pos.z > -90000.0f)
|
||||
_FloraInsts.push_back (vi);
|
||||
|
||||
} // End of Generate for a point
|
||||
|
||||
// Generate for a path
|
||||
|
|
|
@ -282,7 +282,7 @@ public:
|
|||
|
||||
string genCode(CMissionData &md)
|
||||
{
|
||||
string ret = "";
|
||||
string ret;
|
||||
if (!_MissionName.empty())
|
||||
{
|
||||
ret = "spawn_mission : " + _MissionName + " : " + _GiverName;
|
||||
|
|
Loading…
Reference in a new issue