Permalink
Browse files

Merge branch 'master' into json

  • Loading branch information...
KevinEady committed Jan 7, 2018
2 parents 978cfe1 + 74a9b20 commit de8be2c08ed4fb576ce3499824c87eabde1f8524
Showing with 6 additions and 4 deletions.
  1. +1 −0 .travis.yml
  2. +0 −1 appveyor.yml
  3. +2 −1 pol-core/bin-build/.gitignore
  4. +2 −2 pol-core/bscript/object.cpp
  5. +1 −0 pol-core/pol/uoscrobj.cpp
View
@@ -5,6 +5,7 @@ sudo: false
cache:
directories:
- lib/curl
- lib/boost_1_63_0
git:
depth: 1
View
@@ -28,6 +28,5 @@ notifications:
- provider: Email
to:
- polteam@polserver.com
on_build_success: true
on_build_failure: true
on_build_status_changed: true
@@ -1,5 +1,6 @@
/CMakeFiles
/lib
/lib*
/pol-core
/*.tar.gz
/compile_commands.json
@@ -1807,13 +1807,13 @@ BObjectImp* BBoolean::unpack( std::istream& is )
void BBoolean::packonto( std::ostream& os ) const
{
os << "b" << bval_ ? 1 : 0;
os << "b" << ( bval_ ? 1 : 0 );
}
std::string BBoolean::pack() const
{
OSTRINGSTREAM os;
os << "b" << bval_ ? 1 : 0;
os << "b" << ( bval_ ? 1 : 0 );
return OSTRINGSTREAM_STR( os );
}
@@ -2045,6 +2045,7 @@ BObjectImp* Character::get_script_member_id( const int id ) const
lastcoord->addMember( "lastz", new BLong( lastz ) );
return lastcoord.release();
}
break;
case MBR_ACTIVE_SKILL:
return new BLong( skill_ex_active() );
case MBR_CASTING_SPELL:

0 comments on commit de8be2c

Please sign in to comment.