From 2228979cd1e30883655e5af1c6088a237af706f7 Mon Sep 17 00:00:00 2001
From: root <root@dev.notadam.me>
Date: Wed, 26 Sep 2018 03:32:43 -0400
Subject: [PATCH] Fixed a couple compiler warnings

---
 src/common/Database/DbConnection.cpp          | 2 +-
 src/servers/sapphire_zone/Actor/BNpc.cpp      | 2 +-
 src/servers/sapphire_zone/Actor/BNpc.h        | 2 +-
 src/servers/sapphire_zone/Actor/Chara.cpp     | 5 +++--
 src/servers/sapphire_zone/Actor/PlayerSql.cpp | 3 ++-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/common/Database/DbConnection.cpp b/src/common/Database/DbConnection.cpp
index 3eb7a4d5..7a27717c 100644
--- a/src/common/Database/DbConnection.cpp
+++ b/src/common/Database/DbConnection.cpp
@@ -207,7 +207,7 @@ boost::shared_ptr< Mysql::PreparedStatement > Core::Db::DbConnection::getPrepare
   assert( index < m_stmts.size() );
   auto ret = m_stmts[ index ];
   if( !ret )
-    nullptr;
+    return nullptr;
 
   return ret;
 }
diff --git a/src/servers/sapphire_zone/Actor/BNpc.cpp b/src/servers/sapphire_zone/Actor/BNpc.cpp
index 2461088e..b712ac55 100644
--- a/src/servers/sapphire_zone/Actor/BNpc.cpp
+++ b/src/servers/sapphire_zone/Actor/BNpc.cpp
@@ -118,4 +118,4 @@ uint32_t Core::Entity::BNpc::getBNpcNameId() const
 void Core::Entity::BNpc::spawn( PlayerPtr pTarget )
 {
   pTarget->queuePacket( boost::make_shared< NpcSpawnPacket >( *getAsBNpc(), *pTarget ) );
-}
\ No newline at end of file
+}
diff --git a/src/servers/sapphire_zone/Actor/BNpc.h b/src/servers/sapphire_zone/Actor/BNpc.h
index b5ef8bcd..c1679887 100644
--- a/src/servers/sapphire_zone/Actor/BNpc.h
+++ b/src/servers/sapphire_zone/Actor/BNpc.h
@@ -31,7 +31,7 @@ public:
   void spawn( PlayerPtr pTarget ) override;
 
   uint16_t getModelChara() const;
-  uint8_t getLevel() const;
+  uint8_t getLevel() const override;
 
   uint32_t getBNpcBaseId() const;
   uint32_t getBNpcNameId() const;
diff --git a/src/servers/sapphire_zone/Actor/Chara.cpp b/src/servers/sapphire_zone/Actor/Chara.cpp
index 8d416786..7e3165c9 100644
--- a/src/servers/sapphire_zone/Actor/Chara.cpp
+++ b/src/servers/sapphire_zone/Actor/Chara.cpp
@@ -458,7 +458,8 @@ void Core::Entity::Chara::handleScriptSkill( uint32_t type, uint16_t actionId, u
 
       effectPacket->addEffect( effectEntry );
 
-      if( actionInfoPtr->castType == 1 && actionInfoPtr->effectRange != 0 || actionInfoPtr->castType != 1 )
+      if( ( actionInfoPtr->castType == 1 && actionInfoPtr->effectRange != 0 ) ||
+	  ( actionInfoPtr->castType != 1 ) )
       {
         // If action on this specific target is valid...
         if( isPlayer() && !ActionCollision::isActorApplicable( target, TargetFilter::Enemies ) )
@@ -518,7 +519,7 @@ void Core::Entity::Chara::handleScriptSkill( uint32_t type, uint16_t actionId, u
 
       effectPacket->addEffect( effectEntry );
 
-      if( actionInfoPtr->castType == 1 && actionInfoPtr->effectRange != 0 || actionInfoPtr->castType != 1 )
+      if( ( actionInfoPtr->castType == 1 && actionInfoPtr->effectRange != 0 ) || actionInfoPtr->castType != 1 )
       {
         if( isPlayer() && !ActionCollision::isActorApplicable( target, TargetFilter::Allies ) )
           break;
diff --git a/src/servers/sapphire_zone/Actor/PlayerSql.cpp b/src/servers/sapphire_zone/Actor/PlayerSql.cpp
index 55214b4c..5c06b8c4 100644
--- a/src/servers/sapphire_zone/Actor/PlayerSql.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerSql.cpp
@@ -313,6 +313,7 @@ bool Core::Entity::Player::loadSearchInfo()
 
   // todo: internally use an std::string instead of a char[]
   auto searchMessage = res->getString( 4 );
+  memset( m_searchMessage, 0, sizeof( m_searchMessage ) );
   std::copy( searchMessage.begin(), searchMessage.end(), m_searchMessage );
 
   return true;
@@ -501,7 +502,7 @@ void Core::Entity::Player::updateDbSearchInfo() const
   pDb->execute( stmtS1 );
 
   auto stmtS2 = pDb->getPreparedStatement( Db::CHARA_SEARCHINFO_UP_SEARCHCOMMENT );
-  stmtS2->setString( 1, string( m_searchMessage != nullptr ? m_searchMessage : "" ) );
+  stmtS2->setString( 1, string( m_searchMessage ) );
   stmtS2->setInt( 2, m_id );
   pDb->execute( stmtS2 );
 }