Merged New Inventory Project into main branch

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2008-03-08 15:15:25 +00:00
parent e16d166277
commit 43ca24dda8
649 changed files with 93359 additions and 82507 deletions
+44 -44
View File
@@ -14,7 +14,7 @@
#include "gameloop.h"
#endif
#define SQUARE_STEP 8
#define SQUARE_STEP 8
extern UINT32 guiExitScreen; // symbol already declared globally in laptop.cpp (jonathanl)
BOOLEAN gfFadeInitialized = FALSE;
@@ -34,12 +34,12 @@ UINT32 uiOldMusicMode;
FADE_FUNCTION gFadeFunction = NULL;
FADE_HOOK gFadeInDoneCallback = NULL;
FADE_HOOK gFadeInDoneCallback = NULL;
FADE_HOOK gFadeOutDoneCallback = NULL;
void FadeFrameBufferSquare( );
void FadeFrameBufferVersionOne( );
void FadeFrameBufferSquare( );
void FadeFrameBufferVersionOne( );
void FadeFrameBufferVersionFaster( INT8 bFadeValue );
void FadeFrameBufferSide( );
void FadeFrameBufferRealFade( );
@@ -49,14 +49,14 @@ void FadeInBackBufferSquare( );
void FadeInFrameBufferRealFade( );
extern BOOLEAN ShadowVideoSurfaceRectUsingLowPercentTable( UINT32 uiDestVSurface, INT32 X1, INT32 Y1, INT32 X2, INT32 Y2);
extern BOOLEAN ShadowVideoSurfaceRectUsingLowPercentTable( UINT32 uiDestVSurface, INT32 X1, INT32 Y1, INT32 X2, INT32 Y2);
BOOLEAN UpdateSaveBufferWithBackbuffer( void );
BOOLEAN gfFadeIn = FALSE;
BOOLEAN gfFadeOut = FALSE;
BOOLEAN gfFadeOutDone = FALSE;
BOOLEAN gfFadeInDone = FALSE;
BOOLEAN gfFadeIn = FALSE;
BOOLEAN gfFadeOut = FALSE;
BOOLEAN gfFadeOutDone = FALSE;
BOOLEAN gfFadeInDone = FALSE;
void FadeInNextFrame( )
@@ -164,8 +164,8 @@ void BeginFade( UINT32 uiExitScreen, INT8 bFadeValue, INT8 bType, UINT32 uiDelay
gsFadeRealCount = -1;
gsFadeLimit = 8;
gFadeFunction = (FADE_FUNCTION)FadeInFrameBufferRealFade;
gfFadeInVideo = FALSE;
gFadeFunction = (FADE_FUNCTION)FadeInFrameBufferRealFade;
gfFadeInVideo = FALSE;
// Copy backbuffer to savebuffer
UpdateSaveBufferWithBackbuffer( );
@@ -175,11 +175,11 @@ void BeginFade( UINT32 uiExitScreen, INT8 bFadeValue, INT8 bType, UINT32 uiDelay
break;
case FADE_OUT_REALFADE:
gsFadeRealCount = -1;
gsFadeLimit = 10;
gFadeFunction = (FADE_FUNCTION)FadeFrameBufferRealFade;
gfFadeInVideo = FALSE;
gFadeFunction = (FADE_FUNCTION)FadeFrameBufferRealFade;
gfFadeInVideo = FALSE;
// Clear framebuffer
//ColorFillVideoSurfaceArea( FRAME_BUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, Get16BPPColor( FROMRGB( 0, 0, 0 ) ) );
@@ -324,7 +324,7 @@ UINT32 FadeScreenHandle( )
return( FADE_SCREEN );
}
UINT32 FadeScreenShutdown( )
UINT32 FadeScreenShutdown( )
{
return( FALSE );
@@ -491,7 +491,7 @@ void FadeFrameBufferVersionFaster( INT8 bFadeValue )
}
void FadeFrameBufferSide( )
void FadeFrameBufferSide( )
{
INT32 iX1, iX2;
INT16 sFadeMove;
@@ -510,7 +510,7 @@ void FadeFrameBufferSide( )
}
void FadeFrameBufferSquare( )
void FadeFrameBufferSquare( )
{
INT32 iX1, iX2, iY1, iY2;
INT16 sFadeXMove, sFadeYMove;
@@ -518,7 +518,7 @@ void FadeFrameBufferSquare( )
sFadeXMove = SQUARE_STEP;
sFadeYMove = (INT16)(sFadeXMove * .75);
iX1 = giX1;
iX2 = giX1 + sFadeXMove;
iY1 = giY1;
@@ -543,7 +543,7 @@ void FadeFrameBufferSquare( )
}
void FadeInBackBufferSquare( )
void FadeInBackBufferSquare( )
{
INT32 iX1, iX2, iY1, iY2;
INT16 sFadeXMove, sFadeYMove;
@@ -563,15 +563,15 @@ void FadeInBackBufferSquare( )
iY2 = giY2 + sFadeYMove;
BltFx.SrcRect.iLeft = iX1;
BltFx.SrcRect.iTop = iY1;
BltFx.SrcRect.iTop = iY1;
BltFx.SrcRect.iRight = iX2;
BltFx.SrcRect.iBottom = iY2;
if ( BltFx.SrcRect.iRight != BltFx.SrcRect.iLeft )
if ( BltFx.SrcRect.iRight != BltFx.SrcRect.iLeft )
{
BltVideoSurface( BACKBUFFER, FRAME_BUFFER, 0,
iX1, iY1,
VS_BLT_SRCSUBRECT, &BltFx );
BltVideoSurface( BACKBUFFER, FRAME_BUFFER, 0,
iX1, iY1,
VS_BLT_SRCSUBRECT, &BltFx );
}
iX1 = giX2;
@@ -580,15 +580,15 @@ void FadeInBackBufferSquare( )
iY2 = giY2 + sFadeYMove;
BltFx.SrcRect.iLeft = iX1;
BltFx.SrcRect.iTop = iY1;
BltFx.SrcRect.iTop = iY1;
BltFx.SrcRect.iRight = iX2;
BltFx.SrcRect.iBottom = iY2;
if ( BltFx.SrcRect.iRight != BltFx.SrcRect.iLeft )
{
BltVideoSurface( BACKBUFFER, FRAME_BUFFER, 0,
iX1, iY1,
VS_BLT_SRCSUBRECT, &BltFx );
BltVideoSurface( BACKBUFFER, FRAME_BUFFER, 0,
iX1, iY1,
VS_BLT_SRCSUBRECT, &BltFx );
}
iX1 = giX1;
@@ -597,15 +597,15 @@ void FadeInBackBufferSquare( )
iY2 = giY1;
BltFx.SrcRect.iLeft = iX1;
BltFx.SrcRect.iTop = iY1;
BltFx.SrcRect.iTop = iY1;
BltFx.SrcRect.iRight = iX2;
BltFx.SrcRect.iBottom = iY2;
if ( BltFx.SrcRect.iBottom != BltFx.SrcRect.iTop )
if ( BltFx.SrcRect.iBottom != BltFx.SrcRect.iTop )
{
BltVideoSurface( BACKBUFFER, FRAME_BUFFER, 0,
iX1, iY1,
VS_BLT_SRCSUBRECT, &BltFx );
BltVideoSurface( BACKBUFFER, FRAME_BUFFER, 0,
iX1, iY1,
VS_BLT_SRCSUBRECT, &BltFx );
}
iX1 = giX1;
@@ -614,15 +614,15 @@ void FadeInBackBufferSquare( )
iY2 = giY2 + sFadeYMove;
BltFx.SrcRect.iLeft = iX1;
BltFx.SrcRect.iTop = iY1;
BltFx.SrcRect.iTop = iY1;
BltFx.SrcRect.iRight = iX2;
BltFx.SrcRect.iBottom = iY2;
if ( BltFx.SrcRect.iBottom != BltFx.SrcRect.iTop )
{
BltVideoSurface( BACKBUFFER, FRAME_BUFFER, 0,
iX1, iY1,
VS_BLT_SRCSUBRECT, &BltFx );
BltVideoSurface( BACKBUFFER, FRAME_BUFFER, 0,
iX1, iY1,
VS_BLT_SRCSUBRECT, &BltFx );
}
giX1 -= sFadeXMove;
@@ -637,7 +637,7 @@ void FadeFrameBufferRealFade( )
{
if ( gsFadeRealCount != gsFadeCount )
{
ShadowVideoSurfaceRectUsingLowPercentTable( FRAME_BUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT );
ShadowVideoSurfaceRectUsingLowPercentTable( FRAME_BUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT );
gsFadeRealCount = gsFadeCount;
}
@@ -654,7 +654,7 @@ void FadeInFrameBufferRealFade( )
for ( cnt = 0; cnt < ( gsFadeLimit - gsFadeCount ); cnt++ )
{
ShadowVideoSurfaceRectUsingLowPercentTable( FRAME_BUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT );
ShadowVideoSurfaceRectUsingLowPercentTable( FRAME_BUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT );
}
// Refresh Screen
@@ -672,11 +672,11 @@ void FadeInFrameBufferRealFade( )
BOOLEAN UpdateSaveBufferWithBackbuffer(void)
{
UINT32 uiDestPitchBYTES, uiSrcPitchBYTES;
UINT8 *pDestBuf, *pSrcBuf;
UINT8 *pDestBuf, *pSrcBuf;
UINT16 usWidth, usHeight;
UINT8 ubBitDepth;
UINT8 ubBitDepth;
// Update saved buffer - do for the viewport size ony!
GetCurrentVideoSettings( &usWidth, &usHeight, &ubBitDepth );
@@ -686,8 +686,8 @@ BOOLEAN UpdateSaveBufferWithBackbuffer(void)
if(gbPixelDepth==16)
{
// BLIT HERE
Blt16BPPTo16BPP((UINT16 *)pDestBuf, uiDestPitchBYTES,
(UINT16 *)pSrcBuf, uiSrcPitchBYTES,
Blt16BPPTo16BPP((UINT16 *)pDestBuf, uiDestPitchBYTES,
(UINT16 *)pSrcBuf, uiSrcPitchBYTES,
0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT );
}