Proposed misc stuff

Makefile

@@ -3,23 +3,24 @@ DESTDIR ?=
 
 CXX	     ?= g++
 OPTIFLAG     = -O2 -g
-SDL_CONFIG  ?= sdl-config
+SDL_CONFIG  ?= sdl2-config
 VERSION      = 1.0.8
 CFLAGS      := -Wall -Isrc $(OPTIFLAG) $(CFLAGS_NOSDL) `$(SDL_CONFIG) --cflags` -DHAVE_SDL_MIXER "-DTRIPLANE_DATA=\"$(PREFIX)/share/games/triplane\"" "-DTRIPLANE_VERSION=\"$(VERSION)\""
 LDFLAGS      = 
-LIBS        := `$(SDL_CONFIG) --libs` -lSDL_mixer -lm
+LIBS        := `$(SDL_CONFIG) --libs` -lSDL2_mixer -lz -lm
 INSTALL_DATA     ?= install -m 644
 INSTALL_PROGRAM  ?= install
 
 COMMON_OBJS = src/gfx/bitmap.o src/gfx/font.o \
 	src/gfx/gfx.o src/util/wutil.o src/util/random.o \
-	src/io/sdl_compat.o src/io/video.o \
+	src/io/sdl_compat.o src/io/video.o src/io/network.o \
 	src/io/mouse.o src/io/dksfile.o src/io/timing.o
 TRIPLANE_OBJS = src/triplane.o src/world/tripai.o \
-	src/world/tripmis.o src/gfx/fades.o src/menus/tripmenu.o \
+	src/world/tripmis.o src/gfx/fades.o \
+	src/menus/menusupport.o src/menus/tripmenu.o \
 	src/world/terrain.o src/world/fobjects.o src/world/tmexept.o \
 	src/gfx/extra.o src/settings.o src/world/plane.o src/io/joystick.o src/io/sound.o \
-	src/world/tripaudio.o
+	src/world/tripaudio.o src/io/netclient.o
 LVLEDIT_OBJS = src/tools/lvledit/lvledit.o
 PGDVIEW_OBJS = src/tools/pgdview/pgdview.o
 PCX2PGD_OBJS = src/tools/pcx2pgd/pcx2pgd.o
@@ -83,7 +84,6 @@ install:
 	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man6
 	$(INSTALL_DATA) doc/triplane.6 $(DESTDIR)$(PREFIX)/share/man/man6/triplane.6
 test:
-	if [ ! -d triplane-testsuite ]; then echo Please darcs get http://iki.fi/lindi/darcs/triplane-testsuite; false; fi
 	SDL_VIDEODRIVER=dummy bash tools/run-all-tests tools/run-one-test ./triplane triplane-testsuite
 
 build-data-from-source: tools/pcx2pgd
@@ -98,5 +98,5 @@ dist:
 
 # man -Tps doc/triplane.6 > triplane.ps
 # ps2pdf triplane.ps
-.PHONY: all checkdepend depend clean install test
+.PHONY: all checkdepend depend clean install test build-data-from-source dist
 -include .depend

README.install

@@ -5,9 +5,10 @@ Dependencies
 ------------
 
 * g++
-* SDL 1.2 
-* SDL mixer 1.2
+* SDL 2.0
+* SDL mixer 2.0
 * GNU make
+* zlib
 
 Build procedure
 ---------------

data/fokker.lst

@@ -68,6 +68,7 @@ data/menus/roster.pgd
 data/misc/score.pgd
 data/misc/lappu1.pgd
 data/misc/lappu2.pgd
+data/menus/netmenu.pgd
 ;SFX
 data/sfx/aargh1.wav Die1
 data/sfx/aargh2.wav Die2

data_src/pcx.lst

@@ -367,3 +367,4 @@ data/icons/ase3.pgd data_src/pcx/icons/ase3.pcx \\x41\\x53\\x45\\x33\\x00\\x00\\
 data/icons/ase4.pgd data_src/pcx/icons/ase4.pcx \\x41\\x53\\x45\\x34\\x00\\x00\\x00 \\x20 1 3
 data/icons/ase1.pgd data_src/pcx/icons/ase1.pcx \\x41\\x53\\x45\\x31\\x00\\x00\\x00 \\xc4 5 9
 data/icons/ase2.pgd data_src/pcx/icons/ase2.pcx \\x41\\x53\\x45\\x32\\x00\\x00\\x00 \\x00 2 8
+data/menus/netmenu.pgd data_src/pcx/menus/netmenu.pcx NETMEN\\x00 \\x00 320 200

doc/TODO

@@ -6,5 +6,4 @@ PDF manual
 Support for more than two joysticks
 Network game
 src/gfx/extra.cpp: embedded graphics, should read from data file instead
-investigate if http://scale2x.sourceforge.net/ could be used for scaling
 

doc/triplane.6

@@ -23,14 +23,9 @@ Start the game without sounds.  Note: This option also disables sounds
 in the configuration file so sounds will be disabled also the next
 time you start triplane.  To enable sounds set Physical
 Examination->Hearing->Sounds on in the game menus.
-.IP "\fB\-2, -3, -4\fP"
-Scale the 320x200-pixel game window 2x, 3x or 4x using software
-scaling.  This helps you play Triplane on displays that cannot switch to
-such low resolutions.
-.IP "\fB\-2svga\fP"
-Scale the 800x600-pixel window 2x using software scaling, to
-produce a 1600x1200-pixel window.  This resolution is used only in
-multiplayer mode.
+.IP "\fB\-1, -2, -3, -4\fP"
+Scale the initial 320x200-pixel game window 1x, 2x, 3x or 4x.
+The default is -3. You can resize the window freely at runtime.
 .PP
 Note that triplane does not warn about unknown options.
 .SH "GETTING STARTED"
@@ -53,6 +48,7 @@ controls:
 .IP "\(bu use X and W to steer the plane" 4
 .IP "\(bu use 1 to drop a bomb" 4
 .IP "\(bu use S to roll the plane upside down" 4
+.IP "\(bu use Pause or F4 to pause the game" 4
 .PP
 When you have destroyed all the targets try to land by releasing power
 and gliding to the runway.  Holding up and down simultaneously