mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-07-11 14:08:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove hoverbike

Browse Source
This commit is contained in:
Ryan Dwyer
2022-11-05 11:24:29 +10:00
parent 05fe244f60
commit 67bc74f08f
15 changed files with 429 additions and 2035 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/game/bondbike.h
-24
View File
@@ -1,24 +0,0 @@
#ifndef IN_GAME_BONDBIKE_H
#define IN_GAME_BONDBIKE_H
#include <ultra64.h>
#include "data.h"
#include "types.h"
void bbikeInit(void);
void bbikeExit(void);
void bbikeUpdateVehicleOffset(void);
void bbikeTryDismountAngle(f32 relativeangle, f32 distance);
void bbikeHandleActivate(void);
void bbikeApplyMoveData(struct movedata *data);
void bbike0f0d2b40(struct defaultobj *bike, struct coord *arg1, f32 arg2, struct defaultobj *obstacle);
s32 bbikeCalculateNewPosition(struct coord *arg0, f32 arg1);
s32 bbikeCalculateNewPositionWithPush(struct coord *arg0, f32 arg1);
void bbikeUpdateVertical(struct coord *pos);
s32 bbike0f0d3680(struct coord *arg0, struct coord *arg1, struct coord *arg2);
s32 bbike0f0d36d4(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct coord *arg3, struct coord *arg4);
s32 bbike0f0d3840(struct coord *arg0, struct coord *arg1, struct coord *arg2);
s32 bbike0f0d3940(struct coord *arg0, struct coord *arg1, struct coord *arg2);
void bbike0f0d3c60(struct coord *arg0);
void bbikeTick(void);
#endif
src/include/game/propobj.h
+2 -3
View File
@@ -153,7 +153,6 @@ void hovercarFindNextPath(struct hovercarobj *hovercar);
void hovercarStartNextPath(struct hovercarobj *hovercar);
void hovercarIncrementStep(struct hovercarobj *hovercar);
f32 objCollide(struct defaultobj *obj, struct coord *arg1, f32 arg2);
void hoverbikeUpdateMovement(struct hoverbikeobj *hoverbike, f32 arg1, f32 arg2, f32 arg3);
void platformDisplaceProps2(struct prop *platform, Mtxf *arg1);
bool rocketTickFbw(struct weaponobj *rocket);
s32 projectileLaunch(struct defaultobj *obj, struct projectile *projectile, struct coord *arg2, struct coord *arg3);
@@ -294,8 +293,8 @@ void weaponSetGunfireVisible(struct prop *prop, bool visible, s16 room);
bool weaponIsGunfireVisible(struct prop *prop);
s32 hatGetType(struct prop *prop);
bool doorIsUnlocked(struct prop *playerprop, struct prop *doorprop);
bool doorIsPosInRange(struct doorobj *door, struct coord *pos, f32 arg2, bool isbike);
bool doorIsObjInRange(struct doorobj *door, struct defaultobj *obj, bool isbike);
bool doorIsPosInRange(struct doorobj *door, struct coord *pos, f32 arg2);
bool doorIsObjInRange(struct doorobj *door, struct defaultobj *obj);
bool vectorIsInFrontOfDoor(struct doorobj *door, struct coord *vector);
bool doorIsRangeEmpty(struct doorobj *door);
void doorsCheckAutomatic(void);
src/include/types.h
-17
View File
@@ -1830,23 +1830,6 @@ struct blockedpathobj { // objtype 0x32
struct blockedpathobj *next;
};
struct hoverbikeobj { // objtype 0x33
struct defaultobj base;
struct hov hov;
/*0x09c*/ f32 speed[2];
/*0x0a4*/ f32 prevpos[2];
/*0x0ac*/ f32 w;
/*0x0b0*/ f32 rels[2];
/*0x0b8*/ f32 exreal;
/*0x0bc*/ f32 ezreal;
/*0x0c0*/ f32 ezreal2;
/*0x0c4*/ f32 leanspeed;
/*0x0c8*/ f32 leandiff;
/*0x0cc*/ s32 maxspeedtime240;
/*0x0d0*/ f32 speedabs[2];
/*0x0d8*/ f32 speedrel[2];
};
struct hoverpropobj { // objtype 0x35
struct defaultobj base;
struct hov hov;