Vadim Glazunov 17 年之前
父节点
当前提交
c00d0e4aca
共有 3 个文件被更改,包括 4 次插入2 次删除
  1. 2 1
      CBattleInterface.cpp
  2. 1 1
      hch/CDefHandler.cpp
  3. 1 0
      int3.h

+ 2 - 1
CBattleInterface.cpp

@@ -482,7 +482,8 @@ void CBattleInterface::bOptionsf()
 	CGI->curh->changeGraphic(0,0);
 	LOCPLINT->curint->deactivate();
 
-	CBattleOptionsWindow * optionsWin = new CBattleOptionsWindow(genRect(431, 481, 160, 84), this);
+	SDL_Rect temp_rect = genRect(431, 481, 160, 84);
+	CBattleOptionsWindow * optionsWin = new CBattleOptionsWindow(temp_rect, this);
 	optionsWin->activate();
 	LOCPLINT->objsToBlit.push_back(optionsWin);
 }

+ 1 - 1
hch/CDefHandler.cpp

@@ -190,7 +190,7 @@ unsigned char * CDefHandler::writeNormalNr (int nr, int bytCon)
 		if(ret!=NULL)
 			break;
 	}
-	long long amp = pow((float)256,bytCon-1);
+	long long amp = pow(256,bytCon-1);
 	for (int i=bytCon-1; i>=0;i--)
 	{
 		int test2 = nr/(amp);

+ 1 - 0
int3.h

@@ -2,6 +2,7 @@
 #define INT3_H
 #include <map>
 #include <vector>
+#include <cmath>
 class CCreature;
 class CCreatureSet //seven combined creatures
 {