aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-10-03 07:18:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: #878 Fix typos in comments/code

Browse source
This commit is contained in:
kervala 2010-07-27 13:21:11 +02:00
parent ecba804cea
commit da9803a5c0
7 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/include/nel/sound/music_sound.h
View file

@ -61,7 +61,7 @@ public:
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; NLMISC::TTime LastStopTime;
private: private:

2
code/nel/src/3d/driver/opengl/unix_event_emitter.cpp
View file

@ -27,7 +27,7 @@
#include "nel/misc/debug.h" #include "nel/misc/debug.h"
#include "unix_event_emitter.h" #include "unix_event_emitter.h"
typedef void (*x11Proc)(NL3D::IDriver *drv, XEvent *e); typedef bool (*x11Proc)(NL3D::IDriver *drv, XEvent *e);
namespace NLMISC { namespace NLMISC {

2
code/nel/src/sound/music_channel_fader.cpp
View file

@ -98,7 +98,7 @@ void CMusicChannelFader::update()
fader.Fade = false; fader.Fade = false;
fader.Playing = false; fader.Playing = false;
} }
else if (_MusicFader[i].XFadeVolume >= 1.f) else if (fader.XFadeVolume >= 1.f)
{ {
// fadein complete // fadein complete
fader.Fade = false; fader.Fade = false;

6
code/ryzom/client/src/interface_v3/music_player.cpp
View file

@ -41,7 +41,7 @@ CMusicPlayer MusicPlayer;
CMusicPlayer::CMusicPlayer () CMusicPlayer::CMusicPlayer ()
{ {
_CurrentSong = 0; _CurrentSong = 0;
_State = Stoped; _State = Stopped;
} }
@ -54,7 +54,7 @@ void CMusicPlayer::playSongs (const std::vector<CSongs> &songs)
// If pause, stop, else play will resume // If pause, stop, else play will resume
if (_State == Paused) if (_State == Paused)
_State = Stoped; _State = Stopped;
play (); play ();
} }
@ -152,7 +152,7 @@ void CMusicPlayer::update ()
else else
{ {
SoundMngr->stopMusic(0); SoundMngr->stopMusic(0);
_State = Stoped; _State = Stopped;
} }
} }
} }

2
code/ryzom/client/src/interface_v3/music_player.h
View file

@ -60,7 +60,7 @@ private:
std::vector<CSongs> _Songs; std::vector<CSongs> _Songs;
// State // State
enum TState { Stoped, Playing, Paused } _State; enum TState { Stopped, Playing, Paused } _State;
}; };
extern CMusicPlayer MusicPlayer; extern CMusicPlayer MusicPlayer;

2
code/ryzom/common/src/game_share/outpost.h
View file

@ -97,7 +97,7 @@ namespace OUTPOSTENUMS
OwnerGiveUp, // the owner guild gave up the outpost OwnerGiveUp, // the owner guild gave up the outpost
SquadKilled, // a defending squad was killed SquadKilled, // a defending squad was killed
EventAisUp, // the ais of the outpost started (or we did) 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 // AllSquadsKilled, // all defending squads were killed
}; };

4
code/ryzom/common/src/game_share/server_edition_module.cpp
View file

@ -1838,7 +1838,7 @@ void CServerEditionModule::onMapConnectionAsked( NLNET::IModuleProxy * clientEdi
{ {
bool animationSessionExist = false; 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 // Add charId connected in animation Module
{ {
std::vector<TCharId> connectedChars; std::vector<TCharId> connectedChars;
@ -5589,7 +5589,7 @@ void CServerEditionModule::getTpContext(TCharId charId, std::string& tpCancelTex
CEditionSession* session =getSession(sessionId); CEditionSession* session =getSession(sessionId);
if (!session) { return; } 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 // Add charId connected in animation Module
bool animationSessionExist = false; bool animationSessionExist = false;
{ {