clang6 games/warmux

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

clang6 games/warmux

Alexander Bluhm
Hi,

This fixes warmux build with clang6 on amd64.

interface/weapon_menu.cpp:394:12: error: cannot initialize return object of type
      'Weapon *' with an rvalue of type 'bool'
    return false;
           ^~~~~
map/tile.cpp:676:30: error: non-constant-expression cannot be narrowed from type
      'uint' (aka 'unsigned int') to 'uint16_t' (aka 'unsigned short') in
      initializer list [-Wc++11-narrowing]
      SynchTileInfo info = { i, t->GetSynchsum() };

ok?

bluhm

Index: games/warmux/Makefile
===================================================================
RCS file: /data/mirror/openbsd/cvs/ports/games/warmux/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- games/warmux/Makefile 25 Sep 2017 14:33:14 -0000 1.13
+++ games/warmux/Makefile 15 Apr 2018 21:19:01 -0000
@@ -3,7 +3,7 @@
 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
 
Index: games/warmux/patches/patch-src_interface_weapon_menu_cpp
===================================================================
RCS file: games/warmux/patches/patch-src_interface_weapon_menu_cpp
diff -N games/warmux/patches/patch-src_interface_weapon_menu_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ games/warmux/patches/patch-src_interface_weapon_menu_cpp 15 Apr 2018 21:16:30 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+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);
Index: games/warmux/patches/patch-src_map_tile_h
===================================================================
RCS file: games/warmux/patches/patch-src_map_tile_h
diff -N games/warmux/patches/patch-src_map_tile_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ games/warmux/patches/patch-src_map_tile_h 15 Apr 2018 21:16:32 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+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;
+