Digitalstack/SabrehavenServer
2
0
Fork 0
mirror of https://github.com/ErikasKontenis/SabrehavenServer.git synced 2025-05-01 18:19:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #44 from nekiro/some-fixes

Browse Source 
Fixing field bug and other small stuff
This commit is contained in:
Alejandro Mujica 2019-06-15 21:18:15 -04:00 committed by GitHub
commit 1da0571c79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/combat.cpp
View File

@ -179,7 +179,7 @@ ReturnValue Combat::canDoCombat(Creature* caster, Tile* tile, bool aggressive)
return RETURNVALUE_NOTENOUGHROOM; return RETURNVALUE_NOTENOUGHROOM;
}*/ }*/
if (tile->hasProperty(CONST_PROP_IMMOVABLEBLOCKPATH)) { if (tile->hasProperty(CONST_PROP_IMMOVABLEBLOCKPATH) && tile->hasProperty(CONST_PROP_IMMOVABLENOFIELDBLOCKPATH)) {
return RETURNVALUE_NOTENOUGHROOM; return RETURNVALUE_NOTENOUGHROOM;
} }

2
src/condition.cpp
View File

@ -756,7 +756,7 @@ bool ConditionSoul::setParam(ConditionParam_t param, int32_t value)
bool ConditionDamage::setParam(ConditionParam_t param, int32_t value) bool ConditionDamage::setParam(ConditionParam_t param, int32_t value)
{ {
bool ret = Condition::setParam(param, value); Condition::setParam(param, value);
switch (param) { switch (param) {
case CONDITION_PARAM_OWNER: case CONDITION_PARAM_OWNER:

1
src/definitions.h
View File

@ -57,6 +57,7 @@ static constexpr auto CLIENT_VERSION_STR = "7.72";
#pragma warning(disable:4267) // 'var' : conversion from 'size_t' to 'type', possible loss of data #pragma warning(disable:4267) // 'var' : conversion from 'size_t' to 'type', possible loss of data
#pragma warning(disable:4351) // new behavior: elements of array will be default initialized #pragma warning(disable:4351) // new behavior: elements of array will be default initialized
#pragma warning(disable:4458) // declaration hides class member #pragma warning(disable:4458) // declaration hides class member
#pragma warning(disable:4018) // signed/unsigned mismatch
#endif #endif
#define strcasecmp _stricmp #define strcasecmp _stricmp