Fix warmux build with clang6.

OK bcallah@
This commit is contained in:
bluhm 2018-04-16 00:06:19 +00:00
parent f98e884185
commit 1850d1a4e5
3 changed files with 31 additions and 2 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.13 2017/09/25 14:33:14 naddy Exp $
# $OpenBSD: Makefile,v 1.14 2018/04/16 00:06:19 bluhm Exp $
COMMENT= free software clone of Worms(R) game concept
DISTNAME= warmux-11.04.1
REVISION= 6
REVISION= 7
WRKDIST= ${WRKDIR}/warmux-11.04
CATEGORIES= games

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_interface_weapon_menu_cpp,v 1.1 2018/04/16 00:06:19 bluhm Exp $
Index: src/interface/weapon_menu.cpp
--- src/interface/weapon_menu.cpp.orig
+++ src/interface/weapon_menu.cpp
@@ -391,7 +391,7 @@ void WeaponsMenu::Draw()
Weapon * WeaponsMenu::UpdateCurrentOverflyItem(const Polygon * poly)
{
if (!show)
- return false;
+ return NULL;
const std::vector<PolygonItem *>& items = poly->GetItem();
WeaponMenuItem * tmp;
Interface::GetInstance()->SetCurrentOverflyWeapon(NULL);

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_map_tile_h,v 1.1 2018/04/16 00:06:19 bluhm Exp $
Index: src/map/tile.h
--- src/map/tile.h.orig
+++ src/map/tile.h
@@ -38,7 +38,8 @@ class Tile : public Rectanglei
public:
typedef struct
{
- uint16_t index, new_crc;
+ uint32_t index;
+ uint16_t new_crc;
} SynchTileInfo;
typedef std::vector<SynchTileInfo> SynchTileList;