From da46bed2967fb47e0f5b4d77b97139e51a71a77d Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 27 Jul 2010 13:21:11 +0200 Subject: [PATCH] Changed: #878 Fix typos in comments/code --- code/nel/include/nel/sound/music_sound.h | 2 +- code/nel/src/3d/driver/opengl/unix_event_emitter.cpp | 2 +- code/nel/src/sound/music_channel_fader.cpp | 2 +- code/ryzom/client/src/interface_v3/music_player.cpp | 6 +++--- code/ryzom/client/src/interface_v3/music_player.h | 2 +- code/ryzom/common/src/game_share/outpost.h | 2 +- code/ryzom/common/src/game_share/server_edition_module.cpp | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/code/nel/include/nel/sound/music_sound.h b/code/nel/include/nel/sound/music_sound.h index a635184a9..c3aa85a59 100644 --- a/code/nel/include/nel/sound/music_sound.h +++ b/code/nel/include/nel/sound/music_sound.h @@ -61,7 +61,7 @@ public: public: - // For CMusicSoundManager. Mark the last time (in ms) this music was stoped, after a play. INT_MIN by default + // For CMusicSoundManager. Mark the last time (in ms) this music was stopped, after a play. INT_MIN by default NLMISC::TTime LastStopTime; private: diff --git a/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp b/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp index 0e14e0a74..7fad62a98 100644 --- a/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp +++ b/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp @@ -27,7 +27,7 @@ #include "nel/misc/debug.h" #include "unix_event_emitter.h" -typedef void (*x11Proc)(NL3D::IDriver *drv, XEvent *e); +typedef bool (*x11Proc)(NL3D::IDriver *drv, XEvent *e); namespace NLMISC { diff --git a/code/nel/src/sound/music_channel_fader.cpp b/code/nel/src/sound/music_channel_fader.cpp index ce8db4bfe..ced739093 100644 --- a/code/nel/src/sound/music_channel_fader.cpp +++ b/code/nel/src/sound/music_channel_fader.cpp @@ -98,7 +98,7 @@ void CMusicChannelFader::update() fader.Fade = false; fader.Playing = false; } - else if (_MusicFader[i].XFadeVolume >= 1.f) + else if (fader.XFadeVolume >= 1.f) { // fadein complete fader.Fade = false; diff --git a/code/ryzom/client/src/interface_v3/music_player.cpp b/code/ryzom/client/src/interface_v3/music_player.cpp index 2223a6073..95b420a48 100644 --- a/code/ryzom/client/src/interface_v3/music_player.cpp +++ b/code/ryzom/client/src/interface_v3/music_player.cpp @@ -41,7 +41,7 @@ CMusicPlayer MusicPlayer; CMusicPlayer::CMusicPlayer () { _CurrentSong = 0; - _State = Stoped; + _State = Stopped; } @@ -54,7 +54,7 @@ void CMusicPlayer::playSongs (const std::vector &songs) // If pause, stop, else play will resume if (_State == Paused) - _State = Stoped; + _State = Stopped; play (); } @@ -152,7 +152,7 @@ void CMusicPlayer::update () else { SoundMngr->stopMusic(0); - _State = Stoped; + _State = Stopped; } } } diff --git a/code/ryzom/client/src/interface_v3/music_player.h b/code/ryzom/client/src/interface_v3/music_player.h index 9765e2eff..59987e48f 100644 --- a/code/ryzom/client/src/interface_v3/music_player.h +++ b/code/ryzom/client/src/interface_v3/music_player.h @@ -60,7 +60,7 @@ private: std::vector _Songs; // State - enum TState { Stoped, Playing, Paused } _State; + enum TState { Stopped, Playing, Paused } _State; }; extern CMusicPlayer MusicPlayer; diff --git a/code/ryzom/common/src/game_share/outpost.h b/code/ryzom/common/src/game_share/outpost.h index 12744a309..0b5d40a35 100644 --- a/code/ryzom/common/src/game_share/outpost.h +++ b/code/ryzom/common/src/game_share/outpost.h @@ -97,7 +97,7 @@ namespace OUTPOSTENUMS OwnerGiveUp, // the owner guild gave up the outpost SquadKilled, // a defending squad was killed EventAisUp, // the ais of the outpost started (or we did) - EventAisDown, // the ais of the outpost stoped + EventAisDown, // the ais of the outpost stopped // AllSquadsKilled, // all defending squads were killed }; diff --git a/code/ryzom/common/src/game_share/server_edition_module.cpp b/code/ryzom/common/src/game_share/server_edition_module.cpp index 2731ed40b..e2cb7755a 100644 --- a/code/ryzom/common/src/game_share/server_edition_module.cpp +++ b/code/ryzom/common/src/game_share/server_edition_module.cpp @@ -1838,7 +1838,7 @@ void CServerEditionModule::onMapConnectionAsked( NLNET::IModuleProxy * clientEdi { bool animationSessionExist = false; - // If player reconnect after test mode the test mode is stoped + // If player reconnect after test mode the test mode is stopped // Add charId connected in animation Module { std::vector connectedChars; @@ -5589,7 +5589,7 @@ void CServerEditionModule::getTpContext(TCharId charId, std::string& tpCancelTex CEditionSession* session =getSession(sessionId); if (!session) { return; } - // If player reconnect after test mode the test mode is stoped + // If player reconnect after test mode the test mode is stopped // Add charId connected in animation Module bool animationSessionExist = false; {