Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Daveo 2001-04-17 20:57:00 +00:00
parent ccbfd41b53
commit 27360f5cb4
7 changed files with 55 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
makefile.gaz
View File

@ -93,6 +93,8 @@ frontend_src := credits \
scrollbg \ scrollbg \
start start
fmv_src := fmv
game_src := convo \ game_src := convo \
game \ game \
gamebubs \ gamebubs \
@ -384,32 +386,33 @@ EUR_CPE2X_PARAM :=/CE
cddata: cddata:
ifeq ($(USER_NAME),CDBUILD) ifeq ($(USER_NAME),CDBUILD)
$(MKDIR) -p $(CD_DIR) @$(MKDIR) -p $(CD_DIR)
$(CPE2BIN) $(CPE_FILE) $(CD_DIR)/$(BIN_OUTFILE) @$(CPE2BIN) $(CPE_FILE) $(CD_DIR)/$(BIN_OUTFILE)
$(CP) -u $(BIGLUMP_FILE) $(CD_DIR) -f @$(CP) -u $(BIGLUMP_FILE) $(CD_DIR) -f
$(TGA2GFX) graphics/screens/legal.tga $(CD_DIR)/LEGAL.GFX @$(TGA2GFX) graphics/screens/legal.tga $(CD_DIR)/LEGAL.GFX
$(CP) -u Data/CdData/$(TERRITORY).cnf $(CD_DIR)/SYSTEM.CNF -f @$(CP) -u Data/CdData/$(TERRITORY).cnf $(CD_DIR)/SYSTEM.CNF -f
$(CP) -u Data/CdData/$(TERRITORY).ccs $(CD_BUILD_DIR)/$(TERRITORY).ccs @$(CP) -u Data/CdData/$(TERRITORY).ccs $(CD_BUILD_DIR)/$(TERRITORY).ccs
$(PKUNZIP) -n data/CDData/ZZZZZZZ.ZIP $(CD_DIR)/ >nul @$(CP) -u Data/CdData/thq.str $(CD_DIR)/thq.str
$(RAR) x data/CDData/ZZZZZZZ.RAR $(CD_DIR)/ -y >nul @$(CP) -u Data/CdData/intro.str $(CD_DIR)/intro.str
$(ECHO) HERE # @$(PKUNZIP) -n data/CDData/ZZZZZZZ.ZIP $(CD_DIR)/ >nul
@$(RAR) x data/CDData/ZZZZZZZ.RAR $(CD_DIR)/ -y >nul
@$(ECHO) HERE
# Compile bootstrap # Compile bootstrap
ccpsx -O2 -g $(BOOTSTRAP_IN) -c -Xo$801c0000 $(COMMON_CCFLAGS) -oPsxBoot.o @ccpsx -O2 -g $(BOOTSTRAP_IN) -c -Xo$801c0000 $(COMMON_CCFLAGS) -oPsxBoot.o
slink -m -psx -c -v -z -o 0x801c0000 -cpemunge -we -wm -wo @$(BOOTSTRAP_DIR)/psxboot.ln,$(BOOTSTRAP_CPE),$(BOOTSTRAP_SYM),$(BOOTSTRAP_MAP) @slink -m -psx -c -v -z -o 0x801c0000 -cpemunge -we -wm -wo @$(BOOTSTRAP_DIR)/psxboot.ln,$(BOOTSTRAP_CPE),$(BOOTSTRAP_SYM),$(BOOTSTRAP_MAP)
$(RM) PsxBoot.o @$(RM) PsxBoot.o
Cpe2Exe $($(TERRITORY)_CPE2X_PARAM) $(BOOTSTRAP_CPE) @Cpe2Exe $($(TERRITORY)_CPE2X_PARAM) $(BOOTSTRAP_CPE)
$(CP) -u $(BOOTSTRAP_EXE) $($(TERRITORY)_BOOTSTRAP_OUT) -f @$(CP) -u $(BOOTSTRAP_EXE) $($(TERRITORY)_BOOTSTRAP_OUT) -f
$(ECHO) $(TERRITORY) Psx CD Built @$(ECHO) $(TERRITORY) Psx CD Built
endif
buildiso: @$(BUILDCD) -i$(CD_BUILD_DIR)/psx.img -l data/cddata/$(TERRITORY).cti
$(BUILDCD) -i$(CD_BUILD_DIR)/psx.img -l data/cddata/$(TERRITORY).cti @$(STRIPISO) s 2352 $(CD_BUILD_DIR)/psx.img $(CD_BUILD_DIR)/$(TERRITORY).iso
$(STRIPISO)s 2352 $(CD_BUILD_DIR)/psx.img $(CD_BUILD_DIR)/$(TERRITORY).iso @$(RM) $(CD_BUILD_DIR)/psx.img
$(RM) $(CD_BUILD_DIR)/psx.img @$(RM) CDW900E.toc
$(RM) CDW900E.toc @$(RM) QSheet.toc
$(RM) QSheet.toc
@$(ECHO) $(TERRITORY) Iso Built @$(ECHO) $(TERRITORY) Iso Built
endif
# tools\STRIPISO.EXE s 2336 $(CD_BUILD_DIR)/psx.img $(CD_BUILD_DIR)/$(TERRITORY).iso # tools\STRIPISO.EXE s 2336 $(CD_BUILD_DIR)/psx.img $(CD_BUILD_DIR)/$(TERRITORY).iso

4
source/fileio/filetab.cpp
View File

@ -7,9 +7,9 @@ char *FilenameList[FILEPOS_MAX]=
{ {
"BIGLUMP.BIN", "BIGLUMP.BIN",
"BIGLUMP.BIN", "BIGLUMP.BIN",
//"TRACK1.IXA", "THQ.STR",
"INTRO.STR",
//"CLIMAX.STR", //"CLIMAX.STR",
//"INTRO.STR",
//"LEVEL1.STR", //"LEVEL1.STR",
//"LEVEL2.STR", //"LEVEL2.STR",
//"LEVEL3.STR", //"LEVEL3.STR",

4
source/fileio/filetab.h
View File

@ -10,8 +10,8 @@ enum FILEPOS_ENUM
{ {
FILEPOS_BIGLUMP, FILEPOS_BIGLUMP,
FILEPOS_TRACK1, FILEPOS_TRACK1,
// FILEPOS_CLIMAX_STR, FILEPOS_THQ_STR,
// FILEPOS_INTRO_STR, FILEPOS_INTRO_STR,
// FILEPOS_LEVEL1_STR, // FILEPOS_LEVEL1_STR,
// FILEPOS_LEVEL2_STR, // FILEPOS_LEVEL2_STR,
// FILEPOS_LEVEL3_STR, // FILEPOS_LEVEL3_STR,

4
source/fmv/fmv.cpp
View File

@ -40,9 +40,9 @@
#include "..\..\tools\vlc\include\vlc_bit.h" #include "..\..\tools\vlc\include\vlc_bit.h"
//#if defined(__USER_paul__) #if defined(__USER_paul__)
#define FORCE_FMV 1 #define FORCE_FMV 1
//#endif #endif
#if __FILE_SYSTEM__==CD | FORCE_FMV #if __FILE_SYSTEM__==CD | FORCE_FMV
#define ENABLE_FMV #define ENABLE_FMV

19
source/game/game.cpp
View File

@ -95,11 +95,28 @@ int CGameScene::s_levelFinished;
CGameScene GameScene; CGameScene GameScene;
/*****************************************************************************/
void CGameScene::AspectCorrectCamera()
{
const s32 Scale = (512<<12)/(256);
CamMtx.m[0][0] = ((s32)CamMtx.m[0][0] * Scale)>>12;
CamMtx.m[0][1] = ((s32)CamMtx.m[0][1] * Scale)>>12;
CamMtx.m[0][2] = ((s32)CamMtx.m[0][2] * Scale)>>12;
CamMtx.t[0] = (CamMtx.t[0] * Scale)>>12;
}
/*****************************************************************************/ /*****************************************************************************/
void CGameScene::init() void CGameScene::init()
{ {
// Setup Constant Camera Matrix
SetIdentNoTrans(&CamMtx); SetIdentNoTrans(&CamMtx);
CamMtx.t[2]=ZPos; CamMtx.t[2]=ZPos;
// AspectCorrectCamera();
SetRotMatrix(&CamMtx);
SetTransMatrix(&CamMtx);
s_genericFont=new ("CGameScene::Init") FontBank(); s_genericFont=new ("CGameScene::Init") FontBank();
s_genericFont->initialise( &standardFont ); s_genericFont->initialise( &standardFont );
@ -151,7 +168,7 @@ void CGameScene::shutdown()
/*****************************************************************************/ /*****************************************************************************/
void CGameScene::render() void CGameScene::render()
{ {
CamMtx.t[2]=ZPos; // Temp // CamMtx.t[2]=ZPos; // Temp
m_pauseMenu->render(); m_pauseMenu->render();
CConversation::render(); CConversation::render();

4
source/game/game.h
View File

@ -31,7 +31,7 @@ virtual int canPause();
int readyToShutdown(); int readyToShutdown();
char *getSceneName() {return "Game";} char *getSceneName() {return "Game";}
static MATRIX *GetCamMtx() {return(&CamMtx);} // static MATRIX *GetCamMtx() {return(&CamMtx);}
class CPlayer *getPlayer(); class CPlayer *getPlayer();
void sendEvent( GAME_EVENT evt, class CThing *sourceThing ); void sendEvent( GAME_EVENT evt, class CThing *sourceThing );
@ -43,6 +43,8 @@ protected:
void initLevel(); void initLevel();
void shutdownLevel(bool CleanUp); void shutdownLevel(bool CleanUp);
void AspectCorrectCamera();
CLevel Level; CLevel Level;
class CPauseMenu *m_pauseMenu; class CPauseMenu *m_pauseMenu;
class CPlayer *m_player; class CPlayer *m_player;

5
source/gfx/actor.cpp
View File

@ -335,6 +335,7 @@ u16 ThisFrame=ThisAnim->Anim[Frame];
/*****************************************************************************/ /*****************************************************************************/
int ActorOT=10;
POLY_FT4 *CActorGfx::Render(DVECTOR &Pos,int Anim,int Frame,bool XFlip,bool YFlip,bool Shadow) POLY_FT4 *CActorGfx::Render(DVECTOR &Pos,int Anim,int Frame,bool XFlip,bool YFlip,bool Shadow)
{ {
sSpriteFrame *FrameGfx=GetFrame(Anim,Frame); sSpriteFrame *FrameGfx=GetFrame(Anim,Frame);
@ -355,7 +356,7 @@ POLY_FT4 *Ft4=GetPrimFT4();
setRGB0(Ft4,128,128,128); setRGB0(Ft4,128,128,128);
Ft4->tpage=TPage; Ft4->tpage=TPage;
Ft4->clut=Clut; Ft4->clut=Clut;
AddPrimToList(Ft4,10); AddPrimToList(Ft4,ActorOT);
if (Shadow) if (Shadow)
{ {
@ -367,7 +368,7 @@ POLY_FT4 *Ft4=GetPrimFT4();
sFt4->y1+=ShadowYOfs; sFt4->y1+=ShadowYOfs;
setSemiTrans(sFt4,1); setSemiTrans(sFt4,1);
setRGB0(sFt4,0,0,0); setRGB0(sFt4,0,0,0);
AddPrimToList(sFt4,10); AddPrimToList(sFt4,ActorOT);
} }
return(Ft4); return(Ft4);