diff --git a/CBattleInterface.cpp b/CBattleInterface.cpp index 4953235d5..6da76b7ed 100644 --- a/CBattleInterface.cpp +++ b/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); } diff --git a/hch/CDefHandler.cpp b/hch/CDefHandler.cpp index df5e44f95..679f718ea 100644 --- a/hch/CDefHandler.cpp +++ b/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); diff --git a/int3.h b/int3.h index 3a93418d3..6584105fe 100644 --- a/int3.h +++ b/int3.h @@ -2,6 +2,7 @@ #define INT3_H #include #include +#include class CCreature; class CCreatureSet //seven combined creatures {