浏览代码

* compile fixes & minor changes (I hope they are correct, SComponent::setSurface didn't return any value and failed to compile - I'm not sure if I return proper value).

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

+ 1 - 0
client/GUIClasses.cpp

@@ -944,6 +944,7 @@ SDL_Surface * SComponent::setSurface(std:: string defname, int imagepos)
 	img = def->ourImages[imagepos].bitmap;
 	img->refcount++;//to preserve surface whed def is deleted
 	delete def;
+	return img;
 }
 
 void SComponent::show(SDL_Surface * to)

+ 1 - 1
client/Graphics.h

@@ -1,7 +1,6 @@
 #ifndef __GRAPHICS_H__
 #define __GRAPHICS_H__
 
-#include <SDL_ttf.h>
 #include "../global.h"
 #include "FontBase.h"
 #include "GUIBase.h"
@@ -25,6 +24,7 @@ class CHeroClass;
 struct SDL_Color;
 struct InfoAboutHero;
 struct InfoAboutTown;
+typedef struct _TTF_Font TTF_Font; //from SDL_ttf.h
 
 class Graphics
 {

+ 1 - 1
server/CGameHandler.cpp

@@ -4409,7 +4409,7 @@ void CGameHandler::handleTownEvents(CGTownInstance * town, NewTurn &n)
 				{
 					int was = n.res[player][i];
 					n.res[player][i] += ev->resources[i];
-					n.res[player][i] = std::max(n.res[player][i], 0);
+					n.res[player][i] = std::max<si32>(n.res[player][i], 0);
 
 					if(pinfo->resources[i] != n.res[player][i]) //if non-zero res change
 						iw.components.push_back(Component(Component::RESOURCE,i,n.res[player][i]-was,0));