svn commit: r467278 - in branches/2018Q2/games/openbor: . files

[Jan Beich]

Author: jbeich
Date: Fri Apr 13 23:26:03 2018
New Revision: 467278
URL: https://svnweb.freebsd.org/changeset/ports/467278

Log:
  MFH: r466272 r467277
  
  games/openbor: update to 4942
  
  Changes:	https://github.com/DCurrent/openbor/compare/57735a1...449e528
  Approved by:	ports-secteam (feld, implicit for snapshots)

Modified:
  branches/2018Q2/games/openbor/Makefile
  branches/2018Q2/games/openbor/distinfo
  branches/2018Q2/games/openbor/files/patch-openbor.c
Directory Properties:
  branches/2018Q2/   (props changed)

Modified: branches/2018Q2/games/openbor/Makefile
==============================================================================
--- branches/2018Q2/games/openbor/Makefile	Fri Apr 13 23:19:48 2018	(r467277)
+++ branches/2018Q2/games/openbor/Makefile	Fri Apr 13 23:26:03 2018	(r467278)
@@ -2,7 +2,7 @@
 
 PORTNAME=	openbor
 # Hint: svn revision is git rev-list --count ${GH_TAGNAME}
-PORTVERSION?=	4628
+PORTVERSION?=	4942
 .ifndef PKGNAMESUFFIX
 PORTREVISION=	0
 .endif
@@ -31,7 +31,7 @@ PORTSCOUT=	ignore:1
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	DCurrent
-GH_TAGNAME?=	57735a1
+GH_TAGNAME?=	449e528
 
 USES+=		gmake pkgconfig
 .if ${PORTVERSION} < 4433

Modified: branches/2018Q2/games/openbor/distinfo
==============================================================================
--- branches/2018Q2/games/openbor/distinfo	Fri Apr 13 23:19:48 2018	(r467277)
+++ branches/2018Q2/games/openbor/distinfo	Fri Apr 13 23:26:03 2018	(r467278)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522051052
-SHA256 (DCurrent-openbor-4628-57735a1_GH0.tar.gz) = e69dd27919b2d2a1870a843e7ebddf990a30f7130ba57c794780bb5a8f808178
-SIZE (DCurrent-openbor-4628-57735a1_GH0.tar.gz) = 108091683
+TIMESTAMP = 1523558034
+SHA256 (DCurrent-openbor-4942-449e528_GH0.tar.gz) = 9df2913c18349c78d7e5c57b9f276cd21e40ddd50c5b667f460c0dd19056b3ad
+SIZE (DCurrent-openbor-4942-449e528_GH0.tar.gz) = 108236606

Modified: branches/2018Q2/games/openbor/files/patch-openbor.c
==============================================================================
--- branches/2018Q2/games/openbor/files/patch-openbor.c	Fri Apr 13 23:19:48 2018	(r467277)
+++ branches/2018Q2/games/openbor/files/patch-openbor.c	Fri Apr 13 23:26:03 2018	(r467278)
@@ -1,6 +1,5 @@
 Fix potential crashes found by ASan/Clang/GCC
 Fix an infinite loop in lcmScriptDeleteMain()
-Avoid accidental rounding from abs()
 
 --- openbor.c.orig	2017-04-22 14:20:08 UTC
 +++ openbor.c
@@ -64,23 +63,3 @@ Avoid accidental rounding from abs()
      if (value > maxvalue)
      {
          value = maxvalue;
-@@ -21710,8 +21716,8 @@ int reset_backpain(entity *ent)
-         if (ent->normaldamageflipdir == DIRECTION_RIGHT) ent->direction = DIRECTION_RIGHT;
-         else ent->direction = DIRECTION_LEFT;
- 
--        if(ent->direction == DIRECTION_RIGHT) ent->velocity.x = -1*abs(ent->velocity.x);
--        else ent->velocity.x = abs(ent->velocity.x);
-+        if(ent->direction == DIRECTION_RIGHT) ent->velocity.x = -1*ABS(ent->velocity.x);
-+        else ent->velocity.x = ABS(ent->velocity.x);
- 
-         return 1;
-     }
-@@ -25831,7 +25837,7 @@ int common_try_wander(entity *target, in
-         mod = -mod;
-     }
-     //if ((self->sortid / 100) % 2)
--    if (abs(rand32()) % 2)
-+    if (rand32() % 2)
-     {
-         mod = 3 - mod;
-     }