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

Merge

Browse source
This commit is contained in:
vl 2010-09-24 11:26:41 +02:00
commit a9f34d1e8c
9 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/nel/include/nel/georges/u_form_elm.h
View file

@ -226,6 +226,7 @@ public:
/// Returns the type of the atom. NULL otherwise. /// Returns the type of the atom. NULL otherwise.
virtual const class UType *getType () = 0; virtual const class UType *getType () = 0;
/// Return true if the element is an atom /// Return true if the element is an atom
virtual bool isAtom () const = 0; virtual bool isAtom () const = 0;

1
code/nel/samples/misc/types_check/main.cpp
View file

@ -66,7 +66,6 @@ template <class T> bool check (T value)
void checkInts () void checkInts ()
{ {
checkInt (uint8, 0, 255, 1); checkInt (uint8, 0, 255, 1);
checkInt (sint8, -128, 127, 1); checkInt (sint8, -128, 127, 1);

2
code/ryzom/CMakeLists.txt
View file

@ -8,7 +8,6 @@ ELSE(WITH_LUA51)
ENDIF(WITH_LUA51) ENDIF(WITH_LUA51)
FIND_PACKAGE(Luabind REQUIRED) FIND_PACKAGE(Luabind REQUIRED)
FIND_PACKAGE(CURL REQUIRED) FIND_PACKAGE(CURL REQUIRED)
FIND_PACKAGE(OpenSSL REQUIRED)
FIND_PACKAGE(Libwww) FIND_PACKAGE(Libwww)
FIND_PACKAGE(ZLIB) FIND_PACKAGE(ZLIB)
IF(NOT WIN32 AND NOT APPLE) IF(NOT WIN32 AND NOT APPLE)
@ -26,6 +25,7 @@ IF(NOT WIN32)
ENDIF(NOT WIN32) ENDIF(NOT WIN32)
IF(WITH_STATIC) IF(WITH_STATIC)
FIND_PACKAGE(OpenSSL)
SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES}) SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES})
SET(CURL_DEFINITIONS -DCURL_STATICLIB) SET(CURL_DEFINITIONS -DCURL_STATICLIB)
ENDIF(WITH_STATIC) ENDIF(WITH_STATIC)

2
code/ryzom/client/src/interface_v3/view_renderer.cpp
View file

@ -553,7 +553,7 @@ void CViewRenderer::drawQuad(sint layerId, const NLMISC::CQuadUV &quadUV, sint32
{ {
// Partially clipped (slowest case) // Partially clipped (slowest case)
// Must do the clip manually // Must do the clip manually
const uint maxNumCorners = 8; static const uint maxNumCorners = 8;
// //
static CVector outPos0[maxNumCorners]; static CVector outPos0[maxNumCorners];
static CUV outUV0[maxNumCorners]; static CUV outUV0[maxNumCorners];

2
code/ryzom/server/src/ai_service/mirrors.cpp
View file

@ -494,7 +494,7 @@ TDataSetRow CMirrors::getDataSetRow( const NLMISC::CEntityId& entityId )
return DataSet->getDataSetRow( entityId ); return DataSet->getDataSetRow( entityId );
} }
const uint16 CMirrors::getTeamId(const TDataSetRow& entityIndex) uint16 CMirrors::getTeamId(const TDataSetRow& entityIndex)
{ {
CMirrorPropValueRO<TYPE_TEAM_ID> value( *DataSet, entityIndex, DSPropertyTEAM_ID ); CMirrorPropValueRO<TYPE_TEAM_ID> value( *DataSet, entityIndex, DSPropertyTEAM_ID );
// if ( value()==0 ) // if ( value()==0 )

2
code/ryzom/server/src/server_share/basic_effect.h
View file

@ -35,7 +35,7 @@ class CBasicEffect
public: public:
/// Constructor /// Constructor
CBasicEffect(EFFECT_FAMILIES::TEffectFamily family, const TDataSetRow & creatorId, const TDataSetRow & targetRowId) CBasicEffect(EFFECT_FAMILIES::TEffectFamily family, const TDataSetRow & creatorId, const TDataSetRow & targetRowId)
: _CreatorRowId(creatorId), _TargetRowId(targetRowId), _Family(family) : _CreatorRowId(creatorId), _TargetRowId(targetRowId), _Family(family), _EffectId(0)
{ {
_EffectId = ++_EffectCounter; _EffectId = ++_EffectCounter;
} }

2
code/ryzom/tools/leveldesign/prim_export/main.cpp
View file

@ -77,7 +77,7 @@ using namespace NLLIGO;
#define BAR_LENGTH 21 #define BAR_LENGTH 21
char *progressbar[BAR_LENGTH]= const char *progressbar[BAR_LENGTH]=
{ {
"[ ]", "[ ]",
"[. ]", "[. ]",

7
code/ryzom/tools/server/build_world_packed_col/village.cpp
View file

@ -14,7 +14,8 @@
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// 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 "std_header.h" #if 0
#include "std_header.h"
// //
#include "village.h" #include "village.h"
#include "zone_util.h" #include "zone_util.h"
@ -300,6 +301,4 @@ void CIGInfo::load(TShapeCache &shapeCache)
} }
} }
#endif
*/