浏览代码

* fixed some warnings

mateuszb 15 年之前
父节点
当前提交
34c58bc966
共有 2 个文件被更改,包括 7 次插入1 次删除
  1. 4 0
      client/GUIClasses.cpp
  2. 3 1
      server/CGameHandler.cpp

+ 4 - 0
client/GUIClasses.cpp

@@ -2910,6 +2910,8 @@ std::string CTradeWindow::CTradeableItem::getName(int number /*= -1*/) const
 	case ARTIFACT:
 		return CGI->arth->artifacts[id]->Name();
 	}
+	assert(0);
+	return "";
 }
 
 CTradeWindow::CTradeWindow(const IMarket *Market, const CGHeroInstance *Hero, EMarketMode Mode)
@@ -6259,6 +6261,8 @@ std::string CHillFortWindow::getDefForSlot(int slot)
 			case  1: return "APHLF1Y.DEF";
 			case  2: return "APHLF1G.DEF";
 		}
+	assert(0);
+	return "";
 }
 
 std::string CHillFortWindow::getTextForSlot(int slot)

+ 3 - 1
server/CGameHandler.cpp

@@ -3242,6 +3242,7 @@ bool CGameHandler::buyArtifact(const IMarket *m, const CGHeroInstance *h, int ri
 	sendAndApply(&saa);
 
 	giveHeroArtifact(aid, h->id, -2);
+	return true;
 }
 
 bool CGameHandler::buySecSkill( const IMarket *m, const CGHeroInstance *h, int skill)
@@ -3270,7 +3271,8 @@ bool CGameHandler::buySecSkill( const IMarket *m, const CGHeroInstance *h, int s
 	sr.val = getResource(h->tempOwner, 6) - 2000;
 	sendAndApply(&sr);
 
-	changeSecSkill(h->id, skill, 1, true); 
+	changeSecSkill(h->id, skill, 1, true);
+	return true;
 }
 
 bool CGameHandler::tradeResources(const IMarket *market, ui32 val, ui8 player, ui32 id1, ui32 id2)