mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-22 20:41:26 +00:00
Code Issues Releases Activity

Update to 1.3.12.

Browse Source
This commit is contained in:
Maxim Sobolev 2001-03-10 15:11:41 +00:00
parent b00ce03804
commit 0267b6b98c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=39429
8 changed files with 36 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
games/asc/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= asc
PORTVERSION= 1.3.8
PORTVERSION= 1.3.12
CATEGORIES= games
MASTER_SITES= ftp://asc-hq.sourceforge.net/pub/asc-hq/develop/ \
ftp://asc-hq.sourceforge.net/pub/asc-hq/ \

4
games/asc/distinfo
View File

@ -1,2 +1,2 @@
MD5 (asc-1.3.8-beta.src.tar.gz) = 00cb3bdb3f68b6c357d7667f0f55e146
MD5 (main.con) = 2b4a443d138fc5ae02498f47b603f464
MD5 (asc-1.3.12-beta.src.tar.gz) = 9663bd7a9d1b6533551fb0fc0e10cea8
MD5 (main.con) = c9fee6c3e554742612dbeb02fd0700e3

24
games/asc/files/patch-source::controls.cpp
View File

@ -1,24 +0,0 @@
$FreeBSD$
--- source/controls.cpp 2001/02/17 15:52:35 1.1
+++ source/controls.cpp 2001/02/17 15:54:41
@@ -3039,7 +3039,7 @@
displaymessage("no human players found !", 1 );
delete actmap;
actmap = NULL;
- throw NoMapLoaded();
+ goto except1;
}
} while ( actmap->player[actmap->actplayer].stat != ps_human ); /* enddo */
@@ -3048,6 +3048,9 @@
if (bb)
cursor.display();
+
+except1:
+ throw NoMapLoaded();
}
void initNetworkGame ( void )

100
games/asc/files/patch-source::gamedlg.cpp
View File

@ -1,100 +0,0 @@
$FreeBSD$
--- source/gamedlg.cpp 2001/02/17 16:01:39 1.1
+++ source/gamedlg.cpp 2001/02/17 16:06:51
@@ -1233,7 +1233,7 @@
displaymessage("no human players found !", 1 );
delete actmap;
actmap = NULL;
- throw NoMapLoaded();
+ goto except1;
}
} while ( actmap->player[actmap->actplayer].stat != ps_human ); /* enddo */
@@ -1242,26 +1242,29 @@
catch ( InvalidID err ) {
displaymessage( err.getMessage().c_str(), 1 );
if ( !actmap || actmap->xsize <= 0)
- throw NoMapLoaded();
+ goto except1;
} /* endcatch */
catch ( tinvalidversion err ) {
displaymessage( "File %s has invalid version.\nExpected version %d\nFound version %d\n", 1, err.filename, err.expected, err.found );
if ( !actmap || actmap->xsize <= 0)
- throw NoMapLoaded();
+ goto except1;
} /* endcatch */
catch ( tfileerror err) {
displaymessage( "error reading map filename %s ", 1, err.filename );
if ( !actmap || actmap->xsize <= 0)
- throw NoMapLoaded();
+ goto except1;
} /* endcatch */
catch ( ASCexception ) {
displaymessage( "error loading map", 1 );
if ( !actmap || actmap->xsize <= 0)
- throw NoMapLoaded();
+ goto except1;
} /* endcatch */
removemessage();
+ return;
+except1:
+ throw NoMapLoaded();
}
@@ -1722,7 +1725,7 @@
displaymessage ( "no human players found !", 1 );
delete actmap;
actmap = NULL;
- throw NoMapLoaded();
+ goto except1;
}
if ( human > 1 )
@@ -1743,7 +1746,7 @@
displaymessage("no human players found !", 1 );
delete actmap;
actmap = NULL;
- throw NoMapLoaded();
+ goto except1;
}
} while ( actmap->player[actmap->actplayer].stat != ps_human ); /* enddo */
@@ -1752,25 +1755,29 @@
catch ( InvalidID err ) {
displaymessage( err.getMessage().c_str(), 1 );
if ( !actmap || actmap->xsize <= 0)
- throw NoMapLoaded();
+ goto except1;
} /* endcatch */
catch ( tinvalidversion err ) {
displaymessage( "File %s has invalid version.\nExpected version %d\nFound version %d\n", 1, err.filename, err.expected, err.found );
if ( !actmap || actmap->xsize <= 0)
- throw NoMapLoaded();
+ goto except1;
} /* endcatch */
catch ( tfileerror err) {
displaymessage( "error reading map filename %s ", 1, err.filename );
if ( !actmap || actmap->xsize <= 0)
- throw NoMapLoaded();
+ goto except1;
} /* endcatch */
catch ( ASCexception ) {
displaymessage( "error loading map", 1 );
if ( !actmap || actmap->xsize <= 0)
- throw NoMapLoaded();
+ goto except1;
} /* endcatch */
}
+ return;
+
+except1:
+ throw NoMapLoaded();
}

8
games/asc/files/patch-source::mapedit::Makefile.in
View File

@ -1,16 +1,16 @@
$FreeBSD$
--- source/mapedit/Makefile.in.orig Mon Jan 29 01:11:06 2001
+++ source/mapedit/Makefile.in Sat Feb 17 18:19:08 2001
--- source/mapedit/Makefile.in.orig Mon Feb 26 14:37:52 2001
+++ source/mapedit/Makefile.in Sat Mar 10 15:32:13 2001
@@ -76,10 +76,10 @@
bin_PROGRAMS = ascmapedit ascmap2pcx
ascmapedit_SOURCES = edevents.cpp edgen.cpp edglobal.cpp edmain.cpp edselfnt.cpp edmisc.cpp weather.cpp typen.cpp strtmesg.cpp stack.cpp spfst.cpp sgstream.cpp pd.cpp palette.cpp newfont.cpp misc.cpp loadpcxc.cpp loaders.cpp loadbi3.cpp dlg_box.cpp dialog.cpp basestrm.cpp basegfx.cpp attack.cpp CLoadable.cpp Property.cpp PropertyGroup.cpp gameoptions.cpp Named.cpp buildingtype.cpp vehicletype.cpp containerbase.cpp mapalgorithms.cpp viewcalculation.cpp gamemap.cpp password.cpp password_dialog.cpp research.cpp mapdisplay.cpp ascstring.cpp graphicset.cpp
ascmapedit_SOURCES = edevents.cpp edgen.cpp edglobal.cpp edmain.cpp edselfnt.cpp edmisc.cpp weather.cpp typen.cpp strtmesg.cpp stack.cpp spfst.cpp sgstream.cpp pd.cpp palette.cpp newfont.cpp misc.cpp loadpcxc.cpp loaders.cpp loadbi3.cpp dlg_box.cpp dialog.cpp basestrm.cpp basegfx.cpp attack.cpp CLoadable.cpp Property.cpp PropertyGroup.cpp gameoptions.cpp Named.cpp buildingtype.cpp vehicletype.cpp containerbase.cpp mapalgorithms.cpp viewcalculation.cpp gamemap.cpp password.cpp password_dialog.cpp research.cpp mapdisplay.cpp ascstring.cpp graphicset.cpp vehicle.cpp buildings.cpp networkdata.cpp
-ascmapedit_LDADD = ../sdl/libsdl.a ../libs/triangul/libtriangul.a -lSDL -lpthread @LDADDLIBBZ2@
+ascmapedit_LDADD = ../sdl/libsdl.a ../libs/triangul/libtriangul.a @LDADDLIBBZ2@
ascmap2pcx_SOURCES = map2pcx.cpp weather.cpp typen.cpp strtmesg.cpp stack.cpp spfst.cpp sgstream.cpp pd.cpp palette.cpp newfont.cpp misc.cpp loadpcxc.cpp loaders.cpp loadbi3.cpp dlg_box.cpp dialog.cpp basestrm.cpp basegfx.cpp attack.cpp CLoadable.cpp Property.cpp PropertyGroup.cpp gameoptions.cpp Named.cpp buildingtype.cpp vehicletype.cpp containerbase.cpp mapalgorithms.cpp viewcalculation.cpp gamemap.cpp password.cpp password_dialog.cpp research.cpp mapdisplay.cpp ascstring.cpp graphicset.cpp
ascmap2pcx_SOURCES = map2pcx.cpp weather.cpp typen.cpp strtmesg.cpp stack.cpp spfst.cpp sgstream.cpp pd.cpp palette.cpp newfont.cpp misc.cpp loadpcxc.cpp loaders.cpp loadbi3.cpp dlg_box.cpp dialog.cpp basestrm.cpp basegfx.cpp attack.cpp CLoadable.cpp Property.cpp PropertyGroup.cpp gameoptions.cpp Named.cpp buildingtype.cpp vehicletype.cpp containerbase.cpp mapalgorithms.cpp viewcalculation.cpp gamemap.cpp password.cpp password_dialog.cpp research.cpp mapdisplay.cpp ascstring.cpp graphicset.cpp vehicle.cpp buildings.cpp networkdata.cpp
-ascmap2pcx_LDADD = ../sdl/libsdl.a ../libs/triangul/libtriangul.a -lSDL -lpthread -lSDL_image @LDADDLIBBZ2@
+ascmap2pcx_LDADD = ../sdl/libsdl.a ../libs/triangul/libtriangul.a -lSDL_image @LDADDLIBBZ2@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

14
games/asc/files/patch-source::replay.cpp
View File

@ -1,14 +0,0 @@
$FreeBSD$
--- source/replay.cpp 2001/02/17 15:46:05 1.1
+++ source/replay.cpp 2001/02/17 15:49:13
@@ -22,6 +22,8 @@
* *
***************************************************************************/
+#include <stdarg.h>
+
#include "replay.h"
#include "typen.h"
#include "buildingtype.h"

33
games/asc/files/patch-source::tools::linux::Makefile.in
View File

@ -1,16 +1,31 @@
$FreeBSD$
--- source/tools/linux/Makefile.in 2001/02/17 15:22:10 1.1
+++ source/tools/linux/Makefile.in 2001/02/17 15:22:33
@@ -79,8 +79,8 @@
--- source/tools/linux/Makefile.in 2001/03/10 14:10:17 1.1
+++ source/tools/linux/Makefile.in 2001/03/10 14:19:07
@@ -81,11 +81,11 @@
asc_makegfx_SOURCES = makegfx.cpp basestrm.cpp misc.cpp ascstring.cpp loadpcxc.cpp palette.cpp sgstream.cpp newfont.cpp basegfx.cpp graphicset.cpp gameoptions.cpp CLoadable.cpp Named.cpp Property.cpp PropertyGroup.cpp stack.cpp buildingtype.cpp typen.cpp vehicletype.cpp password.cpp
asc_mntgraph_SOURCES = mntgraph.cpp basestrm.cpp misc.cpp ascstring.cpp loadpcxc.cpp palette.cpp sgstream.cpp newfont.cpp basegfx.cpp graphicset.cpp gameoptions.cpp CLoadable.cpp Named.cpp Property.cpp PropertyGroup.cpp stack.cpp buildingtype.cpp typen.cpp vehicletype.cpp password.cpp
ascmount_SOURCES = mount.cpp basestrm.cpp misc.cpp ascstring.cpp
-ascmount_LDADD = -lSDL -lpthread @LDADDLIBBZ2@
-ascdemount_LDADD = -lSDL -lpthread @LDADDLIBBZ2@
+ascmount_LDADD = @LDADDLIBBZ2@
+ascdemount_LDADD = @LDADDLIBBZ2@
-asc_mount_LDADD = -lSDL -lpthread @LDADDLIBBZ2@
-asc_demount_LDADD = -lSDL -lpthread @LDADDLIBBZ2@
-asc_gfx2pcx_LDADD = ../../sdl/libsdl.a -lSDL -lpthread @LDADDLIBBZ2@
-asc_makegfx_LDADD = ../../sdl/libsdl.a -lSDL -lpthread @LDADDLIBBZ2@
-asc_mntgraph_LDADD = ../../sdl/libsdl.a -lSDL -lpthread @LDADDLIBBZ2@
+asc_mount_LDADD = @LDADDLIBBZ2@
+asc_demount_LDADD = @LDADDLIBBZ2@
+asc_gfx2pcx_LDADD = ../../sdl/libsdl.a @LDADDLIBBZ2@
+asc_makegfx_LDADD = ../../sdl/libsdl.a @LDADDLIBBZ2@
+asc_mntgraph_LDADD = ../../sdl/libsdl.a @LDADDLIBBZ2@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../../config.h
CONFIG_CLEAN_FILES =
@@ -93,7 +93,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I../../..
-CPPFLAGS = @CPPFLAGS@
+CPPFLAGS = @CPPFLAGS@ -DPREFIX=\"$(prefix)\"
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
asc_demount_OBJECTS = demount.o basestrm.o misc.o ascstring.o

7
games/asc/pkg-plist
View File

@ -1,7 +1,10 @@
bin/asc
bin/ascdemount
bin/asc_demount
bin/asc_gfx2pcx
bin/asc_makegfx
bin/asc_mntgraph
bin/asc_mount
bin/ascmap2pcx
bin/ascmapedit
bin/ascmount
share/asc/main.con
@dirrm share/asc