cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to armagetronad-0.2.8.3.5

Browse Source 
It is a bugfix release; one of our patches goes away.
This commit is contained in:
bcallah 2020-02-22 19:56:05 +00:00
parent 3b2b8992f5
commit 4ba49f7b96
3 changed files with 4 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
games/armagetronad/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.14 2019/08/04 02:47:10 bcallah Exp $
# $OpenBSD: Makefile,v 1.15 2020/02/22 19:56:05 bcallah Exp $
COMMENT = 3D light cycle game
DISTNAME = armagetronad-0.2.8.3.4.src
DISTNAME = armagetronad-0.2.8.3.5.src
PKGNAME = ${DISTNAME:S/.src//}
REVISION = 3
CATEGORIES = games

4
games/armagetronad/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (armagetronad-0.2.8.3.4.src.tar.gz) = RGr1fGFO0otKodWg2BjJ1npiG/eDK5J2wwKcD1AG/t0=
SIZE (armagetronad-0.2.8.3.4.src.tar.gz) = 2217387
SHA256 (armagetronad-0.2.8.3.5.src.tar.gz) = tMmTVYwIgGxA48cJVDdFH/6bw9P4wDEOWMUKgRU0Rvw=
SIZE (armagetronad-0.2.8.3.5.src.tar.gz) = 2096771

30
games/armagetronad/patches/patch-src_tron_gCycle_cpp
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-src_tron_gCycle_cpp,v 1.1 2019/08/04 02:47:10 bcallah Exp $
https://svnweb.freebsd.org/ports/head/games/armagetronad/files/patch-src_tron_gCycle.cpp?revision=507190&view=co
This is a fix for a bug in how std::autoptr is handled.
clang complains:
gCycle.cpp:*:*: warning: reference cannot be bound to dereferenced null pointer in well-defined C++ code; pointer may be assumed to always convert to true
[-Wundefined-bool-conversion]
Index: src/tron/gCycle.cpp
--- src/tron/gCycle.cpp.orig
+++ src/tron/gCycle.cpp
@@ -620,7 +620,7 @@ class Sensor: public gSensor
tASSERT( cycle );
// create
- if ( &(*cycle->chatBot_) == 0 )
+ if ( cycle->chatBot_.get() == 0 )
cycle->chatBot_ = std::auto_ptr< gCycleChatBot >( new gCycleChatBot( cycle ) );
return *cycle->chatBot_;
@@ -2712,7 +2712,7 @@ bool gCycle::Timestep(REAL currentTime){
gCycleChatBot & bot = gCycleChatBot::Get( this );
bot.Activate( currentTime );
}
- else if ( &(*chatBot_) )
+ else if ( chatBot_.get() )
{
chatBot_->nextChatAI_ = 0;
}