diff --git a/trunk/lib/warmux/action/action.cpp b/trunk/lib/warmux/action/action.cpp index af7c622c..f73a3d53 100755 --- a/trunk/lib/warmux/action/action.cpp +++ b/trunk/lib/warmux/action/action.cpp @@ -85,7 +85,7 @@ Action::Action(const char *buffer, DistantComputer* _creator) { m_creator = _creator; - m_header.len = SDLNet_Read32(buffer); + m_header.len = SDLNet_Read32((Uint32*)buffer); ASSERT(m_header.len >= sizeof(Header)); buffer += 4; // All of the following could be skipped for the actions we now, diff --git a/trunk/src/graphic/surface.cpp b/trunk/src/graphic/surface.cpp index 34526656..a7246b5d 100755 --- a/trunk/src/graphic/surface.cpp +++ b/trunk/src/graphic/surface.cpp @@ -613,7 +613,7 @@ bool Surface::ImgSave(const std::string& filename, bool bmp) png_set_IHDR(png_ptr, info_ptr, surface->w, surface->h, 8, PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); - png_set_compression_level(png_ptr, Z_BEST_COMPRESSION); + png_set_compression_level(png_ptr, PNG_Z_DEFAULT_COMPRESSION); // Creating the png file png_write_info(png_ptr, info_ptr); diff --git a/trunk/src/interface/weapon_menu.cpp b/trunk/src/interface/weapon_menu.cpp index 0a422821..93d9c063 100755 --- a/trunk/src/interface/weapon_menu.cpp +++ b/trunk/src/interface/weapon_menu.cpp @@ -395,7 +395,7 @@ void WeaponsMenu::Draw() Weapon * WeaponsMenu::UpdateCurrentOverflyItem(const Polygon * poly) { if (!show) - return false; + return NULL; const std::vector& items = poly->GetItem(); WeaponMenuItem * tmp; Interface::GetInstance()->SetCurrentOverflyWeapon(NULL); diff --git a/trunk/tools/list_games/main.cpp b/trunk/tools/list_games/main.cpp index 556b7f2f..145beda6 100755 --- a/trunk/tools/list_games/main.cpp +++ b/trunk/tools/list_games/main.cpp @@ -1,3 +1,4 @@ +#include #include #include #include