No OneTemporary
Actions

Size

32 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/Game.cpp b/src/Game.cpp
	index 1c6674f..1d523a0 100644
	--- a/src/Game.cpp
	+++ b/src/Game.cpp
	@@ -1,737 +1,761 @@
	/***************************************************************************
	Game.cpp - description
	-------------------
	begin : Mon Sep 24 2001
	copyright : (C) 2001 by upi
	email : upi@apocalypse.rulez.org
	***************************************************************************/

	#include <string.h>
	#include <stdio.h>
	#include "SDL_image.h"
	#include "sge_surface.h"
	#include "sge_primitives.h"
	#include "sge_bm_text.h"
	#include "SDL_events.h"
	#include "SDL_keysym.h"
	#include <fstream>

	#include "PlayerSelect.h"
	#include "common.h"
	#include "gfx.h"
	#include "Backend.h"
	#include "RlePack.h"
	#include "State.h"
	#include "Game.h"
	#include "Audio.h"


	#include <EXTERN.h>
	#include <perl.h>


	extern PerlInterpreter* my_perl;


	/*

	GAME PALETTE

	From To Num Desc
	---------------------------------------
	0 .. 63 64 Background
	64 .. 111 48 Doodads
	112 .. 175 64 1st Fighter
	176 .. 239 64 2nd Fighter
	240 .. 255 16 basic colors

	*/

	#define MAXFRAMESKIP 5



	struct SFpsCounter
	{
	int m_iLastCheck; // Last second then Tick() was called
	int m_iFrames; // The number of frames in this second so far
	int m_iFps; // The number of frames in the last second

	void Reset()
	{
	m_iLastCheck = m_iFrames = m_iFps = 0;
	}

	void Tick()
	{
	int iSecond = SDL_GetTicks() / 1000;
	if ( iSecond > m_iLastCheck )
	{
	m_iLastCheck = iSecond;
	m_iFps = m_iFrames;
	m_iFrames = 0;
	fprintf( stderr, "%d ", m_iFps);
	}
	++m_iFrames;
	}

	} oFpsCounter;








	/***************************************************************************
	GAME PUBLIC METHODS
	***************************************************************************/

	Game::Game( bool a_bIsReplay, bool a_bDebug)
	{
	m_bIsReplay = a_bIsReplay;
	m_bDebug = a_bDebug;

	m_poBackground = LoadBackground( "level1.png", 64 );
	m_poDoodads = LoadBackground( "Doodads.png", 48, 64 );

	m_aiRoundsWonByPlayer[0] = m_aiRoundsWonByPlayer[1] = 0;
	m_iNumberOfRounds = 0;
	}


	Game::~Game()
	{
	SDL_FreeSurface( m_poBackground );
	m_poBackground = NULL;
	SDL_FreeSurface( m_poDoodads );
	m_poDoodads = NULL;
	}


	int Game::Run()
	{
	do
	{
	m_sReplayString.clear();
	m_aReplayOffsets.clear();
	DoOneRound();

	if ( g_oState.m_bQuitFlag
	\|\| SState::IN_DEMO == g_oState.m_enGameMode )
	{
	return -1;
	}
	} while ( m_aiRoundsWonByPlayer[0] < 2
	&& m_aiRoundsWonByPlayer[1] < 2
	&& m_iNumberOfRounds < 3 );

	if ( m_aiRoundsWonByPlayer[1] > m_aiRoundsWonByPlayer[0] ) return 1;
	if ( m_aiRoundsWonByPlayer[1] < m_aiRoundsWonByPlayer[0] ) return 0;
	return -1;
	}


	std::string& Game::GetReplay()
	{
	return m_sReplayString;
	}


	/***************************************************************************
	GAME DRAWING METHODS
	***************************************************************************/


	void Game::DrawHitPointDisplay()
	{
	int hp1 = g_oBackend.m_aoPlayers[0].m_iHitPoints;// * 100 / g_oState.m_iHitPoints;
	int hp2 = g_oBackend.m_aoPlayers[1].m_iHitPoints;// * 100 / g_oState.m_iHitPoints;
	SDL_Rect src, dst;

	src.y = 154;
	src.h = 20;
	dst.y = 15;

	// Player 1, green part.
	dst.x = 40;
	src.x = 0;
	src.w = hp1*2;
	SDL_BlitSurface( m_poDoodads, &src, gamescreen, &dst );

	// Player 1, red part.
	dst.x += hp1*2;
	src.x = (100 + hp1)*2;
	src.w = (100-hp1)*2;
	SDL_BlitSurface( m_poDoodads, &src, gamescreen, &dst );

	// Player 2, red part.
	dst.x = 400;
	src.x = 200;
	src.w = (100-hp2)*2;
	SDL_BlitSurface( m_poDoodads, &src, gamescreen, &dst );

	// Player 2, green part.
	dst.x = 400 + (100-hp2)*2;
	src.x = (100-hp2)*2;
	src.w = hp2*2;
	SDL_BlitSurface( m_poDoodads, &src, gamescreen, &dst );

	// "Won" icon for Player 1
	src.x = 0; src.y = 276; src.w = 32; src.h = 32;
	if ( m_aiRoundsWonByPlayer[0] > 0 )
	{
	dst.x = 4; dst.y = 11;
	SDL_BlitSurface( m_poDoodads, &src, gamescreen, &dst );
	}
	if ( m_aiRoundsWonByPlayer[1] > 0 )
	{
	dst.x = 604; dst.y = 11;
	SDL_BlitSurface( m_poDoodads, &src, gamescreen, &dst );
	}
	}



	void Game::DrawBackground()
	{
	sge_Blit( m_poBackground, gamescreen,
	g_oBackend.m_iBgX, g_oBackend.m_iBgY,
	0, 0, SCREENWIDTH, SCREENHEIGHT );
	}



	void Game::DrawPoly( const char* sName, int color )
	{
	AV *iList;
	int n;

	iList = get_av( sName, FALSE );
	if ( iList == NULL )
	{
	return;
	}

	n = av_len( iList ) + 1;

	if ( n< 2 )
	{
	return;
	}

	for ( int i=0; i<n; i += 2 )
	{
	int j = (i+2) % n;

	int x1 = SvIV( *av_fetch( iList, i, false) );
	int y1 = SvIV( *av_fetch( iList, i+1, false) );
	int x2 = SvIV( *av_fetch( iList, j, false) );
	int y2 = SvIV( *av_fetch( iList, j+1, false) );

	sge_Line( gamescreen, x1, y1, x2, y2, color ) ;
	}
	}




	void Game::DrawDoodads()
	{
	for ( int i=0; i<g_oBackend.m_iNumDoodads; ++i )
	{
	Backend::SDoodad& roDoodad = g_oBackend.m_aoDoodads[i];
	if ( 0 == roDoodad.m_iType )
	{
	// Handle text doodads
	const char *s = roDoodad.m_sText.c_str();

	int iWidth = sge_BF_TextSize(fastFont, s).w;
	int iDoodadX = roDoodad.m_iX - iWidth/2;
	if ( iDoodadX + iWidth > 640 ) iDoodadX = 640 - iWidth;
	if ( iDoodadX < 0 ) iDoodadX = 0;
	int iDoodadY = roDoodad.m_iY;

	sge_BF_textout( gamescreen, fastFont, s, iDoodadX, iDoodadY );
	continue;
	}

	SDL_Rect rsrc, rdst;
	rdst.x = roDoodad.m_iX;
	rdst.y = roDoodad.m_iY;
	rsrc.x = 64 * roDoodad.m_iFrame;
	rsrc.y = 0;
	rsrc.w = 64;
	rsrc.h = 64;

	SDL_BlitSurface( m_poDoodads, &rsrc, gamescreen, &rdst );
	//debug( "Doodad x: %d, y: %d, t: %d, f: %d\n", dx, dy, dt, df );
	}
	}


	void Game::Draw()
	{
	DrawBackground();

	for ( int i=0; i<2; ++i )
	{
	int iFrame = g_oBackend.m_aoPlayers[i].m_iFrame;
	if ( 0 != iFrame )
	{
	g_oPlayerSelect.GetPlayerInfo(i).m_poPack->Draw(
	ABS(iFrame)-1,
	g_oBackend.m_aoPlayers[i].m_iX,
	g_oBackend.m_aoPlayers[i].m_iY,
	iFrame<0 );
	}
	}

	if ( m_bDebug )
	{
	DrawPoly( "p1head", C_LIGHTRED );
	DrawPoly( "p1body", C_LIGHTGREEN );
	DrawPoly( "p1legs", C_LIGHTBLUE );
	DrawPoly( "p1hit", C_YELLOW );
	DrawPoly( "p2head", C_LIGHTRED );
	DrawPoly( "p2body", C_LIGHTGREEN );
	DrawPoly( "p2legs", C_LIGHTBLUE );
	DrawPoly( "p2hit", C_YELLOW );
	}

	DrawDoodads();
	DrawHitPointDisplay();

	if ( Ph_NORMAL == m_enGamePhase )
	{
	char s[100];
	sprintf( s, "%d", g_oBackend.m_iGameTime );
	DrawTextMSZ( s, inkFont, 320, 10, AlignHCenter, C_LIGHTCYAN, gamescreen );
	}
	else if ( Ph_START == m_enGamePhase )
	{
	char s[100];
	sprintf( s, "Round %d", m_iNumberOfRounds+1 );
	DrawTextMSZ( s, inkFont, 320, 200, AlignHCenter, C_WHITE, gamescreen );
	}
	else if ( Ph_REWIND == m_enGamePhase )
	{
	DrawTextMSZ( "REW", inkFont, 320, 10, AlignHCenter, C_WHITE, gamescreen );
	}
	else if ( Ph_SLOWFORWARD == m_enGamePhase )
	{
	DrawTextMSZ( "REPLAY", inkFont, 320, 10, AlignHCenter, C_WHITE, gamescreen );
	}
	else if ( Ph_REPLAY == m_enGamePhase )
	{
	DrawTextMSZ( "DEMO", inkFont, 320, 10, AlignHCenter, C_WHITE, gamescreen );
	}

	if ( oFpsCounter.m_iFps > 0 )
	{
	sge_BF_textoutf( gamescreen, fastFont, 2, 2, "%d fps", oFpsCounter.m_iFps );
	}

	SDL_Flip( gamescreen );
	}



	/***************************************************************************
	GAME PROTECTED METHODS
	***************************************************************************/



	/**
	This method reads and updates the game's variables. In replay mode,
	this is done by parsing the replay string. Otherwise the perl
	backend is advanced the given number of steps.

	Whichever the case, the variables will be available in g_oBackend.
	*/

	void Game::Advance( int a_iNumFrames )
	{
	if ( m_bIsReplay )
	{
	// Replay mode...

	m_iFrame += a_iNumFrames;
	if ( m_iFrame >= ((int)m_aReplayOffsets.size())-1 ) m_iFrame = m_aReplayOffsets.size() - 2;
	if ( m_iFrame <= 0 ) m_iFrame = 0;
	std::string sFrameDesc = m_sReplayString.substr(
	m_aReplayOffsets[m_iFrame],
	m_aReplayOffsets[m_iFrame+1] - m_aReplayOffsets[m_iFrame] );

	g_oBackend.ReadFromString( sFrameDesc );
	return;
	}

	while ( a_iNumFrames > 0 )
	{
	-- a_iNumFrames;
	std::string sFrameDesc;
	g_oBackend.AdvancePerl();
	g_oBackend.ReadFromPerl();
	g_oBackend.PlaySounds();

	g_oBackend.WriteToString( sFrameDesc );
	m_sReplayString += sFrameDesc;
	m_sReplayString += '\n';
	m_aReplayOffsets.push_back( m_sReplayString.size() );
	}
	}



	/** ProcessEvents reads events from the SDL event system.

	Relevant key events are fed to the backend.
	Esc brings up the menu.

	-Returns 1 on quit event, 0 otherwise.
	+Returns 1 on quit event (e.g. if the current game or replay should be aborted), 0 otherwise.
	*/

	int Game::ProcessEvents()
	{
	SDL_Event event;
	while (SDL_PollEvent(&event))
	{
	switch (event.type)
	{
	case SDL_QUIT:
	g_oState.m_bQuitFlag = true;
	return 1;
	-
	+
	case SDL_KEYDOWN:
	{
	if ( event.key.keysym.sym == SDLK_ESCAPE )
	+ {
	+ SState::TGameMode enMode = g_oState.m_enGameMode;
	+ ::DoMenu( true );
	+ return g_oState.m_enGameMode == enMode ? 0 : 1;
	+ }
	+ if ( event.key.keysym.sym == SDLK_F1 )
	+ {
	+ // shortcut: abort the current round. This shall is here
	+ // to ease testing, and will be removed from the final
	+ // version.
	return 1;
	+ }

	- if ( Ph_NORMAL != m_enGamePhase )
	+ if ( Ph_NORMAL != m_enGamePhase &&
	+ Ph_REPLAY != m_enGamePhase )
	break;

	for (int i=0; i<2; i++)
	{
	for (int j=0; j<9; j++ )
	{
	if (g_oState.m_aiPlayerKeys[i][j] == event.key.keysym.sym)
	{
	+ if (g_oState.m_enGameMode == SState::IN_DEMO)
	+ {
	+ g_oState.m_enGameMode = SState::IN_MULTI;
	+ return 1;
	+ }
	+
	g_oBackend.PerlEvalF( "KeyDown(%d,%d);", i, j );
	+ return 0;
	}
	}
	}
	+
	break;
	}

	case SDL_KEYUP:
	{
	if ( Ph_NORMAL != m_enGamePhase )
	break;

	for (int i=0; i<2; i++)
	{
	for (int j=0; j<9; j++ )
	{
	if (g_oState.m_aiPlayerKeys[i][j] == event.key.keysym.sym)
	{
	g_oBackend.PerlEvalF( "KeyUp(%d,%d);", i, j );
	+ return 0;
	}
	}
	}
	break;
	}
	} // End of switch
	} // End of while SDL_PollEvent;

	return 0;
	}



	void Game::HurryUp()
	{
	Audio->PlaySample( "aroooga.voc" );
	DrawGradientText( "HURRY UP!", titleFont, 200, gamescreen );
	SDL_Delay( 1000 );
	Audio->PlaySample( "machine_start.voc" );
	}


	void Game::TimeUp()
	{
	DrawGradientText( "TIME IS UP!", titleFont, 200, gamescreen );
	SDL_Delay( 1000 );
	}


	void Game::InstantReplay( int a_iKoAt )
	{
	int iCurrentFrame = m_aReplayOffsets.size() - 200;
	int iThisTick, iLastTick, iGameSpeed;

	m_enGamePhase = Ph_REWIND;
	iGameSpeed = 8;
	iThisTick = SDL_GetTicks() / iGameSpeed;
	iLastTick = iThisTick - 1;

	while ( iCurrentFrame < (int)m_aReplayOffsets.size() - 150 )
	{
	// 1. Wait for the next tick (on extremely fast machines..)
	while (iThisTick == iLastTick)
	{
	iThisTick = SDL_GetTicks() / iGameSpeed;
	if ( iThisTick==iLastTick ) SDL_Delay(1);
	}

	// 2. Advance as many ticks as necessary..

	int iNumTicks = iThisTick - iLastTick;
	if ( iNumTicks > 10 ) iNumTicks = 10;
	if ( iNumTicks < 0 ) iNumTicks = 0;
	iCurrentFrame += ( Ph_REWIND == m_enGamePhase ) ? -iNumTicks : +iNumTicks ;

	if ( Ph_REWIND == m_enGamePhase
	&& ( iCurrentFrame < a_iKoAt - 200 \|\| iCurrentFrame <= 0 )
	)
	{
	m_enGamePhase = Ph_SLOWFORWARD;
	iGameSpeed = 16;
	SDL_Delay(500);
	}
	iLastTick = iThisTick;
	if ( iCurrentFrame < 0 ) iCurrentFrame = 0;

	m_iFrame = iCurrentFrame;
	if ( m_iFrame >= ((int)m_aReplayOffsets.size())-1 ) m_iFrame = m_aReplayOffsets.size() - 2;
	if ( m_iFrame <= 0 ) m_iFrame = 0;
	std::string sFrameDesc = m_sReplayString.substr(
	m_aReplayOffsets[m_iFrame],
	m_aReplayOffsets[m_iFrame+1] - m_aReplayOffsets[m_iFrame] );

	//debug( "PB: Frame %d ofs %d-%d; data: '%s'\n", m_iFrame,
	// m_aReplayOffsets[m_iFrame], m_aReplayOffsets[m_iFrame+1], sFrameDesc.c_str() );

	g_oBackend.ReadFromString( sFrameDesc );

	if ( ProcessEvents() )
	{
	break;
	}
	oFpsCounter.Tick();

	// 3. Draw the next game screen..

	Draw();

	- if ( g_oState.m_bQuitFlag )
	+ if ( g_oState.m_bQuitFlag
	+ \|\| SState::IN_DEMO == g_oState.m_enGameMode )
	{
	break;
	}
	}

	}


	void Game::DoOneRound()
	{
	m_enGamePhase = Ph_START;

	g_oBackend.PerlEvalF( "GameStart(%d);", g_oState.m_iHitPoints );

	int iKoFrame = -1;
	double dGameTime = 2 * 1000;
	int iThisTick, iLastTick, iGameSpeed;
	bool bHurryUp = false;
	+ bool bReplayAfter = true;

	iGameSpeed = 12;
	iThisTick = SDL_GetTicks() / iGameSpeed;
	iLastTick = iThisTick - 1;

	oFpsCounter.Reset();

	// 1. DO THE NORMAL GAME ROUND and HURRYUP

	while ( dGameTime > 0 )
	{

	// 1. Wait for the next tick (on extremely fast machines..)
	while (iThisTick == iLastTick)
	{
	iThisTick = SDL_GetTicks() / iGameSpeed;
	if ( iThisTick==iLastTick ) SDL_Delay(1);
	}

	// 2. Advance as many ticks as necessary..

	int iNumTicks = iThisTick - iLastTick;
	if ( iNumTicks > MAXFRAMESKIP ) iNumTicks = MAXFRAMESKIP;
	Advance( iNumTicks );
	dGameTime -= iNumTicks * iGameSpeed;

	if ( Ph_START == m_enGamePhase )
	{
	if ( dGameTime < 0 )
	{
	m_enGamePhase = Ph_NORMAL;
	dGameTime = g_oState.m_iGameTime * 1000;
	}
	}
	else if ( Ph_NORMAL == m_enGamePhase )
	{
	if ( dGameTime < 10 * 1000
	&& !bHurryUp )
	{
	bHurryUp = true;
	HurryUp();
	iGameSpeed = iGameSpeed * 3 / 4;
	}
	if ( g_oBackend.m_bKO )
	{
	m_enGamePhase = Ph_KO;
	dGameTime = 10 * 1000;
	iKoFrame = m_aReplayOffsets.size();
	}
	else if ( dGameTime < 0 )
	{
	m_enGamePhase = Ph_TIMEUP;
	TimeUp();
	break;
	}
	}

	g_oBackend.m_iGameTime = (int) ((dGameTime + 500.0) / 1000.0);
	iLastTick = iThisTick;

	- if ( ProcessEvents() )
	+ if ( ProcessEvents() \|\| g_oState.m_bQuitFlag )
	{
	+ bReplayAfter = false;
	break;
	}

	oFpsCounter.Tick();

	// 3. Draw the next game screen..

	Draw();

	- if ( g_oBackend.m_iGameOver \|\| g_oState.m_bQuitFlag )
	+ if ( g_oBackend.m_iGameOver )
	{
	break;
	}
	}

	// 3. DO THE REPLAY (IF THERE WAS A KO)

	- if ( iKoFrame>0 )
	+ if ( iKoFrame>0 && bReplayAfter )
	{
	InstantReplay( iKoFrame );
	}

	// 4. END OF ROUND


	int p1h = g_oBackend.m_aoPlayers[0].m_iHitPoints;
	int p2h = g_oBackend.m_aoPlayers[1].m_iHitPoints;
	debug( "Game over; p1h = %d; p2h = %d\n", p1h, p2h );

	if ( p1h > p2h ) ++m_aiRoundsWonByPlayer[0];
	if ( p2h > p1h ) ++m_aiRoundsWonByPlayer[1];
	++m_iNumberOfRounds;
	}



	void Game::DoReplay( const char* a_pcReplayFile )
	{
	std::ifstream oInput( a_pcReplayFile );
	int iPlayer1, iPlayer2;
	oInput >> iPlayer1 >> iPlayer2;

	std::string sLine;
	std::getline( oInput, sLine );
	g_oPlayerSelect.SetPlayer( 0, (FighterEnum) iPlayer1 );
	g_oPlayerSelect.SetPlayer( 1, (FighterEnum) iPlayer2 );

	int iThisTick, iLastTick, iGameSpeed;

	m_enGamePhase = Ph_REPLAY;
	iGameSpeed = 12;
	iThisTick = SDL_GetTicks() / iGameSpeed;
	iLastTick = iThisTick - 1;

	while ( !oInput.eof() )
	{
	// 1. Wait for the next tick (on extremely fast machines..)
	while (iThisTick == iLastTick)
	{
	iThisTick = SDL_GetTicks() / iGameSpeed;
	if ( iThisTick==iLastTick ) SDL_Delay(1);
	}

	// 2. Advance as many ticks as necessary..

	int iNumTicks = iThisTick - iLastTick;
	if ( iNumTicks > 5 ) iNumTicks = 5;

	for ( int i=0; i< iNumTicks; ++i )
	{
	std::getline( oInput, sLine );
	}
	if ( 0 == sLine.size() )
	{
	break;
	}

	iLastTick = iThisTick;

	g_oBackend.ReadFromString( sLine );

	if ( ProcessEvents() )
	{
	break;
	}
	oFpsCounter.Tick();

	// 3. Draw the next game screen..

	Draw();

	if ( g_oState.m_bQuitFlag )
	{
	break;
	}
	}
	}



	int DoGame( char* a_pcReplayFile, bool a_bIsReplay, bool a_bDebug )
	{
	Game oGame( a_bIsReplay, a_bDebug );

	if ( a_bIsReplay )
	{
	if ( NULL == a_pcReplayFile )
	{
	return 0;
	}
	oGame.DoReplay( a_pcReplayFile );
	return 0;
	}
	else
	{
	int iRetval = oGame.Run();
	if ( NULL != a_pcReplayFile )
	{
	std::ofstream oOutput( a_pcReplayFile );
	oOutput <<
	g_oPlayerSelect.GetPlayerInfo(0).m_enFighter << ' ' <<
	g_oPlayerSelect.GetPlayerInfo(1).m_enFighter << '\n' << oGame.GetReplay();
	}
	return iRetval;
	}
	}


	diff --git a/src/GameOver.cpp b/src/GameOver.cpp
	index f8686b1..4ddd19e 100644
	--- a/src/GameOver.cpp
	+++ b/src/GameOver.cpp
	@@ -1,218 +1,221 @@
	/***************************************************************************
	GameOver.cpp - description
	-------------------
	begin : Wed Aug 21 20:25:30 CEST 2003
	copyright : (C) 2003 by upi
	email : upi@apocalypse.rulez.org
	***************************************************************************/

	#include "PlayerSelect.h"
	#include "SDL.h"
	#include "gfx.h"
	#include "Backend.h"
	#include "common.h"
	#include "State.h"
	#include "RlePack.h"
	#include "Audio.h"

	#include <stdio.h>


	void DoMenu( bool );



	void DrawPlayer( int i )
	{
	int iFrame = g_oBackend.m_aoPlayers[i].m_iFrame;
	if ( 0 != iFrame )
	{
	g_oPlayerSelect.GetPlayerInfo(i).m_poPack->Draw(
	ABS(iFrame)-1,
	g_oBackend.m_aoPlayers[i].m_iX,
	g_oBackend.m_aoPlayers[i].m_iY - 15,
	iFrame<0 );
	}
	}



	void GameOver( int a_iPlayerWon )
	{
	SDL_Surface* poBackground = LoadBackground( "GameOver.png", 112 );
	DrawGradientText( "Final Judgement", titleFont, 20, poBackground );
	DrawTextMSZ( "Continue?", inkFont, 320, 100, AlignHCenter, C_LIGHTCYAN, poBackground );
	SDL_Surface* poFoot = LoadBackground( "Foot.png", 112 );

	SDL_BlitSurface( poBackground, NULL, gamescreen, NULL );

	g_oBackend.PerlEvalF( "JudgementStart(%d);", a_iPlayerWon );

	int thisTick, lastTick, firstTick, iGameSpeed;
	iGameSpeed = 14 ;
	firstTick = thisTick = SDL_GetTicks() / iGameSpeed;
	lastTick = thisTick - 1;

	char acString[100];
	int iTimeLeft = 8000 / iGameSpeed;
	int FOOTHEIGHT = poFoot->h;
	int GROUNDLEVEL = 440;
	int iFootY = -FOOTHEIGHT;
	bool bTimeUp = false;
	bool bKeyPressed = false;
	int iCounter = -1;

	SDL_Event event;

	while (1)
	{
	// 1. Wait for the next tick (on extremely fast machines..)
	while (1)
	{
	thisTick = SDL_GetTicks() / iGameSpeed;
	if ( thisTick==lastTick )
	{
	SDL_Delay(1);
	}
	else
	{
	break;
	}
	}

	// 2. Advance as many ticks as necessary..

	if ( thisTick - lastTick > 5 )
	{
	iTimeLeft -= 5;
	}
	else
	{
	iTimeLeft = iTimeLeft - thisTick + lastTick;
	}

	if ( iTimeLeft < 0 && !bTimeUp )
	{
	bTimeUp = true;
	Audio->FadeMusic( 1500 );
	}

	if ( bTimeUp )
	{
	iFootY += 12 * (thisTick - lastTick );
	if ( iFootY > GROUNDLEVEL - FOOTHEIGHT )
	{
	break;
	}
	}

	int iNumFrames = thisTick - lastTick;
	for ( int i=0; i<iNumFrames; ++i )
	{
	g_oBackend.AdvancePerl();
	};
	lastTick = thisTick;

	while (SDL_PollEvent(&event))
	{
	switch (event.type)
	{
	case SDL_QUIT:
	g_oState.m_bQuitFlag = true;
	break;

	case SDL_KEYDOWN:
	{
	if ( event.key.keysym.sym == SDLK_ESCAPE )
	{
	DoMenu( true );
	break;
	}

	for (int j=4; j<9; j++ )
	{
	if (g_oState.m_aiPlayerKeys[1-a_iPlayerWon][j] == event.key.keysym.sym)
	{
	bKeyPressed = true;
	break;
	}
	}
	}
	break;
	} // switch statement
	} // Polling events

	- /*
	- int p1x = SvIV(get_sv("p1x", FALSE));
	- int p1y = SvIV(get_sv("p1y", FALSE)) - 15;
	- int p1f = SvIV(get_sv("p1f", FALSE));
	- int p2x = SvIV(get_sv("p2x", FALSE));
	- int p2y = SvIV(get_sv("p2y", FALSE)) - 15;
	- int p2f = SvIV(get_sv("p2f", FALSE));*/
	g_oBackend.ReadFromPerl();

	SDL_BlitSurface( poBackground, NULL, gamescreen, NULL );

	DrawPlayer( a_iPlayerWon );

	if ( bTimeUp )
	{
	SDL_Rect oRect;
	oRect.x = 0;
	oRect.y = iFootY + FOOTHEIGHT - 10;
	oRect.w = gamescreen->w;
	oRect.h = gamescreen->h - oRect.y;
	SDL_SetClipRect(gamescreen, &oRect);
	}

	DrawPlayer( 1-a_iPlayerWon );

	SDL_SetClipRect( gamescreen, NULL );

	if ( !bTimeUp )
	{
	int iNewCounter = iTimeLeft * iGameSpeed / 1000;
	sprintf( acString, "%d", iNewCounter );
	DrawTextMSZ( acString, inkFont, 320, 130, AlignHCenter, C_LIGHTCYAN, gamescreen );
	if ( iNewCounter != iCounter )
	{
	Audio->PlaySample( "alarm.voc" );
	iCounter = iNewCounter;
	}
	}
	else
	{
	SDL_Rect oRect;
	oRect.x = 40;
	oRect.y = iFootY;
	SDL_BlitSurface( poFoot, NULL, gamescreen, &oRect );
	}

	SDL_Flip( gamescreen );

	- if ( g_oState.m_bQuitFlag \|\| bKeyPressed )
	+ if ( g_oState.m_bQuitFlag \|\|
	+ SState::IN_DEMO == g_oState.m_enGameMode \|\|
	+ bKeyPressed )
	{
	break;
	}
	}

	+ if ( g_oState.m_bQuitFlag \|\|
	+ SState::IN_DEMO == g_oState.m_enGameMode )
	+ {
	+ SDL_FreeSurface( poBackground );
	+ return;
	+ }
	+
	+
	SDL_FillRect( gamescreen, NULL, C_BLACK );
	if ( bTimeUp )
	{
	SDL_UnlockSurface( gamescreen );
	DrawGradientText( "SPLAT!", titleFont, 220, gamescreen );
	Audio->PlaySample( "splat2.voc" );
	SDL_Flip( gamescreen );
	SDL_Delay( 1500 );
	g_oState.m_enGameMode = SState::IN_DEMO;
	}
	else
	{
	SDL_Flip( gamescreen );
	}

	SDL_FreeSurface( poBackground );
	return;
	}


	diff --git a/src/Makefile.in b/src/Makefile.in
	index a1326f3..0f3a000 100644
	--- a/src/Makefile.in
	+++ b/src/Makefile.in
	@@ -1,336 +1,303 @@
	# 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


	-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 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
	+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 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


	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
	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
	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 --include-deps src/Makefile

	Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
	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

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

	.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)
	@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
	-Audio.o: Audio.cpp Audio.h State.h common.h
	-Backend.o: Backend.cpp common.h Backend.h Audio.h
	-common.o: common.cpp common.h
	-Demo.o: Demo.cpp FlyingChars.h sge_bm_text.h sge_internal.h sge_config.h \
	- State.h gfx.h common.h Backend.h Demo.h
	-FighterStats.o: FighterStats.cpp FlyingChars.h sge_bm_text.h \
	- sge_internal.h sge_config.h sge_tt_text.h common.h gfx.h \
	- RlePack.h Backend.h Demo.h
	-FlyingChars.o: FlyingChars.cpp FlyingChars.h sge_bm_text.h \
	- sge_internal.h sge_config.h sge_surface.h common.h
	-Game.o: Game.cpp sge_surface.h sge_internal.h sge_config.h \
	- sge_primitives.h sge_bm_text.h common.h gfx.h Backend.h \
	- RlePack.h State.h Game.h Audio.h
	-GameOver.o: GameOver.cpp gfx.h Backend.h common.h State.h RlePack.h \
	- Audio.h
	-gfx.o: gfx.cpp sge_tt_text.h sge_internal.h sge_config.h sge_surface.h \
	- common.h gfx.h State.h
	-main.o: main.cpp ../config.h FlyingChars.h sge_bm_text.h sge_internal.h \
	- sge_config.h sge_tt_text.h sge_surface.h common.h gfx.h Audio.h \
	- RlePack.h Backend.h State.h
	-menu.o: menu.cpp menu.h gfx.h State.h common.h Audio.h Backend.h
	-PlayerSelect.o: PlayerSelect.cpp sge_primitives.h sge_internal.h \
	- sge_config.h common.h Audio.h gfx.h RlePack.h Backend.h State.h
	-RlePack.o: RlePack.cpp common.h RlePack.h
	-sge_bm_text.o: sge_bm_text.cpp sge_surface.h sge_internal.h sge_config.h \
	- sge_bm_text.h sge_tt_text.h
	-sge_primitives.o: sge_primitives.cpp sge_primitives.h sge_internal.h \
	- sge_config.h sge_surface.h
	-sge_surface.o: sge_surface.cpp sge_surface.h sge_internal.h sge_config.h
	-sge_tt_text.o: sge_tt_text.cpp sge_surface.h sge_internal.h sge_config.h \
	- sge_primitives.h sge_tt_text.h
	-State.o: State.cpp ../config.h common.h State.h Backend.h
	-
	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-generic

	mostlyclean: mostlyclean-am

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

	clean: clean-am

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

	distclean: distclean-am

	maintainer-clean-am: maintainer-clean-binPROGRAMS \
	maintainer-clean-compile maintainer-clean-tags \
	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 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:

File Metadata

Mime Type: text/x-diff
Expires: Wed, Feb 4, 2:15 PM (13 h, 34 m ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 55654
Default Alt Text: (32 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions