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-05-26 16:20:17 +02:00
parent e909556883
commit a09264c6c0
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/nel/samples/3d/font/main.cpp
View file

@ -42,7 +42,6 @@ using namespace std;
using namespace NL3D; using namespace NL3D;
using namespace NLMISC; using namespace NLMISC;
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
int WINAPI WinMain( HINSTANCE hInstance, int WINAPI WinMain( HINSTANCE hInstance,
HINSTANCE hPrevInstance, HINSTANCE hPrevInstance,
@ -139,7 +138,7 @@ int main(int argc, char **argv)
tc.setScaleX (scale); tc.setScaleX (scale);
tc.setScaleZ (scale); tc.setScaleZ (scale);
tc.printAt (0.1f, 0.3f, string("printAt Scale String")); tc.printAt (0.1f, 0.3f, string("printAt Scale String"));
// display the same string with no scale // display the same string with no scale
tc.setHotSpot (CComputedString::TopLeft); tc.setHotSpot (CComputedString::TopLeft);
tc.setScaleX (1.0f); tc.setScaleX (1.0f);

1
code/nel/src/georges/form_elm.cpp
View file

@ -233,6 +233,7 @@ const CType* CFormElm::getType ()
warning (false, "getType", "This node is not an atom."); warning (false, "getType", "This node is not an atom.");
return 0; return 0;
} }
// *************************************************************************** // ***************************************************************************
bool CFormElm::getValue (string &/* result */, TEval /* evaluate */) const bool CFormElm::getValue (string &/* result */, TEval /* evaluate */) const

7
code/nel/src/misc/shared_memory.cpp
View file

@ -36,8 +36,8 @@ namespace NLMISC {
// Storage for file handles, necessary to close the handles // Storage for file handles, necessary to close the handles
map<void*,HANDLE> AccessAddressesToHandles; map<void*,HANDLE> AccessAddressesToHandles;
#else #else
// Storage for shmid, necessary to destroy the segments // Storage for shmid, necessary to destroy the segments
map<TSharedMemId, int> SharedMemIdsToShmids; map<TSharedMemId, sint> SharedMemIdsToShmids;
#endif #endif
@ -71,7 +71,7 @@ void *CSharedMemory::createSharedMemory( TSharedMemId sharedMemId, uint32 size
#else #else
// Create a shared memory segment // Create a shared memory segment
int shmid = shmget( sharedMemId, size, IPC_CREAT | IPC_EXCL | 0666 ); sint shmid = shmget( sharedMemId, size, IPC_CREAT | IPC_EXCL | 0666 );
if ( shmid == -1 ) if ( shmid == -1 )
return NULL; return NULL;
SharedMemIdsToShmids.insert( make_pair( sharedMemId, shmid ) ); SharedMemIdsToShmids.insert( make_pair( sharedMemId, shmid ) );
@ -82,6 +82,7 @@ void *CSharedMemory::createSharedMemory( TSharedMemId sharedMemId, uint32 size
return NULL; return NULL;
else else
return accessAddress; return accessAddress;
#endif #endif
} }