No OneTemporary
Actions

Size

84 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/Makefile.am b/src/Makefile.am
	index 83c23bb..1522a8c 100644
	--- a/src/Makefile.am
	+++ b/src/Makefile.am
	@@ -1,29 +1,29 @@
	## Process this file with automake to produce Makefile.in

	bin_PROGRAMS = openmortal
	openmortal_SOURCES = Audio.cpp Backend.cpp common.cpp \
	Demo.cpp FighterStats.cpp FlyingChars.cpp Game.cpp gfx.cpp main.cpp \
	menu.cpp PlayerSelect.cpp RlePack.cpp sge_bm_text.cpp \
	sge_primitives.cpp sge_surface.cpp sge_tt_text.cpp State.cpp \
	GameOver.cpp Background.cpp MortalNetworkImpl.cpp Chooser.cpp \
	- TextArea.cpp
	+ TextArea.cpp OnlineChat.cpp

	EXTRA_DIST = Audio.h Backend.h common.h Demo.h FlyingChars.h gfx.h \
	menu.h RlePack.h sge_bm_text.h sge_config.h sge_internal.h \
	sge_primitives.h sge_surface.h sge_tt_text.h State.h \
	Game.h FighterEnum.h PlayerSelect.h MszPerl.h \
	Audio.cpp Backend.cpp common.cpp \
	Demo.cpp FighterStats.cpp FlyingChars.cpp Game.cpp gfx.cpp main.cpp \
	menu.cpp PlayerSelect.cpp RlePack.cpp sge_bm_text.cpp \
	sge_primitives.cpp sge_surface.cpp sge_tt_text.cpp State.cpp \
	GameOver.cpp Background.h MortalNetwork.h MortalNetworkImpl.h \
	- FighterStats.h Chooser.h TextArea.h
	+ FighterStats.h Chooser.h TextArea.h OnlineChat.h

	CXXFLAGS= @CXXFLAGS@ -DDATADIR=\"${pkgdatadir}\" -Wall

	# set the include path found by configure
	#INCLUDES= $(all_includes)

	# the library search path.
	#msz_LDFLAGS = $(all_libraries)

	diff --git a/src/Makefile.in b/src/Makefile.in
	index 3d2fbe1..bf0caf6 100644
	--- a/src/Makefile.in
	+++ b/src/Makefile.in
	@@ -1,365 +1,366 @@
	# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am

	# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
	# This Makefile.in is free software; the Free Software Foundation
	# gives unlimited permission to copy and/or distribute it,
	# with or without modifications, as long as this notice is preserved.

	# This program is distributed in the hope that it will be useful,
	# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
	# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
	# PARTICULAR PURPOSE.


	SHELL = @SHELL@

	srcdir = @srcdir@
	top_srcdir = @top_srcdir@
	VPATH = @srcdir@
	prefix = @prefix@
	exec_prefix = @exec_prefix@

	bindir = @bindir@
	sbindir = @sbindir@
	libexecdir = @libexecdir@
	datadir = @datadir@
	sysconfdir = @sysconfdir@
	sharedstatedir = @sharedstatedir@
	localstatedir = @localstatedir@
	libdir = @libdir@
	infodir = @infodir@
	mandir = @mandir@
	includedir = @includedir@
	oldincludedir = /usr/include

	DESTDIR =

	pkgdatadir = $(datadir)/@PACKAGE@
	pkglibdir = $(libdir)/@PACKAGE@
	pkgincludedir = $(includedir)/@PACKAGE@

	top_builddir = ..

	ACLOCAL = @ACLOCAL@
	AUTOCONF = @AUTOCONF@
	AUTOMAKE = @AUTOMAKE@
	AUTOHEADER = @AUTOHEADER@

	INSTALL = @INSTALL@
	INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
	INSTALL_DATA = @INSTALL_DATA@
	INSTALL_SCRIPT = @INSTALL_SCRIPT@
	transform = @program_transform_name@

	NORMAL_INSTALL = :
	PRE_INSTALL = :
	POST_INSTALL = :
	NORMAL_UNINSTALL = :
	PRE_UNINSTALL = :
	POST_UNINSTALL = :
	build_alias = @build_alias@
	build_triplet = @build@
	host_alias = @host_alias@
	host_triplet = @host@
	target_alias = @target_alias@
	target_triplet = @target@
	AUTODIRS = @AUTODIRS@
	CXX = @CXX@
	FT2_CFLAGS = @FT2_CFLAGS@
	FT2_CONFIG = @FT2_CONFIG@
	FT2_LIBS = @FT2_LIBS@
	MAKEINFO = @MAKEINFO@
	PACKAGE = @PACKAGE@
	PERL = @PERL@
	SDL_CFLAGS = @SDL_CFLAGS@
	SDL_CONFIG = @SDL_CONFIG@
	SDL_LIBS = @SDL_LIBS@
	VERSION = @VERSION@
	perl_embed_ccflags = @perl_embed_ccflags@
	perl_embed_ldflags = @perl_embed_ldflags@

	bin_PROGRAMS = openmortal
	-openmortal_SOURCES = Audio.cpp Backend.cpp common.cpp Demo.cpp FighterStats.cpp FlyingChars.cpp Game.cpp gfx.cpp main.cpp menu.cpp PlayerSelect.cpp RlePack.cpp sge_bm_text.cpp sge_primitives.cpp sge_surface.cpp sge_tt_text.cpp State.cpp GameOver.cpp Background.cpp MortalNetworkImpl.cpp Chooser.cpp TextArea.cpp
	+openmortal_SOURCES = Audio.cpp Backend.cpp common.cpp Demo.cpp FighterStats.cpp FlyingChars.cpp Game.cpp gfx.cpp main.cpp menu.cpp PlayerSelect.cpp RlePack.cpp sge_bm_text.cpp sge_primitives.cpp sge_surface.cpp sge_tt_text.cpp State.cpp GameOver.cpp Background.cpp MortalNetworkImpl.cpp Chooser.cpp TextArea.cpp OnlineChat.cpp


	-EXTRA_DIST = Audio.h Backend.h common.h Demo.h FlyingChars.h gfx.h menu.h RlePack.h sge_bm_text.h sge_config.h sge_internal.h sge_primitives.h sge_surface.h sge_tt_text.h State.h Game.h FighterEnum.h PlayerSelect.h MszPerl.h Audio.cpp Backend.cpp common.cpp Demo.cpp FighterStats.cpp FlyingChars.cpp Game.cpp gfx.cpp main.cpp menu.cpp PlayerSelect.cpp RlePack.cpp sge_bm_text.cpp sge_primitives.cpp sge_surface.cpp sge_tt_text.cpp State.cpp GameOver.cpp Background.h MortalNetwork.h MortalNetworkImpl.h FighterStats.h Chooser.h TextArea.h
	+EXTRA_DIST = Audio.h Backend.h common.h Demo.h FlyingChars.h gfx.h menu.h RlePack.h sge_bm_text.h sge_config.h sge_internal.h sge_primitives.h sge_surface.h sge_tt_text.h State.h Game.h FighterEnum.h PlayerSelect.h MszPerl.h Audio.cpp Backend.cpp common.cpp Demo.cpp FighterStats.cpp FlyingChars.cpp Game.cpp gfx.cpp main.cpp menu.cpp PlayerSelect.cpp RlePack.cpp sge_bm_text.cpp sge_primitives.cpp sge_surface.cpp sge_tt_text.cpp State.cpp GameOver.cpp Background.h MortalNetwork.h MortalNetworkImpl.h FighterStats.h Chooser.h TextArea.h OnlineChat.h


	CXXFLAGS = @CXXFLAGS@ -DDATADIR=\"${pkgdatadir}\" -Wall
	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
	CONFIG_HEADER = ../config.h
	CONFIG_CLEAN_FILES =
	PROGRAMS = $(bin_PROGRAMS)


	DEFS = @DEFS@ -I. -I$(srcdir) -I..
	CPPFLAGS = @CPPFLAGS@
	LDFLAGS = @LDFLAGS@
	LIBS = @LIBS@
	openmortal_OBJECTS = Audio.o Backend.o common.o Demo.o FighterStats.o \
	FlyingChars.o Game.o gfx.o main.o menu.o PlayerSelect.o RlePack.o \
	sge_bm_text.o sge_primitives.o sge_surface.o sge_tt_text.o State.o \
	-GameOver.o Background.o MortalNetworkImpl.o Chooser.o TextArea.o
	+GameOver.o Background.o MortalNetworkImpl.o Chooser.o TextArea.o \
	+OnlineChat.o
	openmortal_LDADD = $(LDADD)
	openmortal_DEPENDENCIES =
	openmortal_LDFLAGS =
	CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
	CXXLD = $(CXX)
	CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
	DIST_COMMON = Makefile.am Makefile.in


	DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

	TAR = gtar
	GZIP_ENV = --best
	DEP_FILES = .deps/Audio.P .deps/Backend.P .deps/Background.P \
	.deps/Chooser.P .deps/Demo.P .deps/FighterStats.P .deps/FlyingChars.P \
	.deps/Game.P .deps/GameOver.P .deps/MortalNetworkImpl.P \
	-.deps/PlayerSelect.P .deps/RlePack.P .deps/State.P .deps/TextArea.P \
	-.deps/common.P .deps/gfx.P .deps/main.P .deps/menu.P \
	+.deps/OnlineChat.P .deps/PlayerSelect.P .deps/RlePack.P .deps/State.P \
	+.deps/TextArea.P .deps/common.P .deps/gfx.P .deps/main.P .deps/menu.P \
	.deps/sge_bm_text.P .deps/sge_primitives.P .deps/sge_surface.P \
	.deps/sge_tt_text.P
	SOURCES = $(openmortal_SOURCES)
	OBJECTS = $(openmortal_OBJECTS)

	all: all-redirect
	.SUFFIXES:
	.SUFFIXES: .S .c .cpp .o .s
	$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
	cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile

	Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
	cd $(top_builddir) \
	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status


	mostlyclean-binPROGRAMS:

	clean-binPROGRAMS:
	-test -z "$(bin_PROGRAMS)" \|\| rm -f $(bin_PROGRAMS)

	distclean-binPROGRAMS:

	maintainer-clean-binPROGRAMS:

	install-binPROGRAMS: $(bin_PROGRAMS)
	@$(NORMAL_INSTALL)
	$(mkinstalldirs) $(DESTDIR)$(bindir)
	@list='$(bin_PROGRAMS)'; for p in $$list; do \
	if test -f $$p; then \
	echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p\|sed 's/$(EXEEXT)$$//'\|sed '$(transform)'\|sed 's/$$/$(EXEEXT)/'`"; \
	$(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p\|sed 's/$(EXEEXT)$$//'\|sed '$(transform)'\|sed 's/$$/$(EXEEXT)/'`; \
	else :; fi; \
	done

	uninstall-binPROGRAMS:
	@$(NORMAL_UNINSTALL)
	list='$(bin_PROGRAMS)'; for p in $$list; do \
	rm -f $(DESTDIR)$(bindir)/`echo $$p\|sed 's/$(EXEEXT)$$//'\|sed '$(transform)'\|sed 's/$$/$(EXEEXT)/'`; \
	done

	.s.o:
	$(COMPILE) -c $<

	.S.o:
	$(COMPILE) -c $<

	mostlyclean-compile:
	-rm -f .o core .core

	clean-compile:

	distclean-compile:
	-rm -f *.tab.c

	maintainer-clean-compile:

	openmortal: $(openmortal_OBJECTS) $(openmortal_DEPENDENCIES)
	@rm -f openmortal
	$(CXXLINK) $(openmortal_LDFLAGS) $(openmortal_OBJECTS) $(openmortal_LDADD) $(LIBS)
	.cpp.o:
	$(CXXCOMPILE) -c $<

	tags: TAGS

	ID: $(HEADERS) $(SOURCES) $(LISP)
	list='$(SOURCES) $(HEADERS)'; \
	unique=`for i in $$list; do echo $$i; done \| \
	awk ' { files[$$0] = 1; } \
	END { for (i in files) print i; }'`; \
	here=`pwd` && cd $(srcdir) \
	&& mkid -f$$here/ID $$unique $(LISP)

	TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
	tags=; \
	here=`pwd`; \
	list='$(SOURCES) $(HEADERS)'; \
	unique=`for i in $$list; do echo $$i; done \| \
	awk ' { files[$$0] = 1; } \
	END { for (i in files) print i; }'`; \
	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
	\|\| (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)

	mostlyclean-tags:

	clean-tags:

	distclean-tags:
	-rm -f TAGS ID

	maintainer-clean-tags:

	distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)

	subdir = src

	distdir: $(DISTFILES)
	here=`cd $(top_builddir) && pwd`; \
	top_distdir=`cd $(top_distdir) && pwd`; \
	distdir=`cd $(distdir) && pwd`; \
	cd $(top_srcdir) \
	&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile
	@for file in $(DISTFILES); do \
	d=$(srcdir); \
	if test -d $$d/$$file; then \
	cp -pr $$d/$$file $(distdir)/$$file; \
	else \
	test -f $(distdir)/$$file \
	\|\| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
	\|\| cp -p $$d/$$file $(distdir)/$$file \|\| :; \
	fi; \
	done

	DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 \|\| :)

	-include $(DEP_FILES)

	mostlyclean-depend:

	clean-depend:

	distclean-depend:
	-rm -rf .deps

	maintainer-clean-depend:

	%.o: %.c
	@echo '$(COMPILE) -c $<'; \
	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
	@-cp .deps/$(F).pp .deps/$(F).P; \
	tr ' ' '\012' < .deps/$(*F).pp \
	\| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
	>> .deps/$(*F).P; \
	rm .deps/$(*F).pp

	%.lo: %.c
	@echo '$(LTCOMPILE) -c $<'; \
	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
	@-sed -e 's/^$[^:]$\.o[ ]:/\1.lo \1.o :/' \
	< .deps/$(F).pp > .deps/$(F).P; \
	tr ' ' '\012' < .deps/$(*F).pp \
	\| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
	>> .deps/$(*F).P; \
	rm -f .deps/$(*F).pp

	%.o: %.cpp
	@echo '$(CXXCOMPILE) -c $<'; \
	$(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
	@-cp .deps/$(F).pp .deps/$(F).P; \
	tr ' ' '\012' < .deps/$(*F).pp \
	\| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
	>> .deps/$(*F).P; \
	rm .deps/$(*F).pp

	%.lo: %.cpp
	@echo '$(LTCXXCOMPILE) -c $<'; \
	$(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
	@-sed -e 's/^$[^:]$\.o[ ]:/\1.lo \1.o :/' \
	< .deps/$(F).pp > .deps/$(F).P; \
	tr ' ' '\012' < .deps/$(*F).pp \
	\| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
	>> .deps/$(*F).P; \
	rm -f .deps/$(*F).pp
	info-am:
	info: info-am
	dvi-am:
	dvi: dvi-am
	check-am: all-am
	check: check-am
	installcheck-am:
	installcheck: installcheck-am
	install-exec-am: install-binPROGRAMS
	install-exec: install-exec-am

	install-data-am:
	install-data: install-data-am

	install-am: all-am
	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
	install: install-am
	uninstall-am: uninstall-binPROGRAMS
	uninstall: uninstall-am
	all-am: Makefile $(PROGRAMS)
	all-redirect: all-am
	install-strip:
	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
	installdirs:
	$(mkinstalldirs) $(DESTDIR)$(bindir)


	mostlyclean-generic:

	clean-generic:

	distclean-generic:
	-rm -f Makefile $(CONFIG_CLEAN_FILES)
	-rm -f config.cache config.log stamp-h stamp-h[0-9]*

	maintainer-clean-generic:
	mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \
	mostlyclean-tags mostlyclean-depend mostlyclean-generic

	mostlyclean: mostlyclean-am

	clean-am: clean-binPROGRAMS clean-compile clean-tags clean-depend \
	clean-generic mostlyclean-am

	clean: clean-am

	distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \
	distclean-depend distclean-generic clean-am

	distclean: distclean-am

	maintainer-clean-am: maintainer-clean-binPROGRAMS \
	maintainer-clean-compile maintainer-clean-tags \
	maintainer-clean-depend maintainer-clean-generic \
	distclean-am
	@echo "This command is intended for maintainers to use;"
	@echo "it deletes files that may require special tools to rebuild."

	maintainer-clean: maintainer-clean-am

	.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
	maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
	mostlyclean-compile distclean-compile clean-compile \
	maintainer-clean-compile tags mostlyclean-tags distclean-tags \
	clean-tags maintainer-clean-tags distdir mostlyclean-depend \
	distclean-depend clean-depend maintainer-clean-depend info-am info \
	dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
	install-exec install-data-am install-data install-am install \
	uninstall-am uninstall all-redirect all-am all installdirs \
	mostlyclean-generic distclean-generic clean-generic \
	maintainer-clean-generic clean mostlyclean distclean maintainer-clean


	# set the include path found by configure
	#INCLUDES= $(all_includes)

	# the library search path.
	#msz_LDFLAGS = $(all_libraries)

	# Tell versions [3.59,3.63) of GNU make to not export all variables.
	# Otherwise a system limit (for SysV at least) may be exceeded.
	.NOEXPORT:
	diff --git a/src/MortalNetworkImpl.cpp b/src/MortalNetworkImpl.cpp
	index d0657af..febc320 100644
	--- a/src/MortalNetworkImpl.cpp
	+++ b/src/MortalNetworkImpl.cpp
	@@ -1,919 +1,920 @@
	/***************************************************************************
	MortalNetworkImpl.cpp - description
	-------------------
	begin : Sun Jan 25 2004
	copyright : (C) 2004 by upi
	email : upi@feel
	***************************************************************************/

	#include "MortalNetworkImpl.h"
	#include "State.h"
	#include "PlayerSelect.h"
	#include "common.h"
	#include "config.h"


	#define MORTALNETWORKPORT 0x3A22
	#define MAXSTRINGLENGTH 900


	// Some graphics routines, defined in menu.cpp

	void MortalNetworkResetMessages( bool a_bClear );
	void MortalNetworkMessage( const char* format, ... );
	bool MortalNetworkCheckKey();
	const char* GetGameTimeString( int a_iValue );
	const char* GetGameSpeedString( int a_iValue );
	const char* GetHitPointsString( int a_iValue );




	CMortalNetwork* g_poNetwork = NULL;




	void CMortalNetwork::Create() // static
	{
	if ( NULL == g_poNetwork )
	{
	g_poNetwork = new CMortalNetworkImpl;
	}
	}



	CMortalNetworkImpl::CMortalNetworkImpl()
	{
	m_enState = NS_DISCONNECTED;
	m_bServer = false;
	m_bMaster = false;
	m_poSocket = NULL;

	m_enRemoteFighter = UNKNOWN;
	m_bRemoteReady = false;
	m_bRoundOver = false;
	m_iWhoWon = -1;
	m_bGameOver = false;
	m_iGameTime = 0;
	m_iGamePhase = 0;
	m_iHurryupCode = 0;
	m_iIncomingBufferSize = 0;

	if(SDLNet_Init()==-1)
	{
	m_bNetworkAvailable = false;
	m_sLastError = SDLNet_GetError();
	debug ( "Error opening SDLNet: %s\n", m_sLastError.c_str() );
	}

	m_bNetworkAvailable = true;
	}


	CMortalNetworkImpl::~CMortalNetworkImpl()
	{
	Stop();
	}


	bool CMortalNetworkImpl::Start( const char* a_pcServerName )
	{
	#define RETURNNOERROR { \
	debug( "%s\n", m_sLastError.c_str() ); \
	return false; }
	#define RETURNWITHERROR { \
	m_sLastError = SDLNet_GetError(); \
	debug( "%s\n", m_sLastError.c_str() ); \
	return false; }
	#define RETURNWITHADDITIONALERROR { \
	m_sLastError += SDLNet_GetError(); \
	debug( "%s\n", m_sLastError.c_str() ); \
	return false; }

	if ( !m_bNetworkAvailable )
	{
	return false;
	}

	debug( "CMortalNetworkImpl::Start( %s )\n", a_pcServerName ? a_pcServerName : "NULL" );
	IPaddress oAddress;

	if ( a_pcServerName )
	{
	- MortalNetworkMessage( Translate("Resolving hostname...") );
	+ MortalNetworkMessage( Translate("Resolving hostname (%s)..."), a_pcServerName );
	}

	int iResult = SDLNet_ResolveHost( &oAddress, a_pcServerName, MORTALNETWORKPORT );
	if ( iResult )
	{
	m_sLastError = Translate( "Couldn't resolve host." );
	RETURNNOERROR;
	}
	debug( "IP Address of server is 0x%x\n", oAddress.host );

	if ( a_pcServerName )
	{
	Uint32 ipaddr=SDL_SwapBE32(oAddress.host);
	MortalNetworkMessage("Connecting to %d.%d.%d.%d port %d",
	ipaddr>>24, (ipaddr>>16)&0xff, (ipaddr>>8)&0xff, ipaddr&0xff, oAddress.port);
	}

	if ( !a_pcServerName )
	{
	// SERVER-MODE CONNECTION

	m_poSocket = SDLNet_TCP_Open( &oAddress );
	+ if ( NULL == m_poSocket ) RETURNWITHERROR;

	// Wait for connection ...
	MortalNetworkMessage ( Translate("Waiting for connection... (press any key to abort)") );
	TCPsocket poClient;
	while ( 1 )
	{
	poClient = SDLNet_TCP_Accept( m_poSocket );
	if ( poClient ) break;

	if (MortalNetworkCheckKey()) break;;
	SDL_Delay( 100 );
	}

	SDLNet_TCP_Close( m_poSocket );

	if ( NULL == poClient )
	{
	m_sLastError = "No connection.";
	return false;
	}

	IPaddress* poRemoteAddress = SDLNet_TCP_GetPeerAddress(poClient);

	if ( !poRemoteAddress )
	{
	RETURNWITHERROR;
	}
	Uint32 ipaddr=SDL_SwapBE32(poRemoteAddress->host);
	MortalNetworkMessage("Accepted connection from %d.%d.%d.%d port %d",
	ipaddr>>24, (ipaddr>>16)&0xff, (ipaddr>>8)&0xff, ipaddr&0xff, oAddress.port);

	// Set the client socket as our socket, and drop the server socket.

	m_poSocket = poClient;
	}
	else
	{
	// CLIENT-MODE CONNECTION

	MortalNetworkMessage ( Translate("Waiting for connection... (press any key to abort)") );

	while (1)
	{
	m_poSocket = SDLNet_TCP_Open( &oAddress );
	if ( m_poSocket ) break;
	if ( MortalNetworkCheckKey() ) break;
	SDL_Delay( 100 );
	}
	if ( NULL == m_poSocket )
	{
	RETURNWITHERROR;
	}
	}

	// CONNECTION ESTABLISHED. SEND INTRO PACKETS

	MortalNetworkMessage( Translate("Connection established.") );

	struct SIntroPackage
	{
	char cID;
	char acVersion[10];
	} oIntroPackage, oRemotePackage;

	oIntroPackage.cID = 'I';
	strncpy( oIntroPackage.acVersion, VERSION, 10 );
	oIntroPackage.acVersion[9] = 0;

	debug( "Sending intro package... " );

	int iRetval = SDLNet_TCP_Send( m_poSocket, &oIntroPackage, sizeof( oIntroPackage ) );

	if ( iRetval < (int) sizeof( oIntroPackage ) )
	{
	RETURNWITHERROR;
	}

	iRetval = SDLNet_TCP_Recv( m_poSocket, &oRemotePackage, sizeof( oRemotePackage ) );
	if ( iRetval <= 0 )
	{
	RETURNWITHERROR;
	}
	if ( iRetval < (int) sizeof( oRemotePackage )
	\|\| oRemotePackage.cID != 'I'
	\|\| strncmp( oRemotePackage.acVersion, VERSION, 9 ) )
	{
	m_sLastError = Translate( "The remote side has a different version of OpenMortal running." );
	RETURNNOERROR;
	}

	MortalNetworkMessage( Translate("Life is good.") );

	m_enState = NS_CHARACTER_SELECTION;
	m_bServer = NULL == a_pcServerName;
	m_bMaster = m_bServer;
	m_sLastError = "";
	m_asMsgs.clear();
	m_enRemoteFighter = UNKNOWN;
	m_bRemoteReady = false;
	m_sLatestGameData = "";
	m_aiKeystrokes.clear();
	m_abKeystrokes.clear();
	m_iGameTime = 0;
	m_iGamePhase = 0;
	m_iHurryupCode = 0;
	m_iIncomingBufferSize = 0;
	m_aiAvailableRemoteFighters.clear();
	m_oGameParams.iGameTime = m_oGameParams.iGameSpeed = m_oGameParams.iHitPoints = 0;
	m_sRemoteUserName = "HIM";

	m_poSocketSet = SDLNet_AllocSocketSet( 1 );
	SDLNet_TCP_AddSocket( m_poSocketSet, m_poSocket ); // Check for errors?

	SendRawData( 'U', g_oState.m_acNick, strlen(g_oState.m_acNick)+1 );

	return true;
	}


	void CMortalNetworkImpl::Stop()
	{
	if ( NS_DISCONNECTED == m_enState )
	{
	return;
	}

	g_oState.m_enGameMode = SState::IN_DEMO;
	m_enState = NS_DISCONNECTED;
	SDLNet_FreeSocketSet( m_poSocketSet );
	SDLNet_TCP_Close( m_poSocket );
	}


	bool CMortalNetworkImpl::IsConnectionAlive()
	{
	return ( NS_DISCONNECTED != m_enState );
	}



	#define DISCONNECTONCOMMUNICATIONERROR { \
	m_sLastError = Translate("Communication error. Disconnecting."); \
	Stop(); \
	return; }
	#define DISCONNECTWITH(A) { \
	m_sLastError = Translate("Communication error. Disconnecting."); \
	Stop(); \
	return(A); }

	#define CHECKCONNECTION if ( NS_DISCONNECTED == m_enState ) return;


	void CMortalNetworkImpl::Update()
	{
	CHECKCONNECTION;

	// 1. CHECK FOR STUFF TO READ

	int iRetval = SDLNet_CheckSockets( m_poSocketSet, 0 );
	if ( iRetval <= 0 )
	{
	return;
	}

	// 2. APPEND AT MOST 1024 bytes TO THE END OF THE INCOMING BUFFER

	iRetval = SDLNet_TCP_Recv( m_poSocket, m_acIncomingBuffer + m_iIncomingBufferSize, 1024 );
	if ( iRetval <= 0 )
	{
	m_sLastError = SDLNet_GetError();
	Stop();
	return;
	}
	m_iIncomingBufferSize += iRetval;

	// 3. CONSUME THE INCOMING BUFFER.
	// We always make sure the incoming buffer starts with a package header.

	int iOffset = 0;

	while ( iOffset < m_iIncomingBufferSize )
	{
	// 3.1. Check if we have enough data to receive the package.

	if ( m_iIncomingBufferSize - iOffset < 4 )
	{
	// Not enough space left for a full header.
	debug( "Not enough space left for a full header (%d).\n", m_iIncomingBufferSize-iOffset );
	break;
	}

	unsigned int iLengthOfPackage = SDL_SwapBE16(((Uint16)(m_acIncomingBuffer + iOffset + 1)));
	if ( iLengthOfPackage > 1000 )
	{
	debug( "Maximum package size exceeded.\n" );
	DISCONNECTONCOMMUNICATIONERROR;
	}
	debug( "Receiving stuff.. %c type, %d package length, offset %d in buffer, %d bytes in buffer\n",
	m_acIncomingBuffer[iOffset], iLengthOfPackage, iOffset, m_iIncomingBufferSize );

	if ( iOffset + 4 + (int)iLengthOfPackage > m_iIncomingBufferSize )
	{
	// Not enough space left for the actual package.
	debug( "Not enough space left for the actual package.\n" );
	break;
	}

	// 3.2. Receive the data.

	switch ( m_acIncomingBuffer[iOffset] )
	{
	case 'M': ReceiveMsg( m_acIncomingBuffer+iOffset+4, iLengthOfPackage ); break;
	case 'F': ReceiveFighter( m_acIncomingBuffer+iOffset+4, iLengthOfPackage ); break;
	case 'R': ReceiveReady( m_acIncomingBuffer+iOffset+4, iLengthOfPackage ); break;
	case 'S': m_bSynchQueryResponse=true; break;
	case 'G': ReceiveGameData( m_acIncomingBuffer+iOffset+4, iLengthOfPackage ); break;
	case 'K': ReceiveKeystroke( m_acIncomingBuffer+iOffset+4, iLengthOfPackage ); break;
	case 'O': ReceiveRoundOver( m_acIncomingBuffer+iOffset+4, iLengthOfPackage ); break;
	case 'T': ReceiveGameTime( m_acIncomingBuffer+iOffset+4, iLengthOfPackage ); break;
	case 'H': ReceiveHurryup( m_acIncomingBuffer+iOffset+4, iLengthOfPackage ); break;
	case 'A': ReceiveRemoteFighterAvailable( m_acIncomingBuffer+iOffset+4, iLengthOfPackage ); break;
	case 'Q': ReceiveRemoteFighterQuery( m_acIncomingBuffer+iOffset+4, iLengthOfPackage ); break;
	case 'P': ReceiveGameParams( m_acIncomingBuffer+iOffset+4, iLengthOfPackage ); break;
	case 'U': ReceiveRemoteUserName( m_acIncomingBuffer+iOffset+4, iLengthOfPackage ); break;
	default:
	{
	debug( "Bad ID: %c (%d)\n", m_acIncomingBuffer[iOffset], m_acIncomingBuffer[iOffset] );
	DISCONNECTONCOMMUNICATIONERROR;
	}
	}

	if ( !IsConnectionAlive() )
	{
	return;
	}

	iOffset += iLengthOfPackage + 4;
	}

	// 4. MOVE LEFTOVER DATA TO THE BEGINNING OF THE INCOMING BUFFER
	// The leftover data starts at iOffset, and is (m_iIncomingBufferSize-iOffset) long.

	memmove( m_acIncomingBuffer, m_acIncomingBuffer + iOffset, m_iIncomingBufferSize-iOffset );
	m_iIncomingBufferSize -= iOffset;
	}


	const char* CMortalNetworkImpl::GetLastError()
	{
	return m_sLastError.c_str();
	}


	bool CMortalNetworkImpl::IsMaster()
	{
	return m_bMaster;
	}



	void CMortalNetworkImpl::ReceiveRemoteUserName( void* a_pData, int a_iLength )
	{
	if ( a_iLength < 1 \|\| a_iLength > MAXSTRINGLENGTH ) DISCONNECTONCOMMUNICATIONERROR;

	char* acData = (char*) a_pData;
	acData[ a_iLength-1 ] = 0; // Last char should be 0, just making sure..

	m_sRemoteUserName = acData;
	}

	const char* CMortalNetworkImpl::GetRemoteUsername()
	{
	return m_sRemoteUserName.c_str();
	}



	/*************************************************************************
	MSG RELATED METHODS
	*************************************************************************/



	/** All sent data must go through this method. It ensures the well-formed
	header for the data.
	The header itself looks like this:
	ID char
	Length Uint16
	Reserved char
	This is followed by as many bytes as the Length is.
	*/
	void CMortalNetworkImpl::SendRawData( char a_cID, const void* a_pData, int a_iLength )
	{
	CHECKCONNECTION;

	char acBuffer[4];
	acBuffer[0] = a_cID;
	((Uint16)(acBuffer+1)) = SDL_SwapBE16( a_iLength );
	acBuffer[3] = 0;

	int iRetval = SDLNet_TCP_Send( m_poSocket, &acBuffer, 4 );
	if ( iRetval != 4 ) DISCONNECTONCOMMUNICATIONERROR;

	if ( a_iLength )
	{
	iRetval = SDLNet_TCP_Send( m_poSocket, (void*) a_pData, a_iLength );
	if (iRetval != a_iLength ) DISCONNECTONCOMMUNICATIONERROR;
	}
	}







	void CMortalNetworkImpl::SendMsg( const char* a_pcMsg )
	{
	CHECKCONNECTION;

	int iMsgLen = strlen( a_pcMsg ) + 1;
	if ( iMsgLen > MAXSTRINGLENGTH )
	{
	// Will not be 0 terminated if exceeds length!
	iMsgLen = MAXSTRINGLENGTH;
	}
	SendRawData( 'M', a_pcMsg, iMsgLen );
	}

	void CMortalNetworkImpl::ReceiveMsg( void* a_pData, int a_iLength )
	{
	if ( a_iLength < 1 \|\| a_iLength > MAXSTRINGLENGTH ) DISCONNECTONCOMMUNICATIONERROR;

	char* pcData = (char*) a_pData;
	pcData[ a_iLength-1 ] = 0; // Last char should be 0, just making sure..

	std::string sMsg = "<" + m_sRemoteUserName + "> " + pcData;

	m_asMsgs.push_back( sMsg );
	}


	bool CMortalNetworkImpl::IsMsgAvailable()
	{
	return m_asMsgs.size() > 0;
	}

	const char* CMortalNetworkImpl::GetMsg()
	{
	static std::string sLastMsg;
	if ( IsMsgAvailable() )
	{
	sLastMsg = m_asMsgs.front();
	m_asMsgs.pop_front();
	return sLastMsg.c_str();
	}
	return NULL;
	}




	/*************************************************************************
	CHARACTER SELECTION RELATED METHODS
	*************************************************************************/




	bool CMortalNetworkImpl::IsRemoteFighterAvailable( FighterEnum a_enFighter )
	{
	if ( 0 == a_enFighter )
	{
	return false;
	}

	// Check if we already have it cached.
	if ( std::find( m_aiAvailableRemoteFighters.begin(), m_aiAvailableRemoteFighters.end(), a_enFighter ) != m_aiAvailableRemoteFighters.end() )
	{
	return true;
	}
	if ( std::find( m_aiAvailableRemoteFighters.begin(), m_aiAvailableRemoteFighters.end(), -a_enFighter ) != m_aiAvailableRemoteFighters.end() )
	{
	return false;
	}

	Uint32 iFighter = SDL_SwapBE32( a_enFighter );
	SendRawData( 'Q', &iFighter, sizeof(Uint32) );

	for ( int i=0; i<100; ++i )
	{
	SDL_Delay(10);
	Update();
	if ( std::find( m_aiAvailableRemoteFighters.begin(), m_aiAvailableRemoteFighters.end(), a_enFighter ) != m_aiAvailableRemoteFighters.end() )
	{
	return true;
	}
	if ( std::find( m_aiAvailableRemoteFighters.begin(), m_aiAvailableRemoteFighters.end(), -a_enFighter ) != m_aiAvailableRemoteFighters.end() )
	{
	return false;
	}
	}

	m_aiAvailableRemoteFighters.push_front( -a_enFighter );
	return false;
	}

	void CMortalNetworkImpl::ReceiveRemoteFighterQuery( void* a_pData, int a_iLength )
	{
	if ( a_iLength != sizeof(Uint32) ) DISCONNECTONCOMMUNICATIONERROR;
	FighterEnum iFighter = (FighterEnum) SDL_SwapBE32( ((Uint32)a_pData) );

	bool bAvailable = g_oPlayerSelect.IsLocalFighterAvailable( iFighter );
	Uint32 iResponse = bAvailable ? iFighter : iFighter + 100000;
	debug( "ReceiveRemoteFighterQuery: %d -> %d\n", iFighter, iResponse );
	iResponse = SDL_SwapBE32( iResponse );

	SendRawData( 'A', &iResponse, sizeof(Uint32) );
	}

	void CMortalNetworkImpl::ReceiveRemoteFighterAvailable( void* a_pData, int a_iLength )
	{
	if ( a_iLength != sizeof(Uint32) ) DISCONNECTONCOMMUNICATIONERROR;
	Uint32 iFighter = SDL_SwapBE32( ((Uint32)a_pData) );
	debug( "ReceiveRemoteFighterAvailable: %d\n", iFighter );
	if ( iFighter >= 100000 )
	{
	m_aiAvailableRemoteFighters.push_front( -(iFighter-100000) );
	}
	else
	{
	m_aiAvailableRemoteFighters.push_front( iFighter );
	}
	}






	void CMortalNetworkImpl::SendFighter( FighterEnum a_enFighter )
	{
	CHECKCONNECTION;

	Uint32 iFighter = SDL_SwapBE32( a_enFighter );
	SendRawData( 'F', &iFighter, sizeof (iFighter) );
	}

	void CMortalNetworkImpl::ReceiveFighter( void* a_pcData, int a_iLength )
	{
	Uint32 iFighter;
	if ( a_iLength != sizeof(iFighter) ) DISCONNECTONCOMMUNICATIONERROR;
	iFighter = ((Uint32)a_pcData);

	m_enRemoteFighter = (FighterEnum) SDL_SwapBE32( iFighter );
	debug( "ReceiveFighter: %d\n", m_enRemoteFighter );
	}

	FighterEnum CMortalNetworkImpl::GetRemoteFighter()
	{
	return m_enRemoteFighter;
	}




	void CMortalNetworkImpl::SendReady()
	{
	CHECKCONNECTION;

	SendRawData( 'R', NULL, 0 );
	}

	void CMortalNetworkImpl::ReceiveReady( void* a_pData, int a_iLength )
	{
	if ( a_iLength != 0 ) DISCONNECTONCOMMUNICATIONERROR;
	m_bRemoteReady = true;
	}

	bool CMortalNetworkImpl::IsRemoteSideReady()
	{
	return m_bRemoteReady;
	}



	void CMortalNetworkImpl::SendGameParams( int a_iGameSpeed, int a_iGameTime, int a_iHitPoints )
	{
	CHECKCONNECTION;
	if ( (int)m_oGameParams.iGameSpeed == a_iGameSpeed
	&& (int)m_oGameParams.iGameTime == a_iGameTime
	&& (int)m_oGameParams.iHitPoints == a_iHitPoints )
	{
	// Nothing to update.
	return;
	}

	m_oGameParams.iGameSpeed = a_iGameSpeed;
	m_oGameParams.iGameTime = a_iGameTime;
	m_oGameParams.iHitPoints = a_iHitPoints;

	SGameParams oPackage;
	oPackage.iGameSpeed = SDL_SwapBE32( a_iGameSpeed );
	oPackage.iGameTime = SDL_SwapBE32( a_iGameTime );
	oPackage.iHitPoints = SDL_SwapBE32( a_iHitPoints );
	SendRawData( 'P', &oPackage, sizeof(SGameParams) );
	}

	void CMortalNetworkImpl::ReceiveGameParams( void* a_pData, int a_iLength )
	{
	if ( a_iLength != sizeof(SGameParams) ) DISCONNECTONCOMMUNICATIONERROR;

	SGameParams* poPackage = (SGameParams*) a_pData;
	if ( m_oGameParams.iGameSpeed != SDL_SwapBE32( poPackage->iGameSpeed ) )
	{
	m_oGameParams.iGameSpeed = SDL_SwapBE32( poPackage->iGameSpeed );
	m_asMsgs.push_back( std::string("*** ") + GetGameSpeedString( m_oGameParams.iGameSpeed ) );
	}
	if ( m_oGameParams.iGameTime != SDL_SwapBE32( poPackage->iGameTime ) )
	{
	m_oGameParams.iGameTime = SDL_SwapBE32( poPackage->iGameTime );
	m_asMsgs.push_back( std::string("*** ") + GetGameTimeString( m_oGameParams.iGameTime) );
	}
	if ( m_oGameParams.iHitPoints != SDL_SwapBE32( poPackage->iHitPoints ) )
	{
	m_oGameParams.iHitPoints = SDL_SwapBE32( poPackage->iHitPoints );
	m_asMsgs.push_back( std::string("*** ") + GetHitPointsString( m_oGameParams.iHitPoints ) );
	}
	}




	/*************************************************************************
	GAME RELATED METHODS
	*************************************************************************/





	bool CMortalNetworkImpl::SynchStartRound()
	{
	debug( "SynchStartRound STARTED.\n" );

	m_bSynchQueryResponse = false;

	// run until both sides manage to get a SYNCH

	int i=0;

	while ( !m_bSynchQueryResponse )
	{
	SendRawData('S', NULL, 0);
	if ( !IsConnectionAlive() ) break;
	Update();
	SDL_Delay(100);
	if ( !IsConnectionAlive() ) break;
	++i;

	if ( i == 10 )
	{
	debug( "Synch is slow...\n" );
	MortalNetworkResetMessages( true );
	MortalNetworkMessage( "Synching with remote side..." );
	MortalNetworkMessage( "Press any key to disconnect." );
	}
	if ( i > 10
	&& MortalNetworkCheckKey() )
	{
	Stop();
	return false;
	}
	}

	if ( IsConnectionAlive() )
	{
	m_enState = NS_IN_GAME;
	m_bRoundOver = false;
	m_bGameOver = false;
	m_bRemoteReady = false;
	m_bSynchQueryResponse = false;
	m_iHurryupCode = -1;
	}

	return IsConnectionAlive();

	debug( "SynchStartRound FINISHED.\n" );
	}










	void CMortalNetworkImpl::SendGameData( const char* a_pcGameData )
	{
	CHECKCONNECTION;

	int iMsgLen = strlen( a_pcGameData ) + 1;
	if ( iMsgLen > MAXSTRINGLENGTH )
	{
	// Will not be 0 terminated if exceeds length!
	iMsgLen = MAXSTRINGLENGTH;
	}
	SendRawData( 'G', a_pcGameData, iMsgLen );
	}

	void CMortalNetworkImpl::ReceiveGameData( void* a_pData, int a_iLength )
	{
	if ( a_iLength < 1 \|\| a_iLength > MAXSTRINGLENGTH ) DISCONNECTONCOMMUNICATIONERROR;

	char* pcData = (char*) a_pData;
	pcData[ a_iLength-1 ] = 0; // Last char should be 0, just making sure..

	if ( pcData[0] )
	{
	m_sLatestGameData = pcData;
	}
	}

	const char* CMortalNetworkImpl::GetLatestGameData()
	{
	return m_sLatestGameData.c_str();
	}




	struct SKeystrokePackage
	{
	char cKey;
	bool bPressed;
	};

	void CMortalNetworkImpl::SendKeystroke( int a_iKey, bool a_bPressed )
	{
	CHECKCONNECTION;

	SKeystrokePackage oPackage;
	oPackage.cKey = a_iKey;
	oPackage.bPressed = a_bPressed;

	SendRawData( 'K', &oPackage, sizeof( oPackage) );
	}

	void CMortalNetworkImpl::ReceiveKeystroke( void* a_pData, int a_iLength )
	{
	if ( a_iLength != (int)sizeof(SKeystrokePackage) ) DISCONNECTONCOMMUNICATIONERROR;
	SKeystrokePackage* poPackage = (SKeystrokePackage*) a_pData;

	m_aiKeystrokes.push_back( poPackage->cKey );
	m_abKeystrokes.push_back( poPackage->bPressed );
	}

	bool CMortalNetworkImpl::GetKeystroke( int& a_riOutKey, bool& a_rbOutPressed )
	{
	if ( m_aiKeystrokes.size() == 0 )
	{
	return false;
	}
	a_riOutKey = m_aiKeystrokes.front();
	a_rbOutPressed = m_abKeystrokes.front();
	m_aiKeystrokes.pop_front();
	m_abKeystrokes.pop_front();

	debug( "GetKeystroke: %d, %d\n", a_riOutKey, a_rbOutPressed );
	return true;
	}



	struct SGameTimePackage
	{
	int iGameTime;
	int iGamePhase;
	};

	void CMortalNetworkImpl::SendGameTime( int a_iGameTime, int a_iGamePhase )
	{
	CHECKCONNECTION;

	if ( a_iGameTime == m_iGameTime
	&& a_iGamePhase == m_iGamePhase )
	{
	return; // Nothing to update, the other side already knows.
	}

	SGameTimePackage oPackage;
	m_iGameTime = a_iGameTime;
	m_iGamePhase = a_iGamePhase;
	oPackage.iGameTime = SDL_SwapBE32( a_iGameTime );
	oPackage.iGamePhase = SDL_SwapBE32( a_iGamePhase );

	SendRawData( 'T', &oPackage, sizeof(SGameTimePackage) );
	}

	void CMortalNetworkImpl::ReceiveGameTime( void* a_pData, int a_iLength )
	{
	if ( a_iLength != sizeof(SGameTimePackage) ) DISCONNECTONCOMMUNICATIONERROR;
	SGameTimePackage* poPackage = (SGameTimePackage*) a_pData;

	m_iGameTime = SDL_SwapBE32( poPackage->iGameTime );
	m_iGamePhase = SDL_SwapBE32( poPackage->iGamePhase );
	}

	int CMortalNetworkImpl::GetGameTime()
	{
	return m_iGameTime;
	}

	int CMortalNetworkImpl::GetGamePhase()
	{
	return m_iGamePhase;
	}




	void CMortalNetworkImpl::SendHurryup( int a_iHurryUpCode )
	{
	CHECKCONNECTION;
	int iPackage = SDL_SwapBE32( a_iHurryUpCode );
	SendRawData( 'H', &iPackage, sizeof(int) );
	}

	void CMortalNetworkImpl::ReceiveHurryup( void* a_pData, int a_iLength )
	{
	if ( a_iLength != sizeof(int) ) DISCONNECTONCOMMUNICATIONERROR;
	m_iHurryupCode = SDL_SwapBE32( ((int)a_pData) );
	}

	int CMortalNetworkImpl::GetHurryup()
	{
	int iRetval = m_iHurryupCode;
	m_iHurryupCode = -1;
	return iRetval;
	}




	struct SRoundOrder
	{
	int iWhoWon;
	bool bGameOver;
	};

	void CMortalNetworkImpl::SendRoundOver( int a_iWhoWon, bool a_bGameOver )
	{
	CHECKCONNECTION;
	SRoundOrder oPackage;

	oPackage.iWhoWon = a_iWhoWon;
	oPackage.bGameOver = a_bGameOver;
	SendRawData( 'O', &oPackage, sizeof(SRoundOrder) );

	if ( a_bGameOver )
	{
	m_enState = NS_CHARACTER_SELECTION;
	}
	}

	void CMortalNetworkImpl::ReceiveRoundOver( void* a_pData, int a_iLength )
	{
	if ( a_iLength != sizeof(SRoundOrder) ) DISCONNECTONCOMMUNICATIONERROR;
	SRoundOrder* poPackage = (SRoundOrder*) a_pData;
	m_iWhoWon = poPackage->iWhoWon;
	m_bGameOver = poPackage->bGameOver;
	m_bRoundOver = true;
	}

	bool CMortalNetworkImpl::IsRoundOver()
	{
	return m_bRoundOver;
	}

	bool CMortalNetworkImpl::IsGameOver()
	{
	return m_bGameOver;
	}

	int CMortalNetworkImpl::GetWhoWon()
	{
	return m_iWhoWon;
	}


	diff --git a/src/State.h b/src/State.h
	index d64cac3..e211a27 100644
	--- a/src/State.h
	+++ b/src/State.h
	@@ -1,63 +1,64 @@
	/***************************************************************************
	State.h - description
	-------------------
	begin : Mon Aug 12 2003
	copyright : (C) 2003 by upi
	email : upi@apocalypse.rulez.org
	***************************************************************************/


	#ifndef STATE_H
	#define STATE_H

	#include "SDL_mixer.h"
	#include "SDL_keysym.h"

	struct SState
	{
	enum TGameMode {
	IN_DEMO,
	IN_SINGLE,
	- IN_NETWORK,
	IN_MULTI,
	+ IN_NETWORK,
	+ IN_CHAT,
	} m_enGameMode;

	bool m_bQuitFlag; // true if quit event came
	const char* m_pcArgv0; // Set by main to argv[0]


	// CONFIGURATION VARIABLES

	int m_iGameTime; // Time of rounds in seconds.
	int m_iHitPoints; // The initial number of hit points.
	int m_iGameSpeed; // The speed of the game (fps = 1000/GameSpeed)

	bool m_bFullscreen; // True in fullscreen mode.

	int m_iChannels; // 1: mono, 2: stereo
	int m_iMixingRate; // The mixing rate, in kHz
	int m_iMixingBits; // 1: 8bit, 2: 16bit
	int m_iMusicVolume; // Volume of music; 0: off, 100: max
	int m_iSoundVolume; // Volume of sound effects; 0: off, 100: max

	int m_aiPlayerKeys[2][9]; // Player keysyms
	char m_acLanguage[10]; // Language ID (en,hu,fr,es,..)
	int m_iLanguageCode; // Non-persistend language code (set by backend based on the language)

	char m_acLatestServer[256]; // Last server
	bool m_bServer; // We were server in the last network game
	char m_acNick[128]; // The user name on the last server.

	SState();

	void Load();
	void Save();
	void ToggleFullscreen();
	void SetLanguage( const char* a_pcLanguage );
	void SetServer( const char* a_pcServer );
	};


	extern SState g_oState;

	#endif
	diff --git a/src/main.cpp b/src/main.cpp
	index 898a7ca..17f22d4 100644
	--- a/src/main.cpp
	+++ b/src/main.cpp
	@@ -1,383 +1,395 @@
	/***************************************************************************
	main.cpp - description
	-------------------
	begin : Wed Aug 22 10:18:47 CEST 2001
	copyright : (C) 2001 by upi
	email : upi@apocalypse.rulez.org
	***************************************************************************/


	#ifdef HAVE_CONFIG_H
	#include <config.h>
	#endif

	#include "PlayerSelect.h"

	#include "SDL_video.h"
	#include "sge_tt_text.h"
	#include "sge_bm_text.h"
	#include "sge_surface.h"
	#include "SDL.h"
	#include "SDL_image.h"

	#include <stdlib.h>
	#include <stdio.h>
	#include <string.h>
	#include <time.h>
	#include <string>

	#include "common.h"
	#include "gfx.h"
	#include "Audio.h"
	#include "RlePack.h"
	#include "Backend.h"
	#include "State.h"
	#include "FighterStats.h"
	#include "MortalNetwork.h"


	#ifdef _WINDOWS

	#undef DATADIR // GRRR.. windows keyword...
	#include <windows.h>
	#define DATADIR "../data"

	#endif

	_sge_TTFont* inkFont;
	_sge_TTFont* impactFont;
	_sge_TTFont* titleFont;
	+_sge_TTFont* chatFont;
	sge_bmpFont* fastFont;
	sge_bmpFont* creditsFont;
	sge_bmpFont* storyFont;

	SDL_Color Colors[] =
	{
	{ 0, 0, 0, 0 }, { 0, 0, 42, 0 }, { 0, 42, 0, 0 }, { 0, 42, 42, 0 },
	{ 42, 0, 0, 0 }, { 42, 0, 42, 0 }, { 63, 42, 0, 0 }, { 42, 42, 42, 0 },
	{ 21, 21, 21, 0 }, { 21, 21, 63, 0 }, { 21, 63, 21, 0 }, { 21, 63, 63, 0 },
	{ 63, 21, 21, 0 }, { 63, 21, 63, 0 }, { 63, 63, 21, 0 }, { 63, 63, 63, 0 }
	};


	void Complain( const char* a_pcError )
	{
	#ifdef _WINDOWS
	::MessageBoxA( 0, a_pcError, "OpenMortal", MB_ICONEXCLAMATION );
	#else
	fprintf( stderr, "%s", a_pcError );
	#endif
	}


	_sge_TTFont* LoadTTF( const char* a_pcFilename, int a_iSize )
	{
	std::string sPath = std::string(DATADIR) + "/fonts/" + a_pcFilename;
	_sge_TTFont* poFont = sge_TTF_OpenFont( sPath.c_str(), a_iSize );

	if ( NULL == poFont )
	{
	Complain( ("Couldn't load font: " + sPath).c_str() );
	}

	-
	-
	-
	-
	-
	return poFont;
	}


	sge_bmpFont* LoadBMPFont( const char* a_pcFilename )
	{
	std::string sPath = std::string(DATADIR) + "/fonts/" + a_pcFilename;
	sge_bmpFont* poFont = sge_BF_OpenFont( sPath.c_str(), SGE_BFSFONT \| SGE_BFTRANSP );
	if ( NULL == poFont )
	{
	Complain( ("Couldn't load font: " + sPath).c_str() );
	}
	return poFont;
	}


	int init( int iFlags )
	{
	if (SDL_Init(SDL_INIT_VIDEO /\| SDL_INIT_AUDIO/) < 0)
	{
	fprintf(stderr, "Failed to initialize SDL: %s\n", SDL_GetError());
	return -1;
	}
	atexit(SDL_Quit);

	int d = SDL_VideoModeOK(640, 480, 8, iFlags);
	if (d == 0)
	{
	fprintf(stderr, "requested video mode not available\n");
	// return -1;
	}

	gamescreen = SDL_SetVideoMode(640, 480, 8, iFlags);
	if (gamescreen == NULL)
	{
	fprintf(stderr, "failed to set video mode: %s\n", SDL_GetError());
	return -1;
	}

	SDL_WM_SetCaption( "OpenMortal", "OpenMortal" );
	std::string sPath = std::string(DATADIR) + "/gfx/icon.png";
	SDL_WM_SetIcon(IMG_Load(sPath.c_str()), NULL);
	SDL_ShowCursor( SDL_DISABLE );

	for ( int i=0; i<16; ++i ) { Colors[i].r =4; Colors[i].g =4; Colors[i].b *=4; }
	SDL_SetColors( gamescreen, Colors, 256-16, 16 );

	if ( sge_TTF_Init() )
	{
	fprintf(stderr, "couldn't start ttf engine: %s\n", SDL_GetError());
	return -1;
	}

	sge_TTF_AAOff();

	inkFont = LoadTTF( "aardvark.ttf", 20 );
	if ( !inkFont ) return -1;
	impactFont = LoadTTF( "bradybun.ttf", 20 ); // gooddogc.ttf, 20
	if ( !impactFont ) return -1;
	titleFont = LoadTTF( "deadgrit.ttf", 48 ); // deadgrit.ttf, 48
	if ( !titleFont ) return -1;
	+ chatFont = LoadTTF( "thin.ttf", 20 ); // deadgrit.ttf, 48
	+ if ( !chatFont ) return -1;

	fastFont = LoadBMPFont( "brandybun3.png" );
	if ( !fastFont ) return -1;
	creditsFont = LoadBMPFont( "CreditsFont2.png" );//"fangfont.png" );
	if ( !creditsFont ) return -1;
	storyFont = LoadBMPFont( "glossyfont.png" );
	if ( !storyFont ) return -1;

	return 0;
	}


	int init2()
	{
	if ( !g_oBackend.Construct() )
	{

	fprintf(stderr, "couldn't start backend.\n" );
	return -1;
	}
	return 0;
	}





	int DrawMainScreen()
	{
	SDL_Surface* background = LoadBackground( "Mortal.png", 240 );
	SDL_Rect r;
	r.x = r.y = 0;

	std::string sStaffFilename = DATADIR;
	sStaffFilename += "/characters/STAFF.DAT";
	RlePack pack( sStaffFilename.c_str(), 240 );
	pack.ApplyPalette();
	//SDL_SetColors( gamescreen, pack.getPalette(), 0, 240 );
	SDL_BlitSurface( background, NULL, gamescreen, &r );
	SDL_Flip( gamescreen );

	char* filename[15] = {
	"Jacint.pl", "Jozsi.pl", "Agent.pl", "Mrsmith.pl",
	"Sleepy.pl", "Tejszin.pl",
	"UPi.pl", "Zoli.pl", "Ulmar.pl", "Bence.pl",
	"Descant.pl", "Grizli.pl", "Sirpi.pl", "Macy.pl", "Cumi.pl" };
	int x[14] = {
	0, 26, 67, 125, 159, 209,
	249, 289, 358, 397, 451, 489, 532, 161 };
	int y[14] = {
	5, 4, 5, 5, 5, 7,
	4, 0, 7, 5, 5, 6, 5, 243 };

	int i;

	g_oBackend.PerlEvalF( "eval( \"require '%s/characters/Ambrus.pl';\" )", DATADIR );
	g_oBackend.PerlEvalF( "eval( \"require '%s/characters/Dani.pl';\" )", DATADIR );

	for ( i=0; i<15; ++i )
	{
	pack.Draw( i, x[i], y[i], false );
	SDL_Flip( gamescreen );
	if ( filename[i] != NULL )
	{
	debug( "Loading fighter %s", filename[i] );
	g_oBackend.PerlEvalF( "eval( \"require '%s/characters/%s';\" )", DATADIR, filename[i] );
	}
	}

	int retval = 0;
	i = 0;

	SDL_FreeSurface( background );
	return retval;

	}



	int main(int argc, char *argv[])
	{
	srand( (unsigned int)time(NULL) );
	if ( 0 != init2() )
	{
	fprintf( stderr, "init2() failed." );
	return -1;
	}

	g_oState.m_pcArgv0 = argv[0];
	g_oState.Load();
	CMortalNetwork::Create();

	bool bDebug = false;

	int iFlags = SDL_SWSURFACE \| SDL_HWPALETTE;
	if ( g_oState.m_bFullscreen )
	{
	iFlags \|= SDL_FULLSCREEN;
	}

	int i;
	for ( i=1; i<argc; ++i )
	{
	if ( !strcmp(argv[i], "-debug") )
	{
	bDebug = true;
	}
	else if ( !strcmp(argv[i], "-fullscreen") )
	{
	iFlags \|= SDL_FULLSCREEN;
	}
	else if ( !strcmp(argv[i], "-hwsurface") )
	{
	iFlags \|= SDL_HWSURFACE;
	}
	else if ( !strcmp(argv[i], "-doublebuf") )
	{
	iFlags \|= SDL_DOUBLEBUF;
	}
	else if ( !strcmp(argv[i], "-anyformat") )
	{
	iFlags \|= SDL_ANYFORMAT;
	}
	else
	{
	printf( "Usage: %s [-debug] [-fullscreen] [-hwsurface] [-doublebuf] [-anyformat]\n", argv[0] );
	return 0;
	}
	}

	if (init( iFlags )<0)
	{
	return -1;
	}

	g_oState.SetLanguage( g_oState.m_acLanguage );

	new MszAudio;
	// Audio->LoadMusic( "Last_Ninja_-_The_Wilderness.mid", "DemoMusic" );
	Audio->LoadMusic( "ride.mod", "DemoMusic" );
	Audio->PlayMusic( "DemoMusic" );
	Audio->LoadMusic( "2nd_pm.s3m", "GameMusic" );

	DrawMainScreen();

	g_oPlayerSelect.SetPlayer( 0, ZOLI );
	g_oPlayerSelect.SetPlayer( 1, SIRPI );

	/*
	int nextFighter = 0;
	int describeOrder[ (int)LASTFIGHTER ];

	for ( i=0; i<(int)LASTFIGHTER; ++i ) describeOrder[i] = i;
	for ( i=0; i<100; ++i )
	{
	int j = rand() % (int)LASTFIGHTER;
	int k = rand() % (int)LASTFIGHTER;
	int l;
	l = describeOrder[j];
	describeOrder[j] = describeOrder[k];
	describeOrder[k] = l;
	}
	*/

	/*
	{
	int iGameNumber=0;
	char acReplayFile[1024];

	for ( i=0; i<15; ++i )
	{
	sprintf( acReplayFile, DATADIR "/msz%i.replay", i );
	DrawTextMSZ( acReplayFile, impactFont, 10, 10, 0, C_WHITE, gamescreen );
	SDL_Delay(5000 );

	DoGame( acReplayFile, true, bDebug );
	}
	}
	+
	*/
	bool bNetworkGame = false;

	while ( 1 )
	{
	if ( g_oState.m_bQuitFlag ) break;
	- DoDemos();
	- if ( g_oState.m_bQuitFlag ) break;
	+
	+ switch ( g_oState.m_enGameMode )
	+ {
	+ case SState::IN_DEMO:
	+ DoDemos();
	+ continue;
	+ case SState::IN_CHAT:
	+ DoOnlineChat();
	+ continue;
	+ default:
	+ break; // Handled below.
	+ }
	+
	+ // Remaining are game modes: IN_SINGLE, IN_MULTI, IN_NETWORK

	Audio->PlaySample( "car_start.voc" );
	Audio->PlayMusic( "GameMusic" );

	bNetworkGame = false;

	- while ( g_oState.m_enGameMode != SState::IN_DEMO
	+ while ( g_oState.m_enGameMode != SState::IN_DEMO
	+ && g_oState.m_enGameMode != SState::IN_CHAT
	&& !g_oState.m_bQuitFlag )
	{
	bNetworkGame = SState::IN_NETWORK == g_oState.m_enGameMode;

	g_oPlayerSelect.DoPlayerSelect();
	if ( g_oState.m_bQuitFlag \|\| g_oState.m_enGameMode == SState::IN_DEMO ) break;

	//sprintf( acReplayFile, "/tmp/msz%d.replay", ++iGameNumber );

	int iGameResult = DoGame( NULL, false, bDebug );
	//int iGameResult = DoGame( acReplayFile, false, bDebug );
	//DoGame( acReplayFile, true, bDebug );
	if ( g_oState.m_bQuitFlag \|\| g_oState.m_enGameMode == SState::IN_DEMO ) break;

	debug ( "iGameResult = %d\n", iGameResult );

	if ( iGameResult >= 0 && !bNetworkGame )
	{
	GameOver( iGameResult );
	FighterStatsDemo oDemo( g_oPlayerSelect.GetPlayerInfo( iGameResult ).m_enFighter );
	oDemo.Run();
	}
	if ( g_oState.m_bQuitFlag \|\| g_oState.m_enGameMode == SState::IN_DEMO ) break;
	}

	if ( bNetworkGame && !g_oState.m_bQuitFlag )
	{
	DrawTextMSZ( "Connection closed.", inkFont, 320, 210, AlignHCenter \| UseShadow, C_WHITE, gamescreen );
	DrawTextMSZ( g_poNetwork->GetLastError(), impactFont, 320, 250, AlignHCenter \| UseShadow, C_WHITE, gamescreen );
	GetKey();
	}

	if ( g_oState.m_bQuitFlag ) break;
	Audio->PlayMusic( "DemoMusic" );
	}

	g_oState.Save();

	SDL_Quit();

	return EXIT_SUCCESS;
	}
	diff --git a/src/menu.cpp b/src/menu.cpp
	index e7a312d..2d61d11 100644
	--- a/src/menu.cpp
	+++ b/src/menu.cpp
	@@ -1,1187 +1,1248 @@
	/***************************************************************************
	menu.cpp - description
	-------------------
	begin : Sun Aug 3 2003
	copyright : (C) 2003 by upi
	email : upi@apocalypse.rulez.org
	***************************************************************************/

	#include "SDL.h"
	#include "SDL_video.h"

	#include "menu.h"
	#include "gfx.h"
	#include "State.h"
	#include "common.h"
	#include "Audio.h"
	#include "Backend.h"
	#include "sge_tt_text.h"
	#include "sge_surface.h"
	#include "MortalNetwork.h"

	#include <stdarg.h>


	enum
	{
	/* Master menu structure:
	MAIN MENU
	*/
	MENU_UNKNOWN,
	MENU_SURRENDER,
	MENU_SINGLE_PLAYER,
	MENU_EASY,
	MENU_MEDIUM,
	MENU_HARD,
	MENU_MULTI_PLAYER,
	MENU_NETWORK_GAME,
	MENU_SERVER,
	MENU_HOSTNAME,
	MENU_NICK,
	MENU_CONNECT,
	+ MENU_MORTALNET,
	MENU_CANCEL,
	MENU_OPTIONS,
	MENU_GAME_SPEED,
	MENU_GAME_TIME, // ( :30 - 5:00 )
	MENU_TOTAL_HIT_POINTS, // ( 25 - 1000 )
	MENU_SOUND,
	MENU_CHANNELS, // MONO / STEREO

	MENU_MIXING_RATE, // 11kHz / 22kHz / 44.1 kHz
	MENU_BITS, // 8 bit / 16 bit
	MENU_MUSIC_VOLUME, // (0% - 100%)
	MENU_SOUND_VOLUME, // (0% - 100%)
	MENU_SOUND_OK,
	MENU_FULLSCREEN,
	MENU_KEYS_RIGHT,
	MENU_KEYS_LEFT,
	MENU_OPTIONS_OK,
	MENU_LANGUAGE,
	MENU_INFO,
	MENU_QUIT, // (confirm)
	};


	const char* g_ppcGameTime[] = { "0:30", "0:45", "1:00", "1:15", "1:30", "1:45", "2:00", "3:00", "5:00", NULL };
	const int g_piGameTime[] = { 30, 45, 60, 75, 90, 105, 120, 180, 300 };

	const char* g_ppcHitPoints[] = { "BABY", "VERY LOW", "LOW", "NORMAL", "HIGH", "VERY HIGH", "NEAR IMMORTAL", NULL };
	const int g_piHitPoints[] = { 1, 10, 50, 100, 150, 200, 500 };
	const char* g_ppcGameSpeed[] = { "SNAIL RACE", "SLOW", "NORMAL", "TURBO", "KUNG-FU MOVIE", NULL };
	const int g_piGameSpeed[] = { 16, 14, 12, 10, 8 };
	const char* g_ppcChannels[] = { "MONO", "STEREO", NULL };
	const int g_piChannels[] = { 1, 2 };
	const char* g_ppcMixingRate[] = { "LOW", "MEDIUM", "HIGH", NULL };
	const int g_piMixingRate[] = { 1, 2, 3 };
	const char* g_ppcMixingBits[] = { "8 bit", "16 bit", NULL };
	const int g_piMixingBits[] = { 1, 2 };


	const char* g_ppcVolume[] = { "OFF", "10%", "20%", "30%", "40%", "50%", "60%", "70%", "80%", "90%", "100%", NULL };
	const int g_piVolume[] = { 0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100 };

	const char* g_ppcLanguage[] = { "English", "Spanish", "Francais", "Magyar", NULL };
	const int g_piLanguage[] = { 0, 1, 2, 3 };
	const char* g_ppcLanguageCodes[] = { "en", "es", "fr", "hu" };

	const char* g_ppcServer[] = { "Connect to game", "Create game", NULL };
	int g_piServer[] = { 0, 1 };


	SDL_Surface* poBackground = NULL;



	void InputKeys( int a_iPlayerNumber )
	{
	SDL_BlitSurface( poBackground, NULL, gamescreen, NULL );
	DrawGradientText( "Input keys", titleFont, 10, gamescreen );
	SDL_Flip( gamescreen );

	static const char* apcKeyNames[9] = { "up", "down", "left", "right", "block",
	"low punch", "high punch", "low kick", "high kick" };
	char acBuffer[1024];
	char acSide[128];
	char acFormat[128];
	int iY = 75;
	int iYIncrement = 35;
	SDLKey enKey;

	DrawTextMSZ( "Press Escape to abort", inkFont, 320, iY, AlignHCenter\|UseShadow, C_LIGHTGRAY, gamescreen );
	iY += iYIncrement + 10;

	strcpy( acSide, Translate(a_iPlayerNumber ? "Left" : "Right") );
	strcpy( acFormat, Translate("%s player-'%s'?") );

	for ( int i=0; i<9; ++i )
	{
	// 1. PRINT THE FONT AND THE CURRENT KEYSYM
	sprintf( acBuffer, acFormat, acSide, Translate(apcKeyNames[i]) );
	int w = DrawTextMSZ( acBuffer, inkFont, 10, iY, UseShadow, C_WHITE, gamescreen );
	enKey = (SDLKey) g_oState.m_aiPlayerKeys[a_iPlayerNumber][i];
	g_oBackend.PerlEvalF( "GetKeysym(%d);", enKey );
	DrawTextMSZ( g_oBackend.GetPerlString("keysym"), inkFont, w+30, iY, UseShadow, C_LIGHTCYAN, gamescreen );

	// 2. INPUT THE NEW KEY

	enKey = GetKey();

	if ( SDLK_ESCAPE == enKey )
	{
	SDL_BlitSurface( poBackground, NULL, gamescreen, NULL );
	SDL_Flip( gamescreen );

	return;
	}

	// 3. PRINT THE NEW KEY

	g_oState.m_aiPlayerKeys[a_iPlayerNumber][i] = enKey;

	g_oBackend.PerlEvalF( "GetKeysym(%d);", enKey );
	sge_Blit( poBackground, gamescreen, w+10, iY, w+10, iY, 640, 50 );
	DrawTextMSZ( g_oBackend.GetPerlString("keysym"), inkFont, w+30, iY, UseShadow, C_WHITE, gamescreen );
	sge_UpdateRect( gamescreen, w+10, iY, 640, 50 );
	iY += iYIncrement;
	}

	DrawTextMSZ( "Thanks!", inkFont, 320, iY + 20, UseShadow \| AlignCenter, C_WHITE, gamescreen );
	GetKey();
	SDL_BlitSurface( poBackground, NULL, gamescreen, NULL );
	SDL_Flip( gamescreen );
	}




	+
	+
	+
	+
	/***************************************************************************
	NETWORK MENU DEFINITION
	***************************************************************************/

	-static int g_iMessageY;
	+int g_iMessageY;
	static char g_acMessageBuffer[1024];


	void MortalNetworkResetMessages( bool a_bClear )
	{
	if ( a_bClear )
	{
	SDL_FillRect( gamescreen, NULL, C_BLACK );
	SDL_Flip( gamescreen );
	g_iMessageY = 185;
	}
	else
	{
	g_iMessageY = 185;
	}
	}

	void MortalNetworkMessage( const char* format, ... )
	{
	char acBuffer[1024];
	va_list ap;
	va_start( ap, format );
	vsnprintf( acBuffer, 1023, format, ap );
	va_end( ap );
	DrawTextMSZ( acBuffer, impactFont, 20, g_iMessageY, 0, C_LIGHTGRAY, gamescreen );
	g_iMessageY += 25;
	}


	bool MortalNetworkCheckKey()
	{
	SDL_Event event;
	while (SDL_PollEvent(&event))
	{
	switch (event.type)
	{
	case SDL_QUIT:
	g_oState.m_bQuitFlag = true;
	return true;

	case SDL_KEYDOWN:
	{
	return true;
	}
	break;
	} // switch statement
	} // Polling events

	return false;
	}



	+bool Connect( const char* a_pcHostname )
	+{
	+ MortalNetworkResetMessages( false );
	+ bool bOK = g_poNetwork->Start( a_pcHostname );
	+
	+ if ( bOK )
	+ {
	+ // Store these settings as they are pretty good.
	+ g_oState.SetServer( a_pcHostname );
	+ g_oState.m_enGameMode = SState::IN_NETWORK;
	+ }
	+ else
	+ {
	+ // Print error message
	+ const char* acError = g_poNetwork->GetLastError();
	+ DrawTextMSZ( "Couldn't connect", inkFont, 320, g_iMessageY, AlignHCenter\|UseShadow, C_LIGHTRED, gamescreen );
	+ DrawTextMSZ( acError, impactFont, 320, g_iMessageY + 40, AlignHCenter\|UseShadow, C_LIGHTRED, gamescreen, false );
	+ }
	+
	+ // Wait for a key, unless Quit was issued.
	+
	+ if ( !g_oState.m_bQuitFlag )
	+ {
	+ if ( bOK )
	+ {
	+ // Wait for 1 sec, or keystroke.
	+ for ( int i=0; i<10; ++i )
	+ {
	+ if ( MortalNetworkCheckKey() ) break;
	+ SDL_Delay( 100 );
	+ }
	+ }
	+ else
	+ {
	+ GetKey();
	+ }
	+ }
	+
	+ if ( g_oState.m_bQuitFlag )
	+ {
	+ bOK = false;
	+ }
	+
	+ return bOK;
	+}
	+
	+
	+
	const char* FindString( const char* a_ppcNames[], const int a_piValues[], int a_iValue )
	{
	for ( int i=0; NULL != a_ppcNames[i]; ++i )
	{
	if ( a_iValue == a_piValues[i] )
	{
	return a_ppcNames[i];
	}
	}
	+
	return "(unknown)";
	}



	const char* GetGameTimeString( int a_iValue )
	{
	strcpy( g_acMessageBuffer, Translate("GAME TIME: ") );
	strcat( g_acMessageBuffer, Translate(FindString( g_ppcGameTime, g_piGameTime, a_iValue)) );
	return g_acMessageBuffer;
	}

	const char* GetGameSpeedString( int a_iValue )
	{
	strcpy( g_acMessageBuffer, Translate("GAME SPEED: ") );
	strcat( g_acMessageBuffer, Translate(FindString( g_ppcGameSpeed, g_piGameSpeed, a_iValue)) );
	return g_acMessageBuffer;
	}

	const char* GetHitPointsString( int a_iValue )
	{
	strcpy( g_acMessageBuffer, Translate("STAMINA: ") );
	strcat( g_acMessageBuffer, Translate(FindString( g_ppcHitPoints, g_piHitPoints, a_iValue) ) );
	return g_acMessageBuffer;
	}





	-class CNetworkMenu: public Menu
	+
	+CNetworkMenu::CNetworkMenu(): Menu( "Network Play Setup" )
	{
	-public:
	- CNetworkMenu(): Menu( "Network Play Setup" )
	- {
	- m_bOK = false;
	- m_bServer = g_oState.m_bServer;
	- m_sHostname = g_oState.m_acLatestServer;
	- m_sNick = g_oState.m_acNick;
	-
	- AddMenuItem( "START NETWORK GAME!", SDLK_UNKNOWN, MENU_CONNECT );
	- m_poNickMenuItem = AddTextMenuItem( "Nickname: ", m_sNick.c_str(), MENU_NICK );
	- AddEnumMenuItem( "Network mode: ", m_bServer ? 1 : 0, g_ppcServer, g_piServer, MENU_SERVER );
	- m_poServerMenuItem = AddTextMenuItem( "Connect to: ", m_sHostname.c_str(), MENU_HOSTNAME );
	- m_poServerMenuItem->SetEnabled(!m_bServer);
	-
	- MenuItem* poItem = AddMenuItem( "Cancel", SDLK_UNKNOWN, MENU_CANCEL );
	- SDL_Rect oRect;
	- oRect.x = gamescreen->w - 150; oRect.w = 150;
	- oRect.y = gamescreen->h - 50; oRect.h = 30;
	- poItem->SetPosition( oRect );
	- }
	+ m_bOK = false;
	+ m_bServer = g_oState.m_bServer;
	+ m_sHostname = g_oState.m_acLatestServer;
	+ m_sNick = g_oState.m_acNick;
	+
	+ AddMenuItem( "Find an opponent on MortalNet", SDLK_UNKNOWN, MENU_MORTALNET );
	+ AddMenuItem( "START NETWORK GAME!", SDLK_UNKNOWN, MENU_CONNECT );
	+ m_poNickMenuItem = AddTextMenuItem( "Nickname: ", m_sNick.c_str(), MENU_NICK );
	+ AddEnumMenuItem( "Network mode: ", m_bServer ? 1 : 0, g_ppcServer, g_piServer, MENU_SERVER );
	+ m_poServerMenuItem = AddTextMenuItem( "Connect to: ", m_sHostname.c_str(), MENU_HOSTNAME );
	+ m_poServerMenuItem->SetEnabled(!m_bServer);
	+
	+ MenuItem* poItem = AddMenuItem( "Cancel", SDLK_UNKNOWN, MENU_CANCEL );
	+ SDL_Rect oRect;
	+ oRect.x = gamescreen->w - 150; oRect.w = 150;
	+ oRect.y = gamescreen->h - 50; oRect.h = 30;
	+ poItem->SetPosition( oRect );
	+}

	- ~CNetworkMenu() {}
	+CNetworkMenu::~CNetworkMenu() {}

	- void Connect()
	+void CNetworkMenu::Connect()
	+{
	+ Clear();
	+ SDL_Flip( gamescreen );
	+
	+ m_bOK = ::Connect( m_bServer ? NULL : m_sHostname.c_str() );
	+
	+ if ( g_oState.m_bQuitFlag \|\| m_bOK )
	{
	- Clear();
	- SDL_Flip( gamescreen );
	-
	- MortalNetworkResetMessages( false );
	- strcpy( g_oState.m_acNick, m_sNick.c_str() );
	- m_bOK = g_poNetwork->Start( m_bServer ? NULL : m_sHostname.c_str() );
	+ m_bDone = true;
	+ m_iReturnCode = 100;
	+ }
	+ Clear();
	+ Draw();
	+}

	- if ( m_bOK )
	- {
	- g_oState.SetServer( m_bServer ? NULL : m_sHostname.c_str() );
	- g_oState.m_enGameMode = SState::IN_NETWORK;
	- m_bDone = true;
	- m_iReturnCode = 100;
	- }
	- else
	- {
	- const char* acError = g_poNetwork->GetLastError();
	- DrawTextMSZ( "Couldn't connect", inkFont, 320, g_iMessageY, AlignHCenter\|UseShadow, C_LIGHTRED, gamescreen );
	- DrawTextMSZ( acError, impactFont, 320, g_iMessageY + 40, AlignHCenter\|UseShadow, C_LIGHTRED, gamescreen, false );
	- }
	+void Menu::EnterName( const char* a_pcTitle, std::string& a_rsTarget, TextMenuItem* a_poMenuItem, int a_iMaxlen )
	+{
	+ Clear();
	+ Draw();

	- if ( !g_oState.m_bQuitFlag )
	- {
	- if ( m_bOK )
	- {
	- // Wait for 1 sec, or keystroke.
	- for ( int i=0; i<10; ++i )
	- {
	- if ( MortalNetworkCheckKey() ) break;
	- SDL_Delay( 100 );
	- }
	- }
	- else
	- {
	- GetKey();
	- }
	- Clear();
	- Draw();
	- }
	+ if ( a_iMaxlen > 255 ) a_iMaxlen = 255;
	+ char acBuffer[256];
	+ strncpy( acBuffer, a_rsTarget.c_str(), 255 );
	+ acBuffer[255] = 0;

	- if ( g_oState.m_bQuitFlag )
	- {
	- m_bDone = true;
	- m_iReturnCode = 100;
	- }
	- }
	+ int y = m_oItems.size() * 40 + 100;
	+ int x = DrawTextMSZ( a_pcTitle, impactFont, 20, y, 0, C_WHITE, gamescreen );

	- void EnterName( const char* a_pcTitle, std::string& a_rsTarget, TextMenuItem* a_poMenuItem, int a_iMaxlen )
	+ int iRetval;
	{
	- Clear();
	- Draw();
	-
	- if ( a_iMaxlen > 255 ) a_iMaxlen = 255;
	- char acBuffer[256];
	- strncpy( acBuffer, a_rsTarget.c_str(), 255 );
	- acBuffer[255] = 0;
	+ CReadline oReadline( gamescreen, impactFont, acBuffer, strlen(acBuffer), a_iMaxlen,
	+ 20+x, y + sge_TTF_FontAscent(impactFont), 600, C_LIGHTCYAN, C_BLACK, 255 );
	+ iRetval = oReadline.Execute();
	+ }

	- int x = DrawTextMSZ( a_pcTitle, impactFont, 20, 305, 0, C_WHITE, gamescreen );
	+ if ( iRetval == -1 )
	+ {
	+ m_bDone = true;
	+ m_iReturnCode = 100;
	+ g_oState.m_bQuitFlag = true;
	+ }
	+ if ( iRetval > 0 )
	+ {
	+ a_rsTarget = acBuffer;
	+ a_poMenuItem->SetValue( acBuffer );
	+ }
	+ Clear();
	+ Draw();
	+}

	- int iRetval;
	+void CNetworkMenu::ItemActivated( int a_iItemCode, MenuItem* a_poMenuItem )
	+{
	+ switch ( a_iItemCode )
	+ {
	+ case MENU_SERVER:
	+ {
	+ EnumMenuItem* poItem = (EnumMenuItem*) a_poMenuItem;
	+ if ( m_bServer )
	{
	- CReadline oReadline( gamescreen, impactFont, acBuffer, strlen(acBuffer), a_iMaxlen,
	- 20+x, 305 + sge_TTF_FontAscent(impactFont), 600, C_LIGHTCYAN, C_BLACK, 255 );
	- iRetval = oReadline.Execute();
	+ poItem->Decrement();
	}
	-
	- if ( iRetval == -1 )
	- {
	- m_bDone = true;
	- m_iReturnCode = 100;
	- g_oState.m_bQuitFlag = true;
	- }
	- if ( iRetval > 0 )
	+ else
	{
	- a_rsTarget = acBuffer;
	- a_poMenuItem->SetValue( acBuffer );
	+ poItem->Increment();
	}
	- Clear();
	- Draw();
	+ break;
	}

	- void ItemActivated( int a_iItemCode, MenuItem* a_poMenuItem )
	- {
	- switch ( a_iItemCode )
	- {
	- case MENU_SERVER:
	- {
	- EnumMenuItem* poItem = (EnumMenuItem*) a_poMenuItem;
	- if ( m_bServer )
	- {
	- poItem->Decrement();
	- }
	- else
	- {
	- poItem->Increment();
	- }
	- break;
	- }
	-
	- case MENU_CONNECT:
	- Connect();
	- break;
	+ case MENU_CONNECT:
	+ strcpy( g_oState.m_acNick, m_sNick.c_str() );
	+ Connect();
	+ break;

	- case MENU_CANCEL:
	- m_bOK = false;
	- m_bDone = true;
	- m_iReturnCode = -1;
	- break;
	+ case MENU_CANCEL:
	+ m_bOK = false;
	+ m_bDone = true;
	+ m_iReturnCode = -1;
	+ break;

	- case MENU_HOSTNAME:
	- EnterName( "Server name: ", m_sHostname, m_poServerMenuItem,128 );
	- break;
	+ case MENU_HOSTNAME:
	+ EnterName( "Server name: ", m_sHostname, m_poServerMenuItem,128 );
	+ break;

	- case MENU_NICK:
	- EnterName( "Nickname: ", m_sNick, m_poNickMenuItem, 12 );
	- break;
	- }
	+ case MENU_NICK:
	+ EnterName( "Nickname: ", m_sNick, m_poNickMenuItem, 12 );
	+ strcpy( g_oState.m_acNick, m_sNick.c_str() );
	+ break;
	+
	+ case MENU_MORTALNET:
	+ g_oState.m_enGameMode = SState::IN_CHAT;
	+ m_bOK = false;
	+ m_bDone = true;
	+ m_iReturnCode = 100;
	+ break;
	}
	+}

	- void ItemChanged( int a_iItemCode, int a_iValue, MenuItem* a_poMenuItem )
	+void CNetworkMenu::ItemChanged( int a_iItemCode, int a_iValue, MenuItem* a_poMenuItem )
	+{
	+ switch ( a_iItemCode )
	{
	- switch ( a_iItemCode )
	- {
	- case MENU_SERVER:
	- m_bServer = a_iValue;
	- m_poServerMenuItem->SetEnabled(!m_bServer);
	- break;
	- }
	+ case MENU_SERVER:
	+ m_bServer = a_iValue;
	+ m_poServerMenuItem->SetEnabled(!m_bServer);
	+ break;
	}
	+}


	-protected:
	- bool m_bOK;
	- bool m_bServer;
	- std::string m_sHostname;
	- std::string m_sNick;
	-
	- TextMenuItem* m_poServerMenuItem;
	- TextMenuItem* m_poNickMenuItem;
	-};




	/***************************************************************************
	MENUITEM DEFINITION
	***************************************************************************/



	MenuItem::MenuItem( Menu* a_poMenu, const char* a_pcUtf8Text, int a_iCode )
	: m_sUtf8Text( a_pcUtf8Text )
	{
	m_poMenu = a_poMenu;
	m_iCode = a_iCode;

	m_oPosition.x = m_oPosition.y = 100;
	m_oPosition.w = m_oPosition.h = 100;
	m_bCenter = true;
	m_iHighColor = C_WHITE;
	m_iLowColor = C_LIGHTGRAY;
	m_iInactiveColor = C_DARKGRAY;
	m_iBackgroundColor = C_BLACK;
	m_bActive = false;
	m_bEnabled = true;

	}


	MenuItem::~MenuItem()
	{
	}

	void MenuItem::Draw()
	{
	if ( NULL != poBackground )
	{
	SDL_BlitSurface( poBackground, &m_oPosition, gamescreen, &m_oPosition );
	}
	else
	{
	SDL_FillRect( gamescreen, &m_oPosition, 0 );
	}


	int iX = m_oPosition.x;
	int iY = m_oPosition.y;

	if ( m_bCenter )
	{
	iX += m_oPosition.w / 2;
	}

	DrawTextMSZ( m_sUtf8Text.c_str(), inkFont, iX, iY,
	UseTilde \| UseShadow \| (m_bCenter ? AlignHCenter : 0),
	m_bEnabled ? (m_bActive ? m_iHighColor : m_iLowColor) : m_iInactiveColor,
	gamescreen );

	SDL_UpdateRect( gamescreen, m_oPosition.x, m_oPosition.y, m_oPosition.w, m_oPosition.h );
	}


	void MenuItem::Clear()
	{
	// debug( "Clear: %d:%d %dx%d\n", m_oPosition.x, m_oPosition.y, m_oPosition.w, m_oPosition.h );
	if (poBackground )
	{
	SDL_Rect oDest = m_oPosition;
	SDL_BlitSurface( poBackground, &m_oPosition, gamescreen, &oDest );
	}
	else
	{
	SDL_FillRect( gamescreen, &m_oPosition, C_WHITE );

	}

	SDL_UpdateRect( gamescreen, m_oPosition.x, m_oPosition.y, m_oPosition.w, m_oPosition.h );
	}


	void MenuItem::Activate()
	{
	if ( m_poMenu )
	{
	m_poMenu->ItemActivated( m_iCode, this );
	}
	}



	void MenuItem::SetText( const char* a_pcUtf8Text, bool a_bCenter )
	{
	m_sUtf8Text = a_pcUtf8Text;
	m_bCenter = a_bCenter;
	Draw();
	}

	void MenuItem::SetPosition( const SDL_Rect& a_roPosition )
	{
	m_oPosition = a_roPosition;
	}

	void MenuItem::SetActive( bool a_bActive )
	{
	if ( m_bActive == a_bActive )
	{
	return;
	}
	m_bActive = a_bActive;
	Draw();
	}

	void MenuItem::SetEnabled( bool a_bEnabled )
	{
	if ( m_bEnabled == a_bEnabled )
	{
	return;
	}
	m_bEnabled = a_bEnabled;
	Draw();
	}




	/***************************************************************************
	ENUMMENUITEM DEFINITION
	***************************************************************************/



	EnumMenuItem::EnumMenuItem( Menu* a_poMenu, int a_iInitialValue, const char* a_pcUtf8Text, int a_iCode )
	: MenuItem( a_poMenu, a_pcUtf8Text, a_iCode )
	{
	m_sUtf8Title = a_pcUtf8Text;
	m_iMax = -1;
	m_iValue = a_iInitialValue;
	}

	EnumMenuItem::~EnumMenuItem()
	{
	}
	-
	+
	+
	+int EnumMenuItem::GetCurrentValue()
	+{
	+ return m_iValue <= m_iMax ? m_piValues[m_iValue] : 0;
	+}
	+
	+
	+const char* EnumMenuItem::GetCurrentText()
	+{
	+ return m_iValue <= m_iMax ? m_ppcNames[m_iValue] : "";
	+}
	+

	void EnumMenuItem::Draw()
	{
	m_sUtf8Text = Translate( m_sUtf8Title.c_str() );
	if ( m_iValue <= m_iMax )
	{
	m_sUtf8Text += Translate(m_ppcNames[m_iValue]);
	}
	if ( m_iValue > 0 )
	{
	m_sUtf8Text = "< " + m_sUtf8Text;
	}
	if ( m_iValue < m_iMax )
	{
	m_sUtf8Text += " >";
	}

	MenuItem::Draw();
	}



	void EnumMenuItem::Increment()
	{
	if ( m_iValue < m_iMax )
	{
	++m_iValue;
	Draw();
	m_poMenu->ItemChanged( m_iCode, m_piValues[m_iValue], this );
	Audio->PlaySample( "ding.voc" );
	}
	}



	void EnumMenuItem::Decrement()
	{
	if ( m_iValue > 0 )
	{
	--m_iValue;
	Draw();
	m_poMenu->ItemChanged( m_iCode, m_piValues[m_iValue], this );
	Audio->PlaySample( "ding.voc" );
	}
	}




	void EnumMenuItem::SetEnumValues( const char ** a_ppcNames, const int * a_piValues )
	{
	m_ppcNames = a_ppcNames;
	m_piValues = a_piValues;

	int i;
	bool bFoundValue = false;


	for ( i=0; NULL != a_ppcNames[i]; ++i )
	{
	if ( !bFoundValue &&
	m_iValue == a_piValues[i] )
	{
	bFoundValue = true;
	m_iValue = i;
	}
	}

	if ( !bFoundValue )
	{
	m_iValue = 0;
	}

	m_iMax = i-1;
	}






	/***************************************************************************
	TextMenuItem DEFINITION
	***************************************************************************/



	TextMenuItem::TextMenuItem( Menu* a_poMenu, const char* a_pcInitialValue, const char* a_pcUtf8Title, int a_iCode )
	: MenuItem( a_poMenu, a_pcUtf8Title, a_iCode )

	{
	m_sTitle = a_pcUtf8Title;
	m_sValue = a_pcInitialValue;
	}


	TextMenuItem::~TextMenuItem()
	{
	}


	void TextMenuItem::Draw()
	{
	m_sUtf8Text = Translate( m_sTitle.c_str() );
	m_sUtf8Text += m_sValue;

	MenuItem::Draw();
	}


	void TextMenuItem::SetValue( const char* a_pcValue )
	{
	m_sValue = a_pcValue;
	Draw();
	}









	/***************************************************************************

	MENU DEFINITION
	***************************************************************************/



	Menu::Menu( const char* a_pcTitle )
	: m_sTitle( a_pcTitle )
	{
	m_iCurrentItem = 0;
	m_iReturnCode = -1;
	m_bDone = false;
	}


	Menu::~Menu()
	{
	ItemIterator it;

	for ( it = m_oItems.begin(); it != m_oItems.end(); ++it )
	{
	delete *it;
	}
	}


	MenuItem* Menu::AddMenuItem( const char* a_pcUtf8Text, SDLKey a_tShortcut, int a_iCode )
	{
	MenuItem* poItem = new MenuItem( this, a_pcUtf8Text, a_iCode );
	return AddMenuItem( poItem );
	}



	EnumMenuItem* Menu::AddEnumMenuItem( const char* a_pcUtf8Text, int a_iInitialValue,
	const char** a_ppcNames, const int* a_piValues, int a_iCode )
	{
	EnumMenuItem* poItem = new EnumMenuItem( this, a_iInitialValue, a_pcUtf8Text, a_iCode );
	poItem->SetEnumValues( a_ppcNames, a_piValues );

	AddMenuItem( poItem );
	return poItem;
	}


	TextMenuItem* Menu::AddTextMenuItem( const char* a_pcTitle, const char* a_pcValue, int a_iCode )
	{
	TextMenuItem* poItem = new TextMenuItem( this, a_pcValue, a_pcTitle, a_iCode );
	AddMenuItem( poItem );
	return poItem;
	}




	MenuItem* Menu::AddMenuItem( MenuItem* a_poItem )
	{
	m_oItems.push_back( a_poItem );

	SDL_Rect oRect;
	oRect.x = 0; oRect.w = gamescreen->w;
	oRect.y = m_oItems.size() * 40 + 100;
	- oRect.h = 43;
	+ oRect.h = sge_TTF_FontHeight( inkFont );

	a_poItem->SetPosition( oRect );

	return a_poItem;
	}


	void Menu::AddOkCancel( int a_iOkCode )
	{
	SDL_Rect oRect;
	oRect.x = 0; oRect.w = 150;
	- oRect.y = gamescreen->h - 50; oRect.h = 30;
	+ oRect.y = gamescreen->h - 50; oRect.h = sge_TTF_FontHeight( inkFont );

	MenuItem* poItem = AddMenuItem( "~OK", SDLK_o, a_iOkCode );
	poItem->SetPosition( oRect );

	// poItem = AddMenuItem( "Cancel", SDLK_UNKNOWN, 0 );
	oRect.x = gamescreen->w - 150;
	poItem->SetPosition( oRect );
	}


	void Menu::InvokeSubmenu( Menu* a_poMenu )
	{
	Audio->PlaySample( "strange_button.voc" );
	Clear();

	m_iReturnCode = a_poMenu->Run();
	if ( g_oState.m_bQuitFlag )
	{
	m_iReturnCode = 100;
	m_bDone = true;
	}

	if ( m_iReturnCode < 0 )
	{
	Audio->PlaySample( "pop.voc" );
	Draw();
	}
	else
	{
	m_iReturnCode --;
	m_bDone = true;
	}
	}


	void Menu::ItemActivated( int a_iItemCode, MenuItem* a_poMenuItem )
	{
	debug( "Menu::ItemActivated( %d )\n", a_iItemCode );

	switch ( a_iItemCode )
	{
	case MENU_QUIT:
	m_bDone = true;

	m_iReturnCode = 100;
	g_oState.m_bQuitFlag = true;
	break;

	case MENU_SURRENDER:
	m_bDone = true;
	m_iReturnCode = 100;
	if ( SState::IN_NETWORK == g_oState.m_enGameMode )
	{
	g_poNetwork->Stop();
	}
	g_oState.m_enGameMode = SState::IN_DEMO;
	break;

	case MENU_NETWORK_GAME:
	{
	Menu* poMenu = new CNetworkMenu();
	InvokeSubmenu( poMenu );
	delete poMenu;
	break;
	}

	case MENU_MULTI_PLAYER:
	m_bDone = true;
	m_iReturnCode = 100;
	g_oState.m_enGameMode = SState::IN_MULTI;
	break;

	case MENU_FULLSCREEN:
	Audio->PlaySample( "strange_button.voc" );
	g_oState.ToggleFullscreen();
	if ( NULL != poBackground )
	{
	SDL_BlitSurface( poBackground, NULL, gamescreen, NULL );
	}
	else
	{
	SDL_FillRect( gamescreen, NULL, 0 );
	}
	a_poMenuItem->SetText( g_oState.m_bFullscreen ? "~FULLSCREEN ON" : "~FULLSCREEN OFF", true );
	Draw();
	break;

	case MENU_OPTIONS_OK:
	m_bDone = true;
	m_iReturnCode = -1;
	break;

	case MENU_OPTIONS:
	{
	Menu* poMenu = new Menu( "Options" );
	if ( g_oState.m_enGameMode != SState::IN_NETWORK \|\| g_poNetwork->IsMaster() )
	{
	poMenu->AddEnumMenuItem( "GAME SPEED: ", g_oState.m_iGameSpeed, g_ppcGameSpeed, g_piGameSpeed, MENU_GAME_SPEED );
	poMenu->AddEnumMenuItem( "GAME TIME: ", g_oState.m_iGameTime, g_ppcGameTime, g_piGameTime, MENU_GAME_TIME );
	poMenu->AddEnumMenuItem( "STAMINA: ", g_oState.m_iHitPoints, g_ppcHitPoints, g_piHitPoints, MENU_TOTAL_HIT_POINTS );
	}
	poMenu->AddMenuItem( "~SOUND", SDLK_s, MENU_SOUND );
	poMenu->AddMenuItem( g_oState.m_bFullscreen ? "~FULLSCREEN ON" : "~FULLSCREEN OFF", SDLK_f, MENU_FULLSCREEN );
	poMenu->AddMenuItem( "~RIGHT PLAYER KEYS", SDLK_r, MENU_KEYS_RIGHT );
	poMenu->AddMenuItem( "~LEFT PLAYER KEYS", SDLK_l, MENU_KEYS_LEFT );
	poMenu->AddOkCancel( MENU_OPTIONS_OK );

	InvokeSubmenu( poMenu );
	delete poMenu;
	break;
	}

	case MENU_SOUND:
	{
	Menu* poMenu = new Menu( "Sound" );
	poMenu->AddEnumMenuItem( "CHANNELS: ", 1, g_ppcChannels, g_piChannels, MENU_CHANNELS )->SetEnabled(false);
	poMenu->AddEnumMenuItem( "SOUND QUALITY: ", 2, g_ppcMixingRate, g_piMixingRate, MENU_MIXING_RATE )->SetEnabled(false);
	poMenu->AddEnumMenuItem( "SOUND FIDELITY: ", 2, g_ppcMixingBits, g_piMixingBits, MENU_BITS )->SetEnabled(false);
	poMenu->AddEnumMenuItem( "MUSIC VOLUME: ", g_oState.m_iMusicVolume, g_ppcVolume, g_piVolume, MENU_MUSIC_VOLUME );
	poMenu->AddEnumMenuItem( "EFFECTS VOLUME: ", g_oState.m_iSoundVolume, g_ppcVolume, g_piVolume, MENU_SOUND_VOLUME );
	poMenu->AddOkCancel( MENU_SOUND_OK );

	InvokeSubmenu( poMenu );
	delete poMenu;
	break;
	}

	case MENU_SOUND_OK:
	m_bDone = true;
	m_iReturnCode = -1;
	break;

	case MENU_KEYS_LEFT:
	InputKeys(1);
	Draw();
	break;

	case MENU_KEYS_RIGHT:
	InputKeys(0);
	Draw();
	break;

	default:
	break;

	}
	}



	void Menu::ItemChanged( int a_iItemCode, int a_iValue, MenuItem* a_poMenuItem )
	{
	debug( "Menu::ItemChanged( %d, %d )\n", a_iItemCode, a_iValue );

	switch ( a_iItemCode )
	{
	case MENU_MUSIC_VOLUME:
	g_oState.m_iMusicVolume = a_iValue;
	Audio->SetMusicVolume( a_iValue );
	break;

	case MENU_SOUND_VOLUME:
	g_oState.m_iSoundVolume = a_iValue;
	break;

	case MENU_GAME_TIME:
	g_oState.m_iGameTime = a_iValue;
	break;

	case MENU_GAME_SPEED:
	g_oState.m_iGameSpeed = a_iValue;
	break;

	case MENU_TOTAL_HIT_POINTS:
	g_oState.m_iHitPoints = a_iValue;
	break;

	case MENU_LANGUAGE:
	g_oState.SetLanguage( g_ppcLanguageCodes[ a_iValue ] );
	Clear();
	Draw();
	break;
	} // end of switch a_iItemCode
	}


	/** Run executes the menus, maybe invoking submenus as well. The
	menus modify the global game state.

	Returns 0, or the number of parent menus that should be cleared. */

	int Menu::Run()
	{
	if ( m_oItems[m_iCurrentItem]->GetEnabled() )
	{
	m_oItems[m_iCurrentItem]->SetActive(true);
	}
	else
	{
	FocusNext();
	}

	Draw();

	while ( !m_bDone )
	{
	+ if ( g_oState.m_bQuitFlag )
	+ {
	+ m_bDone = true;
	+ m_iReturnCode = -1;
	+ break;
	+ }
	+
	SDLKey enKey = GetKey();

	if ( g_oState.m_bQuitFlag \|\|
	SDLK_ESCAPE == enKey )
	-
	+
	{
	m_bDone = true;
	m_iReturnCode = -1;
	break;
	}

	switch ( enKey )
	{
	case SDLK_UP:
	{
	FocusPrev();
	break;
	} // end of SDLK_UP


	case SDLK_DOWN:
	{
	FocusNext();
	break;
	} // end of SDLK_DOWN

	case SDLK_LEFT:
	{
	MenuItem* poItem = m_oItems[m_iCurrentItem];
	poItem->Decrement();
	break;
	}

	case SDLK_RIGHT:
	{
	MenuItem* poItem = m_oItems[m_iCurrentItem];
	poItem->Increment();
	break;
	}


	case SDLK_RETURN:
	{
	MenuItem* poItem = m_oItems[m_iCurrentItem];
	if ( poItem->GetEnabled() )
	{
	poItem->Activate();
	}
	}

	default:
	break;
	} // end of switch
	}

	Clear();

	return m_iReturnCode;
	}



	void Menu::Draw()
	{
	DrawGradientText( m_sTitle.c_str(), titleFont, 20, gamescreen );

	for ( ItemIterator it=m_oItems.begin(); it!=m_oItems.end(); ++it )
	{
	(*it)->Draw();
	}

	SDL_Flip( gamescreen );

	}



	void Menu::FocusNext()
	{

	MenuItem* poItem = NULL;
	int iNextItem;

	for ( iNextItem = m_iCurrentItem+1; iNextItem < (int) m_oItems.size(); ++iNextItem )
	{
	poItem = m_oItems[iNextItem];
	if ( poItem->GetEnabled() )
	{
	break;
	}
	poItem = NULL;
	}

	if ( NULL != poItem )
	{
	Audio->PlaySample("strange_quack.voc");
	m_oItems[m_iCurrentItem]->SetActive(false);
	m_oItems[iNextItem]->SetActive(true);
	m_iCurrentItem = iNextItem;
	}
	}



	void Menu::FocusPrev()
	{
	MenuItem* poItem = NULL;

	int iPrevItem;

	for ( iPrevItem = m_iCurrentItem-1; iPrevItem >= 0; --iPrevItem )
	{
	poItem = m_oItems[iPrevItem];
	if ( poItem->GetEnabled() )
	{
	break;
	}
	poItem = NULL;
	}

	if ( NULL != poItem )
	{
	Audio->PlaySample("strange_quack.voc");
	m_oItems[m_iCurrentItem]->SetActive(false);
	m_oItems[iPrevItem]->SetActive(true);
	m_iCurrentItem = iPrevItem;
	}
	}



	void Menu::Clear()
	{
	if (poBackground)
	{
	SDL_BlitSurface( poBackground, 0, gamescreen, 0 );
	}
	else
	{
	SDL_FillRect( gamescreen, NULL, 0 );
	}
	}







	-
	-
	-void DoMenu( bool a_bDrawBackground )
	+void MakeMenuBackground()
	{
	- Audio->PlaySample( "crashhh.voc" );
	+ if ( poBackground != NULL )
	+ {
	+ return;
	+ }

	poBackground = SDL_ConvertSurface( gamescreen, gamescreen->format, SDL_SWSURFACE );
	if ( NULL == poBackground )
	{
	debug( "DoMenu: Couldn't allocate background.\n" );
	}
	else
	{
	int i;
	SDL_Rect oRect;
	oRect.x = 0; oRect.w = poBackground->w; oRect.h = 1;
	-
	+
	for ( i=0; i<poBackground->h; i += 2 )
	{
	oRect.y = i;
	- SDL_FillRect( poBackground, &oRect, C_BLACK );
	+ SDL_FillRect( poBackground, &oRect, C_BLACK );
	}
	-
	+
	oRect.w = 1; oRect.y = 0; oRect.h = poBackground->h;
	-
	+

	for ( i=0; i<poBackground->w; i+=2 )
	{
	oRect.x = i;
	SDL_FillRect(poBackground, &oRect, C_BLACK );
	}
	-
	+
	SDL_BlitSurface( poBackground, 0, gamescreen, 0 );
	SDL_Flip( gamescreen );
	}
	+}
	+
	+
	+
	+void DoMenu( Menu& a_roMenu )
	+{
	+ Audio->PlaySample( "crashhh.voc" );
	+
	+ MakeMenuBackground();
	+
	+ a_roMenu.Clear();
	+ a_roMenu.Draw();
	+ a_roMenu.Run();
	+
	+ if ( !g_oState.m_bQuitFlag )
	+ {
	+ Audio->PlaySample("shades_rollup.voc");
	+ }
	+
	+ if ( NULL != poBackground )
	+ {
	+ SDL_FreeSurface( poBackground );
	+ poBackground = NULL;
	+ }
	+}
	+
	+

	+void DoMenu()
	+{
	+ MakeMenuBackground();
	+
	Menu oMenu( "Main Menu" );

	if ( SState::IN_DEMO == g_oState.m_enGameMode )
	{
	oMenu.AddMenuItem( "~SINGLE PLAYER GAME", SDLK_s, MENU_SINGLE_PLAYER )->SetEnabled(false);
	oMenu.AddMenuItem( "~NETWORK GAME", SDLK_n, MENU_NETWORK_GAME );
	oMenu.AddMenuItem( "~MULTI PLAYER GAME", SDLK_m, MENU_MULTI_PLAYER );
	}
	else
	{
	oMenu.AddMenuItem( "~SURRENDER GAME", SDLK_s, MENU_SURRENDER );
	}
	oMenu.AddEnumMenuItem( "~LANGUAGE: ", g_oState.m_iLanguageCode, g_ppcLanguage, g_piLanguage, MENU_LANGUAGE );

	oMenu.AddMenuItem( "~OPTIONS", SDLK_o, MENU_OPTIONS );
	oMenu.AddMenuItem( "~INFO", SDLK_i, MENU_INFO )->SetEnabled(false);
	oMenu.AddMenuItem( "QUIT", SDLK_UNKNOWN, MENU_QUIT );

	-
	- oMenu.Run();
	-
	- if ( !g_oState.m_bQuitFlag )
	- {
	- Audio->PlaySample("shades_rollup.voc");
	- }
	-
	- //SDL_BlitSurface( poBackground, 0, gamescreen, 0 );
	- //SDL_Flip( gamescreen );
	- SDL_FreeSurface( poBackground );
	- poBackground = NULL;
	+ DoMenu( oMenu );
	}


	diff --git a/src/menu.h b/src/menu.h
	index 9406558..5166d4a 100644
	--- a/src/menu.h
	+++ b/src/menu.h
	@@ -1,137 +1,167 @@
	/***************************************************************************
	menu.h - description
	-------------------
	begin : Sun Aug 3 2003
	copyright : (C) 2003 by upi
	email : upi@apocalypse.rulez.org
	***************************************************************************/


	#ifndef MENU_H
	#define MENU_H


	#include <string>
	#include <vector>

	class MenuItem;
	class EnumMenuItem;
	class TextMenuItem;

	class Menu
	{
	public:
	Menu( const char* a_pcTitle );
	virtual ~Menu();

	virtual MenuItem* AddMenuItem( const char* a_pcUtf8Text, SDLKey a_tShortcut = SDLK_UNKNOWN, int a_iCode = 0 );
	virtual EnumMenuItem* AddEnumMenuItem( const char* a_pcUtf8Text, int a_iInitialValue,
	const char** a_ppcNames, const int* a_piValues, int a_iCode = 0 );
	virtual TextMenuItem* AddTextMenuItem( const char* a_pcTitle, const char* a_pcValue, int a_iCode = 0 );
	virtual MenuItem* AddMenuItem( MenuItem* a_poItem );
	virtual void AddOkCancel( int a_iOkCode = 0 );
	virtual void ItemActivated( int a_iItemCode, MenuItem* a_poMenuItem );
	virtual void ItemChanged( int a_iItemCode, int a_iValue, MenuItem* a_poMenuItem );
	virtual int Run();

	virtual void Draw();
	virtual void Clear();
	+ virtual void EnterName( const char* a_pcTitle, std::string& a_rsTarget, TextMenuItem* a_poMenuItem, int a_iMaxlen );

	protected:

	virtual void FocusNext();
	virtual void FocusPrev();
	virtual void InvokeSubmenu( Menu* a_poSubmenu );

	typedef std::vector<MenuItem*> ItemList;
	typedef ItemList::iterator ItemIterator;
	+

	std::string m_sTitle;
	ItemList m_oItems;
	int m_iCurrentItem;
	int m_iReturnCode;
	bool m_bDone;
	};



	class MenuItem
	{
	public:
	MenuItem( Menu* a_poMenu, const char* a_pcUtf8Text, int a_iCode = -1 );
	virtual ~MenuItem();

	virtual void Draw();
	virtual void Clear();
	virtual void Activate();
	virtual void Increment() {};
	virtual void Decrement() {};

	virtual void SetText( const char* a_pcUtf8Text, bool a_bCenter );
	virtual void SetPosition( const SDL_Rect& a_roPosition );
	virtual void SetActive( bool a_bActive );
	virtual void SetEnabled( bool a_bEnabled );

	virtual bool GetEnabled() { return m_bEnabled; }
	-
	+
	protected:
	Menu* m_poMenu;

	// appearance
	std::string m_sUtf8Text;
	SDL_Rect m_oPosition;
	bool m_bCenter;
	Uint32 m_iHighColor;
	Uint32 m_iLowColor;
	Uint32 m_iInactiveColor;
	Uint32 m_iBackgroundColor;

	// data content
	int m_iCode;
	bool m_bActive;
	bool m_bEnabled;
	};



	class EnumMenuItem: public MenuItem
	{
	public:
	EnumMenuItem( Menu* a_poMenu, int a_iInitialValue, const char* a_pcUtf8Text, int a_iCode = -1 );
	virtual ~EnumMenuItem();

	+ int GetCurrentValue();
	+ const char* GetCurrentText();
	virtual void Draw();
	virtual void Increment();
	virtual void Decrement();

	virtual void SetEnumValues( const char ** a_ppcNames, const int * a_piValues );

	protected:
	int m_iValue;
	int m_iMax;
	std::string m_sUtf8Title;
	const char** m_ppcNames;
	const int* m_piValues;
	};



	class TextMenuItem: public MenuItem
	{
	public:
	TextMenuItem( Menu* a_poMenu, const char* a_pcInitialValue, const char* a_pcUtf8Title, int a_iCode );
	virtual ~TextMenuItem();

	virtual void Draw();
	virtual void SetValue( const char* a_pcValue );

	protected:
	std::string m_sTitle;
	std::string m_sValue;
	};



	-void DoMenu( bool a_bDrawBackground );
	+
	+class CNetworkMenu: public Menu
	+{
	+public:
	+ CNetworkMenu();
	+ ~CNetworkMenu();
	+
	+ void Connect();
	+
	+ void ItemActivated( int a_iItemCode, MenuItem* a_poMenuItem );
	+ void ItemChanged( int a_iItemCode, int a_iValue, MenuItem* a_poMenuItem );
	+
	+protected:
	+ bool m_bOK;
	+ bool m_bServer;
	+ std::string m_sHostname;
	+ std::string m_sNick;
	+
	+ TextMenuItem* m_poServerMenuItem;
	+ TextMenuItem* m_poNickMenuItem;
	+};
	+
	+
	+
	+
	+void DoMenu();
	+void DoMenu( Menu& a_roMenu );

	#endif

File Metadata

Mime Type: text/x-diff
Expires: Wed, Feb 4, 12:10 PM (8 h, 57 m ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 55594
Default Alt Text: (84 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions