Browse Source

Some changes to compile again with gcc

Vadim Glazunov 17 years ago
parent
commit
4edd375ddb
3 changed files with 4 additions and 3 deletions
  1. 2 1
      CBattleInterface.cpp
  2. 0 1
      client/Makefile.am
  3. 2 1
      lib/Makefile.am

+ 2 - 1
CBattleInterface.cpp

@@ -879,7 +879,8 @@ void CBattleInterface::battleFinished(const BattleResult& br)
 {
 	deactivate();
 
-	resWindow = new CBattleReslutWindow(br, genRect(561, 470, 165, 19), this);
+	SDL_Rect temp_rect = genRect(561, 470, 165, 19);
+	resWindow = new CBattleReslutWindow(br, temp_rect, this);
 	resWindow->activate();
 }
 

+ 0 - 1
client/Makefile.am

@@ -32,7 +32,6 @@ vcmiclient_SOURCES =  \
 ../CPreGame.cpp \
 ../hch/CPreGameTextHandler.cpp \
 ../hch/CSndHandler.cpp \
-../hch/CSpellHandler.cpp \
 ../CThreadHelper.cpp \
 ./Graphics.cpp \
 ../mapHandler.cpp \

+ 2 - 1
lib/Makefile.am

@@ -29,4 +29,5 @@ libvcmi_a_SOURCES = \
 ../hch/CTownHandler.h \
 ../map.h \
 ./NetPacks.h \
-./VCMI_Lib.h
+./VCMI_Lib.h \
+../hch/CSpellHandler.cpp