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

Changed: Minor changes

Browse source
This commit is contained in:
kervala 2015-01-10 18:45:14 +01:00
parent 741d3b6275
commit ba6cbc76c9
7 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp
View file

@ -453,7 +453,6 @@ bool CDriverGL::setupEXTVertexShader(const CVPParser::TProgram &program, GLuint
// clear last error // clear last error
GLenum glError = glGetError(); GLenum glError = glGetError();
//variants[EVSSecondaryColorVariant] = nglGenSymbolsEXT(GL_VECTOR_EXT, GL_VARIANT_EXT, GL_NORMALIZED_RANGE_EXT, 1);
//variants[EVSSecondaryColorVariant] = nglGenSymbolsEXT(GL_VECTOR_EXT, GL_VARIANT_EXT, GL_NORMALIZED_RANGE_EXT, 1); //variants[EVSSecondaryColorVariant] = nglGenSymbolsEXT(GL_VECTOR_EXT, GL_VARIANT_EXT, GL_NORMALIZED_RANGE_EXT, 1);
// allocate the symbols // allocate the symbols

4
code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
View file

@ -627,8 +627,8 @@ bool CDriverGL::setDisplay(nlWindow wnd, const GfxMode &mode, bool show, bool re
// Offscreen mode ? // Offscreen mode ?
if (_CurrentMode.OffScreen) if (_CurrentMode.OffScreen)
{ {
if (!createWindow(mode)) if (!createWindow(mode)) return false;
return false;
HWND tmpHWND = _win; HWND tmpHWND = _win;
int width = mode.Width; int width = mode.Width;
int height = mode.Height; int height = mode.Height;

2
code/ryzom/server/src/dynamic_scenario_service/service.cpp
View file

@ -56,8 +56,6 @@ namespace R2
// The ligo config // The ligo config
NLLIGO::CLigoConfig* LigoConfigPtr; NLLIGO::CLigoConfig* LigoConfigPtr;
CR2LigoConfig R2LigoConfig; CR2LigoConfig R2LigoConfig;
} }

1
code/ryzom/server/src/entities_game_service/progression/progression_pve.h
View file

@ -279,7 +279,6 @@ struct CCreatureTakenDamage
{ {
if ( PlayerInflictedDamage[i].TotalDamage > maxDmg ) if ( PlayerInflictedDamage[i].TotalDamage > maxDmg )
{ {
nlinfo("set damage by player");
maxDmg = PlayerInflictedDamage[i].TotalDamage; maxDmg = PlayerInflictedDamage[i].TotalDamage;
index = (sint16)i; index = (sint16)i;
} }

2
code/ryzom/server/src/shard_unifier_service/nel_database_mapping.h
View file

@ -625,7 +625,7 @@ namespace RSMGR
}; };
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
// WARNING : this is a generated file, don't change it ! // WARNING : this is a generated file, don't change it !
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
class CNelPermission class CNelPermission