Merge lp:~amdmi3/stratagus/cxx11-narrowing into lp:stratagus

[Dmitry Marakasov]

[Kyran Jackson (erstmap)]

Hell yeah, this was causing strife for me yesterday!

Unmerged revisions

9013. By Dmitry Marakasov on 2015-05-14

Fix c++11 narrowing error

src/video/mng.cpp:301:20: error: non-constant-expression cannot be narrowed from type 'int' to 'Sint16' (aka 'short') in initializer list [-Wc++11-narrowing]
                    SDL_Rect rect = {x, y, surface->w, surface->h};
                                     ^

=== modified file 'src/video/mng.cpp'
--- src/video/mng.cpp	2013-10-29 13:24:42 +0000
+++ src/video/mng.cpp	2015-05-14 00:35:42 +0000
@@ -298,7 +298,7 @@
 	} else
 #endif
 	{
-		SDL_Rect rect = {x, y, surface->w, surface->h};
+		SDL_Rect rect = {(Sint16)x, (Sint16)y, (Uint16)surface->w, (Uint16)surface->h};
 		SDL_BlitSurface(surface, NULL, TheScreen, &rect);
 	}
 }