mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-10 09:19:01 +00:00
Changed: #878 Fix typos in comments/code
This commit is contained in:
parent
fbda348725
commit
eb3f1737c2
12 changed files with 57 additions and 57 deletions
|
@ -469,12 +469,12 @@ private:
|
||||||
volatile uint _ProcessExited;
|
volatile uint _ProcessExited;
|
||||||
|
|
||||||
// *** Bitmap sharing
|
// *** Bitmap sharing
|
||||||
std::map<std::string, NLMISC::CBitmap> _Bitmaps;
|
std::map<std::string, NLMISC::CBitmap> _Bitmaps;
|
||||||
|
|
||||||
// *** The zbuffer
|
// *** The zbuffer
|
||||||
|
|
||||||
// ZBuffer mutex
|
// ZBuffer mutex
|
||||||
NLMISC::CFastMutex _Mutex;
|
NLMISC::CFastMutex _Mutex;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
// Zbuffer pixels in meters
|
// Zbuffer pixels in meters
|
||||||
|
|
|
@ -2078,7 +2078,7 @@ private:
|
||||||
|
|
||||||
// Directx
|
// Directx
|
||||||
uint32 _Adapter;
|
uint32 _Adapter;
|
||||||
D3DDEVTYPE _Rasterizer;
|
D3DDEVTYPE _Rasterizer;
|
||||||
LPDIRECT3D9 _D3D;
|
LPDIRECT3D9 _D3D;
|
||||||
public:
|
public:
|
||||||
IDirect3DDevice9 *_DeviceInterface;
|
IDirect3DDevice9 *_DeviceInterface;
|
||||||
|
|
|
@ -15,12 +15,11 @@
|
||||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
#include "stddirect3d.h"
|
#include "stddirect3d.h"
|
||||||
|
#include "driver_direct3d.h"
|
||||||
|
|
||||||
#include "nel/misc/di_event_emitter.h"
|
#include "nel/misc/di_event_emitter.h"
|
||||||
#include "nel/misc/mouse_device.h"
|
#include "nel/misc/mouse_device.h"
|
||||||
|
|
||||||
#include "driver_direct3d.h"
|
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
using namespace NLMISC;
|
using namespace NLMISC;
|
||||||
|
|
||||||
|
|
|
@ -46,30 +46,33 @@
|
||||||
# endif //XF86VIDMODE
|
# endif //XF86VIDMODE
|
||||||
#endif // NL_OS_UNIX
|
#endif // NL_OS_UNIX
|
||||||
|
|
||||||
#include "driver_opengl_extension.h"
|
|
||||||
|
|
||||||
#include "nel/3d/driver.h"
|
|
||||||
#include "nel/3d/material.h"
|
|
||||||
#include "nel/3d/shader.h"
|
|
||||||
#include "nel/3d/vertex_buffer.h"
|
|
||||||
#include "nel/misc/matrix.h"
|
#include "nel/misc/matrix.h"
|
||||||
#include "nel/misc/smart_ptr.h"
|
#include "nel/misc/smart_ptr.h"
|
||||||
#include "nel/misc/rgba.h"
|
#include "nel/misc/rgba.h"
|
||||||
#include "nel/misc/event_emitter.h"
|
#include "nel/misc/event_emitter.h"
|
||||||
#include "nel/misc/bit_set.h"
|
#include "nel/misc/bit_set.h"
|
||||||
#include "nel/misc/hierarchical_timer.h"
|
#include "nel/misc/hierarchical_timer.h"
|
||||||
#include "nel/3d/ptr_set.h"
|
#include "nel/misc/bitmap.h"
|
||||||
|
#include "nel/misc/common.h"
|
||||||
#include "nel/misc/heap_memory.h"
|
#include "nel/misc/heap_memory.h"
|
||||||
#include "nel/misc/event_emitter_multi.h"
|
#include "nel/misc/event_emitter_multi.h"
|
||||||
#include "driver_opengl_states.h"
|
#include "nel/misc/time_nl.h"
|
||||||
|
|
||||||
|
#include "nel/3d/driver.h"
|
||||||
|
#include "nel/3d/material.h"
|
||||||
|
#include "nel/3d/shader.h"
|
||||||
|
#include "nel/3d/vertex_buffer.h"
|
||||||
|
#include "nel/3d/ptr_set.h"
|
||||||
#include "nel/3d/texture_cube.h"
|
#include "nel/3d/texture_cube.h"
|
||||||
#include "nel/3d/vertex_program_parse.h"
|
#include "nel/3d/vertex_program_parse.h"
|
||||||
#include "nel/3d/viewport.h"
|
#include "nel/3d/viewport.h"
|
||||||
#include "nel/3d/scissor.h"
|
#include "nel/3d/scissor.h"
|
||||||
#include "nel/3d/light.h"
|
#include "nel/3d/light.h"
|
||||||
#include "nel/misc/time_nl.h"
|
|
||||||
#include "nel/3d/occlusion_query.h"
|
#include "nel/3d/occlusion_query.h"
|
||||||
|
|
||||||
|
#include "driver_opengl_states.h"
|
||||||
|
#include "driver_opengl_extension.h"
|
||||||
|
|
||||||
|
|
||||||
#ifdef NL_OS_WINDOWS
|
#ifdef NL_OS_WINDOWS
|
||||||
#include "nel/misc/win_event_emitter.h"
|
#include "nel/misc/win_event_emitter.h"
|
||||||
|
|
|
@ -78,7 +78,7 @@ namespace NLMISC
|
||||||
// the thread of the task
|
// the thread of the task
|
||||||
IThread *_TaskThread;
|
IThread *_TaskThread;
|
||||||
/// The mutex of the task task
|
/// The mutex of the task task
|
||||||
CFastMutex _TaskMutex;
|
CFastMutex _TaskMutex;
|
||||||
|
|
||||||
CCoTask *_CoTask;
|
CCoTask *_CoTask;
|
||||||
|
|
||||||
|
@ -371,7 +371,7 @@ namespace NLMISC
|
||||||
nlverify(getcontext(&_PImpl->_Ctx) == 0);
|
nlverify(getcontext(&_PImpl->_Ctx) == 0);
|
||||||
|
|
||||||
// change the task context
|
// change the task context
|
||||||
_PImpl->_Ctx.uc_stack.ss_sp = _PImpl->_Stack;
|
_PImpl->_Ctx.uc_stack.ss_sp = _PImpl->_Stack;
|
||||||
_PImpl->_Ctx.uc_stack.ss_size = NL_TASK_STACK_SIZE;
|
_PImpl->_Ctx.uc_stack.ss_size = NL_TASK_STACK_SIZE;
|
||||||
|
|
||||||
_PImpl->_Ctx.uc_link = NULL;
|
_PImpl->_Ctx.uc_link = NULL;
|
||||||
|
|
|
@ -141,7 +141,6 @@ void CInputHandlerManager::operator ()(const NLMISC::CEvent &event)
|
||||||
{
|
{
|
||||||
HandleSystemCursorCapture(event);
|
HandleSystemCursorCapture(event);
|
||||||
|
|
||||||
|
|
||||||
if (event == EventDisplayChangeId)
|
if (event == EventDisplayChangeId)
|
||||||
{
|
{
|
||||||
switch (getCurrentColorDepth())
|
switch (getCurrentColorDepth())
|
||||||
|
|
|
@ -5718,7 +5718,7 @@ void CInterfaceManager::connectYuboChat()
|
||||||
if(KlientChatPort != 0 && !_YuboChat.connected())
|
if(KlientChatPort != 0 && !_YuboChat.connected())
|
||||||
{
|
{
|
||||||
// NB: hard code url, to avoid "client.cfg trojan"
|
// NB: hard code url, to avoid "client.cfg trojan"
|
||||||
// (a client.cfg with an url pointing to a hackcer site, to grab login/password)
|
// (a client.cfg with an url pointing to a hacker site, to grab login/password)
|
||||||
extern std::string LoginLogin, LoginPassword;
|
extern std::string LoginLogin, LoginPassword;
|
||||||
_YuboChat.connect(string("chat.ryzom.com:")+toString(KlientChatPort), LoginLogin, LoginPassword);
|
_YuboChat.connect(string("chat.ryzom.com:")+toString(KlientChatPort), LoginLogin, LoginPassword);
|
||||||
|
|
||||||
|
|
|
@ -765,6 +765,7 @@ void CViewRenderer::loadTextures (const std::string &textureFileName, const std:
|
||||||
// Insert in map.
|
// Insert in map.
|
||||||
_TextureMap.insert( make_pair(image.Name, textureId) );
|
_TextureMap.insert( make_pair(image.Name, textureId) );
|
||||||
}
|
}
|
||||||
|
|
||||||
// if this is a cursor texture, extract it now (supported for rgba only now, because of the blit)
|
// if this is a cursor texture, extract it now (supported for rgba only now, because of the blit)
|
||||||
if (CustomMouse.isAlphaBlendedCursorSupported())
|
if (CustomMouse.isAlphaBlendedCursorSupported())
|
||||||
{
|
{
|
||||||
|
|
|
@ -1095,8 +1095,6 @@ void initShardDisplay()
|
||||||
|
|
||||||
void onlogin(bool vanishScreen = true)
|
void onlogin(bool vanishScreen = true)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
CInterfaceManager *pIM = CInterfaceManager::getInstance();
|
CInterfaceManager *pIM = CInterfaceManager::getInstance();
|
||||||
|
|
||||||
// Remove space before and after each string login & password
|
// Remove space before and after each string login & password
|
||||||
|
|
|
@ -271,7 +271,7 @@ void CView::cameraDistance(float dist)
|
||||||
void CView::changeCameraHeight(bool up, bool down)
|
void CView::changeCameraHeight(bool up, bool down)
|
||||||
{
|
{
|
||||||
// If the user is not inside a building.
|
// If the user is not inside a building.
|
||||||
if(UserEntity->forceIndoorFPV() == false)
|
if(!UserEntity->forceIndoorFPV())
|
||||||
{
|
{
|
||||||
if(up)
|
if(up)
|
||||||
{
|
{
|
||||||
|
@ -293,7 +293,7 @@ void CView::changeCameraHeight(bool up, bool down)
|
||||||
void CView::changeCameraDist(bool forward, bool backward)
|
void CView::changeCameraDist(bool forward, bool backward)
|
||||||
{
|
{
|
||||||
// If the user is not inside a building.
|
// If the user is not inside a building.
|
||||||
if(UserEntity->forceIndoorFPV() == false)
|
if(!UserEntity->forceIndoorFPV())
|
||||||
{
|
{
|
||||||
if(forward)
|
if(forward)
|
||||||
decreaseCameraDist();
|
decreaseCameraDist();
|
||||||
|
|
Loading…
Reference in a new issue