Changed: Minor changes

This commit is contained in:
kervala 2013-09-06 15:00:35 +02:00
parent 25c9f41ab9
commit f627487429
3 changed files with 15 additions and 20 deletions

View file

@ -37,14 +37,13 @@ namespace NLMISC
return token; return token;
} }
uint i; uint i, j;
CSString result; CSString result;
// skip leading junk // skip leading junk
for (i=0;i<size();++i) for (i=0;i<size();++i)
{ {
// look for the next character in the 'separator' character list supplied // look for the next character in the 'separator' character list supplied
uint j;
for (j=0;separators[j] && (*this)[i]!=separators[j];++j) for (j=0;separators[j] && (*this)[i]!=separators[j];++j)
{} {}
// if not found then we're at end of leading junk // if not found then we're at end of leading junk
@ -56,7 +55,6 @@ namespace NLMISC
for (;i<size();++i) for (;i<size();++i)
{ {
// look for the next character in the 'separator' character list supplied // look for the next character in the 'separator' character list supplied
uint j;
for (j=0;separators[j] && (*this)[i]!=separators[j];++j) for (j=0;separators[j] && (*this)[i]!=separators[j];++j)
{} {}
// if not found then we're at end of text chunk // if not found then we're at end of text chunk
@ -69,7 +67,6 @@ namespace NLMISC
for (;i<size();++i) for (;i<size();++i)
{ {
// look for the next character in the 'separator' character list supplied // look for the next character in the 'separator' character list supplied
uint j;
for (j=0;separators[j] && (*this)[i]!=separators[j];++j) for (j=0;separators[j] && (*this)[i]!=separators[j];++j)
{} {}
// if not found then we're at end of leading junk // if not found then we're at end of leading junk

View file

@ -47,14 +47,14 @@ uint CPUFrequency;
bool GetGLInformation () bool GetGLInformation ()
{ {
// *** INIT VARIABLES // *** INIT VARIABLES
GLExtensions.clear (); GLExtensions.clear ();
GLRenderer = ""; GLRenderer = "";
GLVendor = ""; GLVendor = "";
GLVersion = ""; GLVersion = "";
// *** INIT OPENGL // *** INIT OPENGL
// Register a window class // Register a window class
WNDCLASS wc; WNDCLASS wc;
memset(&wc,0,sizeof(wc)); memset(&wc,0,sizeof(wc));
@ -79,14 +79,14 @@ bool GetGLInformation ()
WndRect.right=100; WndRect.right=100;
WndRect.bottom=100; WndRect.bottom=100;
HWND hWnd = CreateWindow ( "RyzomGetGlInformation", HWND hWnd = CreateWindow ( "RyzomGetGlInformation",
"", "",
WndFlags, WndFlags,
CW_USEDEFAULT,CW_USEDEFAULT, CW_USEDEFAULT,CW_USEDEFAULT,
WndRect.right,WndRect.bottom, WndRect.right,WndRect.bottom,
NULL, NULL,
NULL, NULL,
GetModuleHandle(NULL), GetModuleHandle(NULL),
NULL); NULL);
if (!hWnd) if (!hWnd)
return false; return false;
@ -384,7 +384,7 @@ void CDisplayDlg::updateState ()
TextWnd1.EnableWindow (Windowed == 1); TextWnd1.EnableWindow (Windowed == 1);
TextWnd2.EnableWindow (Windowed == 1); TextWnd2.EnableWindow (Windowed == 1);
TextWnd3.EnableWindow (Windowed == 1); TextWnd3.EnableWindow (Windowed == 1);
// Fill the combobox values // Fill the combobox values
ModeCtrl.ResetContent (); ModeCtrl.ResetContent ();
uint i; uint i;
@ -411,11 +411,11 @@ void CDisplayDlg::updateState ()
BOOL CDisplayDlg::OnInitDialog() BOOL CDisplayDlg::OnInitDialog()
{ {
CDialog::OnInitDialog(); CDialog::OnInitDialog();
updateState (); updateState ();
return TRUE; // return TRUE unless you set the focus to a control return TRUE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE // EXCEPTION: OCX Property Pages should return FALSE
} }
// *************************************************************************** // ***************************************************************************

View file

@ -32,8 +32,6 @@
#include <nel/misc/mem_stream.h> #include <nel/misc/mem_stream.h>
#include <nel/misc/sheet_id.h> #include <nel/misc/sheet_id.h>
//#include <nel/3d/u_driver.h>
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
#define NOMINMAX #define NOMINMAX
#include <WinSock2.h> #include <WinSock2.h>