From 27360f5cb42c674876348787ad44955f6a629f24 Mon Sep 17 00:00:00 2001 From: Daveo Date: Tue, 17 Apr 2001 20:57:00 +0000 Subject: [PATCH] --- makefile.gaz | 47 +++++++++++++++++++++------------------ source/fileio/filetab.cpp | 4 ++-- source/fileio/filetab.h | 4 ++-- source/fmv/fmv.cpp | 4 ++-- source/game/game.cpp | 19 +++++++++++++++- source/game/game.h | 4 +++- source/gfx/actor.cpp | 5 +++-- 7 files changed, 55 insertions(+), 32 deletions(-) diff --git a/makefile.gaz b/makefile.gaz index 657745ae9..e2ec80425 100644 --- a/makefile.gaz +++ b/makefile.gaz @@ -93,6 +93,8 @@ frontend_src := credits \ scrollbg \ start +fmv_src := fmv + game_src := convo \ game \ gamebubs \ @@ -384,32 +386,33 @@ EUR_CPE2X_PARAM :=/CE cddata: ifeq ($(USER_NAME),CDBUILD) - $(MKDIR) -p $(CD_DIR) - $(CPE2BIN) $(CPE_FILE) $(CD_DIR)/$(BIN_OUTFILE) - $(CP) -u $(BIGLUMP_FILE) $(CD_DIR) -f - $(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).ccs $(CD_BUILD_DIR)/$(TERRITORY).ccs - $(PKUNZIP) -n data/CDData/ZZZZZZZ.ZIP $(CD_DIR)/ >nul - $(RAR) x data/CDData/ZZZZZZZ.RAR $(CD_DIR)/ -y >nul - $(ECHO) HERE + @$(MKDIR) -p $(CD_DIR) + @$(CPE2BIN) $(CPE_FILE) $(CD_DIR)/$(BIN_OUTFILE) + @$(CP) -u $(BIGLUMP_FILE) $(CD_DIR) -f + @$(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).ccs $(CD_BUILD_DIR)/$(TERRITORY).ccs + @$(CP) -u Data/CdData/thq.str $(CD_DIR)/thq.str + @$(CP) -u Data/CdData/intro.str $(CD_DIR)/intro.str +# @$(PKUNZIP) -n data/CDData/ZZZZZZZ.ZIP $(CD_DIR)/ >nul + @$(RAR) x data/CDData/ZZZZZZZ.RAR $(CD_DIR)/ -y >nul + @$(ECHO) HERE # Compile bootstrap - 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) - $(RM) PsxBoot.o - Cpe2Exe $($(TERRITORY)_CPE2X_PARAM) $(BOOTSTRAP_CPE) - $(CP) -u $(BOOTSTRAP_EXE) $($(TERRITORY)_BOOTSTRAP_OUT) -f - $(ECHO) $(TERRITORY) Psx CD Built -endif + @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) + @$(RM) PsxBoot.o + @Cpe2Exe $($(TERRITORY)_CPE2X_PARAM) $(BOOTSTRAP_CPE) + @$(CP) -u $(BOOTSTRAP_EXE) $($(TERRITORY)_BOOTSTRAP_OUT) -f + @$(ECHO) $(TERRITORY) Psx CD Built -buildiso: - $(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 - $(RM) $(CD_BUILD_DIR)/psx.img - $(RM) CDW900E.toc - $(RM) QSheet.toc + @$(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 + @$(RM) $(CD_BUILD_DIR)/psx.img + @$(RM) CDW900E.toc + @$(RM) QSheet.toc @$(ECHO) $(TERRITORY) Iso Built +endif # tools\STRIPISO.EXE s 2336 $(CD_BUILD_DIR)/psx.img $(CD_BUILD_DIR)/$(TERRITORY).iso diff --git a/source/fileio/filetab.cpp b/source/fileio/filetab.cpp index 79e52b868..5c1614ee7 100644 --- a/source/fileio/filetab.cpp +++ b/source/fileio/filetab.cpp @@ -7,9 +7,9 @@ char *FilenameList[FILEPOS_MAX]= { "BIGLUMP.BIN", "BIGLUMP.BIN", -//"TRACK1.IXA", +"THQ.STR", +"INTRO.STR", //"CLIMAX.STR", -//"INTRO.STR", //"LEVEL1.STR", //"LEVEL2.STR", //"LEVEL3.STR", diff --git a/source/fileio/filetab.h b/source/fileio/filetab.h index b3e5f2e0d..ecfa4dd1e 100644 --- a/source/fileio/filetab.h +++ b/source/fileio/filetab.h @@ -10,8 +10,8 @@ enum FILEPOS_ENUM { FILEPOS_BIGLUMP, FILEPOS_TRACK1, -// FILEPOS_CLIMAX_STR, -// FILEPOS_INTRO_STR, + FILEPOS_THQ_STR, + FILEPOS_INTRO_STR, // FILEPOS_LEVEL1_STR, // FILEPOS_LEVEL2_STR, // FILEPOS_LEVEL3_STR, diff --git a/source/fmv/fmv.cpp b/source/fmv/fmv.cpp index 848d9b8a9..f7df10f1a 100644 --- a/source/fmv/fmv.cpp +++ b/source/fmv/fmv.cpp @@ -40,9 +40,9 @@ #include "..\..\tools\vlc\include\vlc_bit.h" -//#if defined(__USER_paul__) +#if defined(__USER_paul__) #define FORCE_FMV 1 -//#endif +#endif #if __FILE_SYSTEM__==CD | FORCE_FMV #define ENABLE_FMV diff --git a/source/game/game.cpp b/source/game/game.cpp index e05eb370c..000785895 100644 --- a/source/game/game.cpp +++ b/source/game/game.cpp @@ -95,11 +95,28 @@ int CGameScene::s_levelFinished; 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() { +// Setup Constant Camera Matrix SetIdentNoTrans(&CamMtx); CamMtx.t[2]=ZPos; +// AspectCorrectCamera(); + SetRotMatrix(&CamMtx); + SetTransMatrix(&CamMtx); + s_genericFont=new ("CGameScene::Init") FontBank(); s_genericFont->initialise( &standardFont ); @@ -151,7 +168,7 @@ void CGameScene::shutdown() /*****************************************************************************/ void CGameScene::render() { - CamMtx.t[2]=ZPos; // Temp +// CamMtx.t[2]=ZPos; // Temp m_pauseMenu->render(); CConversation::render(); diff --git a/source/game/game.h b/source/game/game.h index e2baaf485..56aa091e4 100644 --- a/source/game/game.h +++ b/source/game/game.h @@ -31,7 +31,7 @@ virtual int canPause(); int readyToShutdown(); char *getSceneName() {return "Game";} - static MATRIX *GetCamMtx() {return(&CamMtx);} +// static MATRIX *GetCamMtx() {return(&CamMtx);} class CPlayer *getPlayer(); void sendEvent( GAME_EVENT evt, class CThing *sourceThing ); @@ -43,6 +43,8 @@ protected: void initLevel(); void shutdownLevel(bool CleanUp); + void AspectCorrectCamera(); + CLevel Level; class CPauseMenu *m_pauseMenu; class CPlayer *m_player; diff --git a/source/gfx/actor.cpp b/source/gfx/actor.cpp index fa1a1ce2e..77bef0235 100644 --- a/source/gfx/actor.cpp +++ b/source/gfx/actor.cpp @@ -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) { sSpriteFrame *FrameGfx=GetFrame(Anim,Frame); @@ -355,7 +356,7 @@ POLY_FT4 *Ft4=GetPrimFT4(); setRGB0(Ft4,128,128,128); Ft4->tpage=TPage; Ft4->clut=Clut; - AddPrimToList(Ft4,10); + AddPrimToList(Ft4,ActorOT); if (Shadow) { @@ -367,7 +368,7 @@ POLY_FT4 *Ft4=GetPrimFT4(); sFt4->y1+=ShadowYOfs; setSemiTrans(sFt4,1); setRGB0(sFt4,0,0,0); - AddPrimToList(sFt4,10); + AddPrimToList(sFt4,ActorOT); } return(Ft4);