Add cammode defines

This commit is contained in:
ABelliqueux 2021-06-22 17:24:52 +02:00
parent fa14c1ab7b
commit 9743d47465
5 changed files with 80 additions and 101 deletions

View File

@ -3,6 +3,14 @@
#include <sys/types.h>
#include <libgte.h>
// Camera modes
#define ACTOR 0
#define ROTATE 1
#define FIXED 2
#define TRACK 3
#define FLYCAM 4
#define FOLLOW 5
typedef struct{
int x, xv; // x: current value += xv : new value

33
main.c
View File

@ -29,7 +29,6 @@
#include "physics.h"
#include "graphics.h"
#include "space.h"
//~ #include "pcdrv.h"
#define USECD
@ -43,34 +42,6 @@ extern u_long __lvl1_end;
u_long overlaySize = 0;
//~ #define LLEVEL 0
//#define USE_POINTER
//~ #if LLEVEL == 0
//~ static const char*const overlayFile = "\\level0.bin;1";
//~ #else
//~ static const char*const overlayFile = "\\level1.bin;1";
//~ #endif
//~ #ifdef USE_POINTER
//~ #if LEVEL == 0
//~ #include "levels/level.h"
//~ #else
//~ #include "levels/level1.h"
//~ #endif
//~ #else
//~ #define str (char*)(&__load_start_ovly0)
//~ #endif
// END OVERLAY
#include "levels/level0.h"
#include "levels/level1.h"
@ -142,7 +113,7 @@ u_short timer = 0;
// Cam stuff
int camMode = 2;
int camMode = FIXED;
VECTOR angle = {250,0,0,0};
@ -403,7 +374,7 @@ int main() {
#endif
SwitchLevel( overlayFile, &load_all_overlays_here, &curLvl, loadLvl);
SwitchLevel( &curLvl, loadLvl);
//~ levelHasChanged = 0;
levelWas = level;

2
psx.c
View File

@ -187,7 +187,7 @@ int LoadLevelCD(const char*const LevelName, u_long * LoadAddress){
return cdread;
};
void SwitchLevel(const char*const LevelName, u_long * LoadAddress, LEVEL * curLevel, LEVEL * loadLevel ){
void SwitchLevel( LEVEL * curLevel, LEVEL * loadLevel ){
//~ ScrRst();

2
psx.h
View File

@ -26,6 +26,6 @@ void LvlPtrSet( LEVEL * curLevel, LEVEL * level );
int LoadLevelCD(const char*const LevelName, u_long * LoadAddress);
void SwitchLevel(const char*const LevelName, u_long * LoadAddress, LEVEL * curLevel, LEVEL * loadLevel);
void SwitchLevel( LEVEL * curLevel, LEVEL * loadLevel);
void LoadTexture(u_long * tim, TIM_IMAGE * tparam);