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

Changed: #878 Fix typos in comments/code

Browse source
This commit is contained in:
kervala 2011-06-03 15:17:23 +02:00
parent 3a506695b9
commit 15e811f9f4
4 changed files with 73 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
code/nel/include/nel/cegui/nelrenderer.h
View file

@ -142,11 +142,14 @@ namespace CEGUI
void captureCursor(bool capture) { void captureCursor(bool capture) {
m_Captured=capture; m_Captured=capture;
if(capture) { if(capture)
{
m_Driver->setCapture(true); m_Driver->setCapture(true);
m_Driver->showCursor(false); m_Driver->showCursor(false);
m_InputDriver.activateMouse(); m_InputDriver.activateMouse();
} else { }
else
{
m_Driver->setCapture(false); m_Driver->setCapture(false);
m_Driver->showCursor(true); m_Driver->showCursor(true);
m_InputDriver.deactivateMouse(); m_InputDriver.deactivateMouse();
@ -178,7 +181,8 @@ namespace CEGUI
class NeLInputDriver : public NLMISC::IEventListener class NeLInputDriver : public NLMISC::IEventListener
{ {
public: public:
NeLInputDriver() { NeLInputDriver()
{
m_MouseX=0.5f; m_MouseX=0.5f;
m_MouseY=0.5f; m_MouseY=0.5f;
m_Active=false; m_Active=false;
@ -189,7 +193,8 @@ namespace CEGUI
} }
virtual ~NeLInputDriver() { ; } virtual ~NeLInputDriver() { ; }
void addToServer(NLMISC::CEventServer& server) { void addToServer(NLMISC::CEventServer& server)
{
server.addListener(NLMISC::EventMouseMoveId, this); server.addListener(NLMISC::EventMouseMoveId, this);
server.addListener(NLMISC::EventMouseDownId, this); server.addListener(NLMISC::EventMouseDownId, this);
server.addListener(NLMISC::EventMouseUpId, this); server.addListener(NLMISC::EventMouseUpId, this);
@ -200,7 +205,8 @@ namespace CEGUI
m_AsyncListener.addToServer(server); m_AsyncListener.addToServer(server);
} }
void removeFromServer(NLMISC::CEventServer& server) { void removeFromServer(NLMISC::CEventServer& server)
{
server.removeListener(NLMISC::EventMouseMoveId, this); server.removeListener(NLMISC::EventMouseMoveId, this);
server.removeListener(NLMISC::EventMouseDownId, this); server.removeListener(NLMISC::EventMouseDownId, this);
server.removeListener(NLMISC::EventMouseUpId, this); server.removeListener(NLMISC::EventMouseUpId, this);
@ -226,9 +232,11 @@ namespace CEGUI
* *
* \param event An event, probably a CEventMouse or CEventKey/Char. * \param event An event, probably a CEventMouse or CEventKey/Char.
*/ */
virtual void operator ()(const NLMISC::CEvent& event) { virtual void operator ()(const NLMISC::CEvent& event)
{
// don't process any input if we're inactive. // don't process any input if we're inactive.
if(m_Active==false) { if(m_Active==false)
{
return; // not processing ANY input return; // not processing ANY input
} }
@ -236,36 +244,51 @@ namespace CEGUI
{ {
// otherwise, on with the festivities. // otherwise, on with the festivities.
// catch ALL mouse event, just in case. // catch ALL mouse event, just in case.
if(event==NLMISC::EventMouseDownId||event==NLMISC::EventMouseUpId||event==NLMISC::EventMouseMoveId||event==NLMISC::EventMouseDblClkId||event==NLMISC::EventMouseWheelId) { if(event==NLMISC::EventMouseDownId||event==NLMISC::EventMouseUpId||event==NLMISC::EventMouseMoveId||event==NLMISC::EventMouseDblClkId||event==NLMISC::EventMouseWheelId)
if(!m_MouseActive) { {
if(!m_MouseActive)
{
// we're not processing any mouse activity. The cursor isn't captured maybe? // we're not processing any mouse activity. The cursor isn't captured maybe?
return; return;
} }
NLMISC::CEventMouse *mouseEvent=(NLMISC::CEventMouse *)&event; NLMISC::CEventMouse *mouseEvent=(NLMISC::CEventMouse *)&event;
// a mouse button was pressed. // a mouse button was pressed.
if(event == NLMISC::EventMouseDownId) { if(event == NLMISC::EventMouseDownId)
{
// it was the left button... // it was the left button...
if (mouseEvent->Button & NLMISC::leftButton) { if (mouseEvent->Button & NLMISC::leftButton)
{
CEGUI::System::getSingleton().injectMouseButtonDown(CEGUI::LeftButton); CEGUI::System::getSingleton().injectMouseButtonDown(CEGUI::LeftButton);
// it was the right button... // it was the right button...
} else if (mouseEvent->Button & NLMISC::rightButton) { }
else if (mouseEvent->Button & NLMISC::rightButton)
{
CEGUI::System::getSingleton().injectMouseButtonDown(CEGUI::RightButton); CEGUI::System::getSingleton().injectMouseButtonDown(CEGUI::RightButton);
} else if (mouseEvent->Button & NLMISC::middleButton) { }
else if (mouseEvent->Button & NLMISC::middleButton)
{
CEGUI::System::getSingleton().injectMouseButtonDown(CEGUI::MiddleButton); CEGUI::System::getSingleton().injectMouseButtonDown(CEGUI::MiddleButton);
} }
// a mouse button was released // a mouse button was released
} else if (event == NLMISC::EventMouseUpId) { }
else if (event == NLMISC::EventMouseUpId)
{
// it was the left button... // it was the left button...
if(mouseEvent->Button & NLMISC::leftButton) { if(mouseEvent->Button & NLMISC::leftButton)
{
CEGUI::System::getSingleton().injectMouseButtonUp(CEGUI::LeftButton); CEGUI::System::getSingleton().injectMouseButtonUp(CEGUI::LeftButton);
// it was the right button... // it was the right button...
} else if (mouseEvent->Button & NLMISC::rightButton) { }
else if (mouseEvent->Button & NLMISC::rightButton)
{
CEGUI::System::getSingleton().injectMouseButtonUp(CEGUI::RightButton); CEGUI::System::getSingleton().injectMouseButtonUp(CEGUI::RightButton);
} else if (mouseEvent->Button & NLMISC::middleButton) { } else if (mouseEvent->Button & NLMISC::middleButton) {
CEGUI::System::getSingleton().injectMouseButtonUp(CEGUI::MiddleButton); CEGUI::System::getSingleton().injectMouseButtonUp(CEGUI::MiddleButton);
} }
} else if (event == NLMISC::EventMouseMoveId) { }
else if (event == NLMISC::EventMouseMoveId)
{
// convert into screen coordinates. // convert into screen coordinates.
float delta_x=(float)(mouseEvent->X - m_MouseX)*m_Width; float delta_x=(float)(mouseEvent->X - m_MouseX)*m_Width;
float delta_y=(float)((1.0f-mouseEvent->Y) - m_MouseY)*m_Height; float delta_y=(float)((1.0f-mouseEvent->Y) - m_MouseY)*m_Height;
@ -276,18 +299,26 @@ namespace CEGUI
// and save for delta. // and save for delta.
m_MouseX=mouseEvent->X; m_MouseX=mouseEvent->X;
m_MouseY=1.0f-mouseEvent->Y; m_MouseY=1.0f-mouseEvent->Y;
} else if (event == NLMISC::EventMouseWheelId) { }
else if (event == NLMISC::EventMouseWheelId)
{
NLMISC::CEventMouseWheel *ev=(NLMISC::CEventMouseWheel *)&event; NLMISC::CEventMouseWheel *ev=(NLMISC::CEventMouseWheel *)&event;
float dir=0.0f; float dir=0.0f;
if(ev->Direction) dir=0.5f; if(ev->Direction) dir=0.5f;
else dir=-0.5f; else dir=-0.5f;
CEGUI::System::getSingleton().injectMouseWheelChange(dir); CEGUI::System::getSingleton().injectMouseWheelChange(dir);
} }
} else { // assume otherwise that it's a character. }
if(event==NLMISC::EventCharId) { else
{
// assume otherwise that it's a character.
if(event==NLMISC::EventCharId)
{
unsigned char c = (char)((NLMISC::CEventChar&)event).Char; unsigned char c = (char)((NLMISC::CEventChar&)event).Char;
CEGUI::System::getSingleton().injectChar((CEGUI::utf32)c); CEGUI::System::getSingleton().injectChar((CEGUI::utf32)c);
} else if(event==NLMISC::EventKeyDownId) { }
else if(event==NLMISC::EventKeyDownId)
{
NLMISC::CEventKeyDown *keyvent=(NLMISC::CEventKeyDown *)&event; NLMISC::CEventKeyDown *keyvent=(NLMISC::CEventKeyDown *)&event;
CEGUI::System::getSingleton().injectKeyDown(m_KeyMap[keyvent->Key]); CEGUI::System::getSingleton().injectKeyDown(m_KeyMap[keyvent->Key]);
} }
@ -296,7 +327,8 @@ namespace CEGUI
catch (CEGUI::Exception) { } catch (CEGUI::Exception) { }
} }
void initKeyMap() { void initKeyMap()
{
m_KeyMap[NLMISC::Key0 ]=CEGUI::Key::Zero; m_KeyMap[NLMISC::Key0 ]=CEGUI::Key::Zero;
m_KeyMap[NLMISC::Key1 ]=CEGUI::Key::One; m_KeyMap[NLMISC::Key1 ]=CEGUI::Key::One;
m_KeyMap[NLMISC::Key2 ]=CEGUI::Key::Two; m_KeyMap[NLMISC::Key2 ]=CEGUI::Key::Two;

7
code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.h
View file

@ -579,9 +579,12 @@ class PaintPatchData : public LocalModData {
void SetFlag(DWORD f,BOOL on) void SetFlag(DWORD f,BOOL on)
{ {
if ( on ) { if ( on )
{
flags|=f; flags|=f;
} else { }
else
{
flags&=~f; flags&=~f;
} }
} }

3
code/snowballs2/client/src/snowballs_client.cpp
View file

@ -594,7 +594,8 @@ void loopLogin()
if (ConfigFile->getVar("Local").asInt() == 0) if (ConfigFile->getVar("Local").asInt() == 0)
{ {
// Only attempt to directly log in if we haven't been passed a cookie already. // Only attempt to directly log in if we haven't been passed a cookie already.
if(Cookie.empty() || FSAddr.empty()) { if(Cookie.empty() || FSAddr.empty())
{
if (ConfigFile->getVar("UseDirectClient").asInt() == 1) if (ConfigFile->getVar("UseDirectClient").asInt() == 1)
{ {
string result; string result;