mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-20 06:06:13 +00:00
Merge
This commit is contained in:
commit
a9f34d1e8c
9 changed files with 10 additions and 11 deletions
|
@ -226,6 +226,7 @@ public:
|
|||
|
||||
/// Returns the type of the atom. NULL otherwise.
|
||||
virtual const class UType *getType () = 0;
|
||||
|
||||
/// Return true if the element is an atom
|
||||
virtual bool isAtom () const = 0;
|
||||
|
||||
|
|
|
@ -66,7 +66,6 @@ template <class T> bool check (T value)
|
|||
|
||||
void checkInts ()
|
||||
{
|
||||
|
||||
checkInt (uint8, 0, 255, 1);
|
||||
checkInt (sint8, -128, 127, 1);
|
||||
|
||||
|
|
|
@ -8,7 +8,6 @@ ELSE(WITH_LUA51)
|
|||
ENDIF(WITH_LUA51)
|
||||
FIND_PACKAGE(Luabind REQUIRED)
|
||||
FIND_PACKAGE(CURL REQUIRED)
|
||||
FIND_PACKAGE(OpenSSL REQUIRED)
|
||||
FIND_PACKAGE(Libwww)
|
||||
FIND_PACKAGE(ZLIB)
|
||||
IF(NOT WIN32 AND NOT APPLE)
|
||||
|
@ -26,6 +25,7 @@ IF(NOT WIN32)
|
|||
ENDIF(NOT WIN32)
|
||||
|
||||
IF(WITH_STATIC)
|
||||
FIND_PACKAGE(OpenSSL)
|
||||
SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES})
|
||||
SET(CURL_DEFINITIONS -DCURL_STATICLIB)
|
||||
ENDIF(WITH_STATIC)
|
||||
|
|
|
@ -553,7 +553,7 @@ void CViewRenderer::drawQuad(sint layerId, const NLMISC::CQuadUV &quadUV, sint32
|
|||
{
|
||||
// Partially clipped (slowest case)
|
||||
// Must do the clip manually
|
||||
const uint maxNumCorners = 8;
|
||||
static const uint maxNumCorners = 8;
|
||||
//
|
||||
static CVector outPos0[maxNumCorners];
|
||||
static CUV outUV0[maxNumCorners];
|
||||
|
|
|
@ -612,4 +612,4 @@ private:
|
|||
|
||||
#endif // CL_PATCH_H
|
||||
|
||||
/* End of login_patch.h */
|
||||
/* End of login_patch.h */
|
||||
|
|
|
@ -494,7 +494,7 @@ TDataSetRow CMirrors::getDataSetRow( const NLMISC::CEntityId& 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 );
|
||||
// if ( value()==0 )
|
||||
|
|
|
@ -35,7 +35,7 @@ class CBasicEffect
|
|||
public:
|
||||
/// Constructor
|
||||
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;
|
||||
}
|
||||
|
|
|
@ -77,7 +77,7 @@ using namespace NLLIGO;
|
|||
|
||||
#define BAR_LENGTH 21
|
||||
|
||||
char *progressbar[BAR_LENGTH]=
|
||||
const char *progressbar[BAR_LENGTH]=
|
||||
{
|
||||
"[ ]",
|
||||
"[. ]",
|
||||
|
|
|
@ -14,7 +14,8 @@
|
|||
// 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/>.
|
||||
|
||||
/*#include "std_header.h"
|
||||
#if 0
|
||||
#include "std_header.h"
|
||||
//
|
||||
#include "village.h"
|
||||
#include "zone_util.h"
|
||||
|
@ -300,6 +301,4 @@ void CIGInfo::load(TShapeCache &shapeCache)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
*/
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue