MFH: r462552

games/openbor: update to 4604

Changes:	ab066c1...d73408f
Approved by:	ports-secteam (feld, implicit for snapshots)
This commit is contained in:
Jan Beich 2018-02-22 01:01:50 +00:00
parent 1c4ec9673a
commit 3d8e9f3fe5
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/branches/2018Q1/; revision=462557
4 changed files with 15 additions and 18 deletions

View file

@ -2,7 +2,7 @@
PORTNAME= openbor
# Hint: svn revision is git rev-list --count ${GH_TAGNAME}
PORTVERSION?= 4601
PORTVERSION?= 4604
.ifndef PKGNAMESUFFIX
PORTREVISION= 0
.endif
@ -31,7 +31,7 @@ PORTSCOUT= ignore:1
USE_GITHUB= yes
GH_ACCOUNT= DCurrent
GH_TAGNAME?= ab066c1
GH_TAGNAME?= d73408f
USES+= gmake pkgconfig
.if ${PORTVERSION} < 4433

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1519052570
SHA256 (DCurrent-openbor-4601-ab066c1_GH0.tar.gz) = 5ce8ce0d179d82716c5ca4ff4b0ff84a11ede9cf2cdcc62109f81a6c89a2b085
SIZE (DCurrent-openbor-4601-ab066c1_GH0.tar.gz) = 107146373
TIMESTAMP = 1519248328
SHA256 (DCurrent-openbor-4604-d73408f_GH0.tar.gz) = 1827f54f3340782ca11e3c17e3c6623f9fb88112db510e89db917909842de656
SIZE (DCurrent-openbor-4604-d73408f_GH0.tar.gz) = 107146873

View file

@ -1,4 +1,5 @@
Reset seek position for BGM with more than 128 tracks
Don't crash with more than 256 tracks.
--- source/gamelib/packfile.c.orig 2018-02-19 15:02:50 UTC
+++ source/gamelib/packfile.c
@ -11,3 +12,12 @@ Reset seek position for BGM with more than 128 tracks
filelist[i].nTracks = 0;
fd = fopen(packfile, "rb");
if(fd == NULL)
@@ -1440,7 +1440,7 @@ void packfile_music_read(fileliststruct *filelist, int
{
goto nextpak;
}
- if(filelist[i].nTracks < PACKFILE_PATH_MAX)
+ if(filelist[i].nTracks < 256)
{
packfile_get_titlename(pn.namebuf, filelist[i].bgmFileName[filelist[i].nTracks]);
filelist[i].bgmTracks[filelist[i].nTracks] = off;

View file

@ -1,13 +0,0 @@
Don't crash with > 80 tracks.
--- source/gamelib/packfile.h.orig 2015-04-18 21:22:03 UTC
+++ source/gamelib/packfile.h
@@ -42,7 +42,7 @@ typedef struct fileliststruct
{
char filename[128];
int nTracks;
- char bgmFileName[80][256];
+ char bgmFileName[256][80];
int bgmTrack;
unsigned int bgmTracks[256];
#ifdef SDL