From 4fa13b6749244d72bfa53886e008de0aaa23c419 Mon Sep 17 00:00:00 2001 From: Jeff Harris Date: Sat, 16 Nov 2019 09:31:58 -0800 Subject: [PATCH] 6 duplicates remaining --- src/BRSRC13/CORE/FW/{printf.c => brprintf.c} | 2 +- src/BRSRC13/CORE/FW/{printf.h => brprintf.h} | 4 +- src/BRSRC13/CORE/FW/diag.c | 2 +- src/BRSRC13/CORE/STD/{math.c => brmath.c} | 2 +- src/BRSRC13/CORE/STD/{math.h => brmath.h} | 4 +- .../CORE/STD/{stddiag.c => brstddiag.c} | 2 +- .../CORE/STD/{stddiag.h => brstddiag.h} | 0 .../CORE/STD/{stdfile.c => brstdfile.c} | 2 +- .../CORE/STD/{stdfile.h => brstdfile.h} | 4 +- src/BRSRC13/CORE/STD/{stdmem.c => brstdmem.c} | 2 +- src/BRSRC13/CORE/STD/{stdmem.h => brstdmem.h} | 4 +- src/DETHRACE/source/common/car.c | 7 --- src/DETHRACE/source/common/finteray.c | 55 ------------------- src/DETHRACE/source/common/finteray.h | 19 ------- src/DETHRACE/source/common/newgame.c | 12 ---- src/DETHRACE/source/common/newgame.h | 10 ---- src/DETHRACE/source/common/opponent.c | 14 ----- src/DETHRACE/source/common/opponent.h | 12 ---- src/DETHRACE/source/common/racesumm.c | 10 ---- src/DETHRACE/source/common/racesumm.h | 5 -- src/DETHRACE/source/common/raycast.c | 17 ------ src/DETHRACE/source/common/raycast.h | 14 ----- src/types/dr_types.h | 12 ---- 23 files changed, 14 insertions(+), 201 deletions(-) rename src/BRSRC13/CORE/FW/{printf.c => brprintf.c} (95%) rename src/BRSRC13/CORE/FW/{printf.h => brprintf.h} (89%) rename src/BRSRC13/CORE/STD/{math.c => brmath.c} (94%) rename src/BRSRC13/CORE/STD/{math.h => brmath.h} (90%) rename src/BRSRC13/CORE/STD/{stddiag.c => brstddiag.c} (90%) rename src/BRSRC13/CORE/STD/{stddiag.h => brstddiag.h} (100%) rename src/BRSRC13/CORE/STD/{stdfile.c => brstdfile.c} (99%) rename src/BRSRC13/CORE/STD/{stdfile.h => brstdfile.h} (95%) rename src/BRSRC13/CORE/STD/{stdmem.c => brstdmem.c} (96%) rename src/BRSRC13/CORE/STD/{stdmem.h => brstdmem.h} (88%) diff --git a/src/BRSRC13/CORE/FW/printf.c b/src/BRSRC13/CORE/FW/brprintf.c similarity index 95% rename from src/BRSRC13/CORE/FW/printf.c rename to src/BRSRC13/CORE/FW/brprintf.c index 40658d2c..cbbbb11b 100644 --- a/src/BRSRC13/CORE/FW/printf.c +++ b/src/BRSRC13/CORE/FW/brprintf.c @@ -1,4 +1,4 @@ -#include "printf.h" +#include "brprintf.h" char rscid[48]; diff --git a/src/BRSRC13/CORE/FW/printf.h b/src/BRSRC13/CORE/FW/brprintf.h similarity index 89% rename from src/BRSRC13/CORE/FW/printf.h rename to src/BRSRC13/CORE/FW/brprintf.h index 4fbdd653..760c644f 100644 --- a/src/BRSRC13/CORE/FW/printf.h +++ b/src/BRSRC13/CORE/FW/brprintf.h @@ -1,5 +1,5 @@ -#ifndef _PRINTF_H_ -#define _PRINTF_H_ +#ifndef _BRPRINTF_H_ +#define _BRPRINTF_H_ #include "dr_types.h" #include "br_types.h" diff --git a/src/BRSRC13/CORE/FW/diag.c b/src/BRSRC13/CORE/FW/diag.c index 43e6b0b9..15bdd31f 100644 --- a/src/BRSRC13/CORE/FW/diag.c +++ b/src/BRSRC13/CORE/FW/diag.c @@ -1,6 +1,6 @@ #include "diag.h" #include "fwsetup.h" -#include "printf.h" +#include "brprintf.h" #include "brstdlib.h" #include diff --git a/src/BRSRC13/CORE/STD/math.c b/src/BRSRC13/CORE/STD/brmath.c similarity index 94% rename from src/BRSRC13/CORE/STD/math.c rename to src/BRSRC13/CORE/STD/brmath.c index 37cd3702..2e4f7ef7 100644 --- a/src/BRSRC13/CORE/STD/math.c +++ b/src/BRSRC13/CORE/STD/brmath.c @@ -1,4 +1,4 @@ -#include "math.h" +#include "brmath.h" char rscid[46]; diff --git a/src/BRSRC13/CORE/STD/math.h b/src/BRSRC13/CORE/STD/brmath.h similarity index 90% rename from src/BRSRC13/CORE/STD/math.h rename to src/BRSRC13/CORE/STD/brmath.h index dee3d55b..6c971db0 100644 --- a/src/BRSRC13/CORE/STD/math.h +++ b/src/BRSRC13/CORE/STD/brmath.h @@ -1,5 +1,5 @@ -#ifndef _MATH_H_ -#define _MATH_H_ +#ifndef _BRMATH_H_ +#define _BRMATH_H_ #include "dr_types.h" #include "br_types.h" diff --git a/src/BRSRC13/CORE/STD/stddiag.c b/src/BRSRC13/CORE/STD/brstddiag.c similarity index 90% rename from src/BRSRC13/CORE/STD/stddiag.c rename to src/BRSRC13/CORE/STD/brstddiag.c index d7adb4e0..7b0a180d 100644 --- a/src/BRSRC13/CORE/STD/stddiag.c +++ b/src/BRSRC13/CORE/STD/brstddiag.c @@ -1,4 +1,4 @@ -#include "stddiag.h" +#include "brstddiag.h" br_diaghandler BrStdioDiagHandler; br_diaghandler *_BrDefaultDiagHandler; diff --git a/src/BRSRC13/CORE/STD/stddiag.h b/src/BRSRC13/CORE/STD/brstddiag.h similarity index 100% rename from src/BRSRC13/CORE/STD/stddiag.h rename to src/BRSRC13/CORE/STD/brstddiag.h diff --git a/src/BRSRC13/CORE/STD/stdfile.c b/src/BRSRC13/CORE/STD/brstdfile.c similarity index 99% rename from src/BRSRC13/CORE/STD/stdfile.c rename to src/BRSRC13/CORE/STD/brstdfile.c index 3f5a3e16..664e5a98 100644 --- a/src/BRSRC13/CORE/STD/stdfile.c +++ b/src/BRSRC13/CORE/STD/brstdfile.c @@ -1,4 +1,4 @@ -#include "stdfile.h" +#include "brstdfile.h" #include #include diff --git a/src/BRSRC13/CORE/STD/stdfile.h b/src/BRSRC13/CORE/STD/brstdfile.h similarity index 95% rename from src/BRSRC13/CORE/STD/stdfile.h rename to src/BRSRC13/CORE/STD/brstdfile.h index 543fb9f3..61c12384 100644 --- a/src/BRSRC13/CORE/STD/stdfile.h +++ b/src/BRSRC13/CORE/STD/brstdfile.h @@ -1,5 +1,5 @@ -#ifndef _STDFILE_H_ -#define _STDFILE_H_ +#ifndef _BRSTDFILE_H_ +#define _BRSTDFILE_H_ #include "dr_types.h" #include "br_types.h" diff --git a/src/BRSRC13/CORE/STD/stdmem.c b/src/BRSRC13/CORE/STD/brstdmem.c similarity index 96% rename from src/BRSRC13/CORE/STD/stdmem.c rename to src/BRSRC13/CORE/STD/brstdmem.c index 74612456..096e2cb8 100644 --- a/src/BRSRC13/CORE/STD/stdmem.c +++ b/src/BRSRC13/CORE/STD/brstdmem.c @@ -1,4 +1,4 @@ -#include "stdmem.h" +#include "brstdmem.h" #include diff --git a/src/BRSRC13/CORE/STD/stdmem.h b/src/BRSRC13/CORE/STD/brstdmem.h similarity index 88% rename from src/BRSRC13/CORE/STD/stdmem.h rename to src/BRSRC13/CORE/STD/brstdmem.h index fec0f5f8..dff05896 100644 --- a/src/BRSRC13/CORE/STD/stdmem.h +++ b/src/BRSRC13/CORE/STD/brstdmem.h @@ -1,5 +1,5 @@ -#ifndef _STDMEM_H_ -#define _STDMEM_H_ +#ifndef _BRSTDMEM_H_ +#define _BRSTDMEM_H_ #include "dr_types.h" #include "br_types.h" diff --git a/src/DETHRACE/source/common/car.c b/src/DETHRACE/source/common/car.c index d23bd252..25827cd2 100644 --- a/src/DETHRACE/source/common/car.c +++ b/src/DETHRACE/source/common/car.c @@ -1612,13 +1612,6 @@ int CrashCarsTogetherSinglePass(br_scalar dt, int pPass, tCollison_data *collide void BringCarToAGrindingHalt(tCollision_info *car) { } -// Offset: 94772 -// Size: 165 -// EAX: b1 -// EDX: b2 -int BoundsOverlapTest(br_bounds *b1, br_bounds *b2) { -} - // Offset: 94940 // Size: 99 // EAX: car1 diff --git a/src/DETHRACE/source/common/finteray.c b/src/DETHRACE/source/common/finteray.c index 8d34c4d4..a832eec8 100644 --- a/src/DETHRACE/source/common/finteray.c +++ b/src/DETHRACE/source/common/finteray.c @@ -13,11 +13,6 @@ br_material *gReal_material; br_scalar gNearest_T; tFace_ref *gPling_face; -// Offset: 0 -// Size: 104 -int BadDiv(br_scalar a, br_scalar b) { -} - // Offset: 104 // Size: 73 // EAX: a @@ -25,16 +20,6 @@ int BadDiv(br_scalar a, br_scalar b) { void DRVector2AccumulateScale(br_vector2 *a, br_vector2 *b, br_scalar s) { } -// Offset: 180 -// Size: 552 -// EAX: b -// EDX: rp -// EBX: rd -int PickBoundsTestRay(br_bounds *b, br_vector3 *rp, br_vector3 *rd, br_scalar t_near, br_scalar t_far, br_scalar *new_t_near, br_scalar *new_t_far) { - int i; - float s; - float t; -} // Offset: 732 // Size: 710 @@ -65,46 +50,6 @@ int ActorRayPick2D(br_actor *ap, br_vector3 *pPosition, br_vector3 *pDir, br_mod int DRSceneRayPick2D(br_actor *world, br_vector3 *pPosition, br_vector3 *pDir, dr_pick2d_cbfn *callback) { } -// Offset: 1544 -// Size: 2059 -// EAX: model -// EDX: material -// EBX: ray_pos -// ECX: ray_dir -int DRModelPick2D(br_model *model, br_material *material, br_vector3 *ray_pos, br_vector3 *ray_dir, br_scalar t_near, br_scalar t_far, dr_modelpick2d_cbfn *callback, void *arg) { - DR_FACE *fp; - int f; - int axis_m; - int axis_0; - int axis_1; - br_scalar t; - br_scalar n; - br_scalar d; - br_vector3 p; - float u0; - float u1; - float u2; - float v0; - float v1; - float v2; - br_scalar v0i1; - br_scalar v0i2; - float alpha; - float beta; - float f_d; - float f_n; - br_scalar s_alpha; - br_scalar s_beta; - br_vector2 map; - int v; - int e; - int r; - br_material *this_material; - br_scalar numerator; - float f_numerator; - int group; -} - // Offset: 3604 // Size: 88 int FindHighestPolyCallBack(br_model *pModel, br_material *pMaterial, br_vector3 *pRay_pos, br_vector3 *pRay_dir, br_scalar pT, int pF, int pE, int pV, br_vector3 *pPoint, br_vector2 *pMap, void *pArg) { diff --git a/src/DETHRACE/source/common/finteray.h b/src/DETHRACE/source/common/finteray.h index c7c25416..13599c46 100644 --- a/src/DETHRACE/source/common/finteray.h +++ b/src/DETHRACE/source/common/finteray.h @@ -4,23 +4,12 @@ #include "dr_types.h" #include "br_types.h" -// Offset: 0 -// Size: 104 -int BadDiv(br_scalar a, br_scalar b); - // Offset: 104 // Size: 73 // EAX: a // EDX: b void DRVector2AccumulateScale(br_vector2 *a, br_vector2 *b, br_scalar s); -// Offset: 180 -// Size: 552 -// EAX: b -// EDX: rp -// EBX: rd -int PickBoundsTestRay(br_bounds *b, br_vector3 *rp, br_vector3 *rd, br_scalar t_near, br_scalar t_far, br_scalar *new_t_near, br_scalar *new_t_far); - // Offset: 732 // Size: 710 // EAX: ap @@ -37,14 +26,6 @@ int ActorRayPick2D(br_actor *ap, br_vector3 *pPosition, br_vector3 *pDir, br_mod // ECX: callback int DRSceneRayPick2D(br_actor *world, br_vector3 *pPosition, br_vector3 *pDir, dr_pick2d_cbfn *callback); -// Offset: 1544 -// Size: 2059 -// EAX: model -// EDX: material -// EBX: ray_pos -// ECX: ray_dir -int DRModelPick2D(br_model *model, br_material *material, br_vector3 *ray_pos, br_vector3 *ray_dir, br_scalar t_near, br_scalar t_far, dr_modelpick2d_cbfn *callback, void *arg); - // Offset: 3604 // Size: 88 int FindHighestPolyCallBack(br_model *pModel, br_material *pMaterial, br_vector3 *pRay_pos, br_vector3 *pRay_dir, br_scalar pT, int pF, int pE, int pV, br_vector3 *pPoint, br_vector2 *pMap, void *pArg); diff --git a/src/DETHRACE/source/common/newgame.c b/src/DETHRACE/source/common/newgame.c index 94181df8..4be58f8a 100644 --- a/src/DETHRACE/source/common/newgame.c +++ b/src/DETHRACE/source/common/newgame.c @@ -403,18 +403,6 @@ void DoNetOptions(tNet_game_options *pGame_options) { void SetOptions(tNet_game_type pGame_type, tNet_game_options *pGame_options) { } -// Offset: 8752 -// Size: 118 -// EAX: pIndex -void PlayRadioOn(int pIndex) { -} - -// Offset: 8872 -// Size: 118 -// EAX: pIndex -void PlayRadioOff(int pIndex) { -} - // Offset: 8992 // Size: 44 void DrawNetChooseInitial() { diff --git a/src/DETHRACE/source/common/newgame.h b/src/DETHRACE/source/common/newgame.h index fb499c32..d9539bb5 100644 --- a/src/DETHRACE/source/common/newgame.h +++ b/src/DETHRACE/source/common/newgame.h @@ -284,16 +284,6 @@ void DoNetOptions(tNet_game_options *pGame_options); // EDX: pGame_options void SetOptions(tNet_game_type pGame_type, tNet_game_options *pGame_options); -// Offset: 8752 -// Size: 118 -// EAX: pIndex -void PlayRadioOn(int pIndex); - -// Offset: 8872 -// Size: 118 -// EAX: pIndex -void PlayRadioOff(int pIndex); - // Offset: 8992 // Size: 44 void DrawNetChooseInitial(); diff --git a/src/DETHRACE/source/common/opponent.c b/src/DETHRACE/source/common/opponent.c index 1cf7b5b0..95288165 100644 --- a/src/DETHRACE/source/common/opponent.c +++ b/src/DETHRACE/source/common/opponent.c @@ -890,20 +890,6 @@ void ToggleMellowOpponents() { void RepairOpponentsSystems() { } -// Offset: 40304 -// Size: 144 -// EAX: pDest_vertex -// EDX: pSrc_vertex -void CopyVertex(br_vertex *pDest_vertex, br_vertex *pSrc_vertex) { -} - -// Offset: 40448 -// Size: 116 -// EAX: pDest_face -// EDX: pSrc_face -void CopyFace(br_face *pDest_face, br_face *pSrc_face) { -} - // Offset: 40564 // Size: 530 // EAX: pSection_to_delete diff --git a/src/DETHRACE/source/common/opponent.h b/src/DETHRACE/source/common/opponent.h index 96bcbe12..e2a7e390 100644 --- a/src/DETHRACE/source/common/opponent.h +++ b/src/DETHRACE/source/common/opponent.h @@ -483,18 +483,6 @@ void ToggleMellowOpponents(); // Size: 184 void RepairOpponentsSystems(); -// Offset: 40304 -// Size: 144 -// EAX: pDest_vertex -// EDX: pSrc_vertex -void CopyVertex(br_vertex *pDest_vertex, br_vertex *pSrc_vertex); - -// Offset: 40448 -// Size: 116 -// EAX: pDest_face -// EDX: pSrc_face -void CopyFace(br_face *pDest_face, br_face *pSrc_face); - // Offset: 40564 // Size: 530 // EAX: pSection_to_delete diff --git a/src/DETHRACE/source/common/racesumm.c b/src/DETHRACE/source/common/racesumm.c index 7cc2cee4..d5dd7891 100644 --- a/src/DETHRACE/source/common/racesumm.c +++ b/src/DETHRACE/source/common/racesumm.c @@ -133,16 +133,6 @@ tSO_result DoEndRaceSummary1() { int completed_already; } -// Offset: 3184 -// Size: 165 -// EAX: model -void PrepareBoundingRadius(br_model *model) { - float d; - float max; - int v; - br_vertex *vp; -} - // Offset: 3352 // Size: 1003 void BuildWrecks() { diff --git a/src/DETHRACE/source/common/racesumm.h b/src/DETHRACE/source/common/racesumm.h index 0c45c23c..a302c1a4 100644 --- a/src/DETHRACE/source/common/racesumm.h +++ b/src/DETHRACE/source/common/racesumm.h @@ -77,11 +77,6 @@ int SummCheckGameOver(int *pCurrent_choice, int *pCurrent_mode); // Size: 288 tSO_result DoEndRaceSummary1(); -// Offset: 3184 -// Size: 165 -// EAX: model -void PrepareBoundingRadius(br_model *model); - // Offset: 3352 // Size: 1003 void BuildWrecks(); diff --git a/src/DETHRACE/source/common/raycast.c b/src/DETHRACE/source/common/raycast.c index 4793de12..ee45c749 100644 --- a/src/DETHRACE/source/common/raycast.c +++ b/src/DETHRACE/source/common/raycast.c @@ -28,12 +28,6 @@ void InitRayCasting() { int BadDiv(br_scalar a, br_scalar b) { } -// Offset: 516 -// Size: 73 -// EAX: a -// EDX: b -void DRVector2AccumulateScale(br_vector2 *a, br_vector2 *b, br_scalar s) { -} // Offset: 592 // Size: 544 @@ -130,17 +124,6 @@ int DRModelPick2D(br_model *model, br_material *material, br_vector3 *ray_pos, b double f_numerator; } -// Offset: 4148 -// Size: 141 -int FindHighestPolyCallBack(br_model *pModel, br_material *pMaterial, br_vector3 *pRay_pos, br_vector3 *pRay_dir, br_scalar pT, int pF, int pE, int pV, br_vector3 *pPoint, br_vector2 *pMap, void *pArg) { - br_scalar the_y; -} - -// Offset: 4292 -// Size: 112 -int FindHighestCallBack(br_actor *pActor, br_model *pModel, br_material *pMaterial, br_vector3 *pRay_pos, br_vector3 *pRay_dir, br_scalar pT_near, br_scalar pT_far, void *pArg) { -} - // Offset: 4404 // Size: 194 // EAX: pPosition diff --git a/src/DETHRACE/source/common/raycast.h b/src/DETHRACE/source/common/raycast.h index 719afb49..0bd5fdfe 100644 --- a/src/DETHRACE/source/common/raycast.h +++ b/src/DETHRACE/source/common/raycast.h @@ -19,12 +19,6 @@ void InitRayCasting(); // Size: 104 int BadDiv(br_scalar a, br_scalar b); -// Offset: 516 -// Size: 73 -// EAX: a -// EDX: b -void DRVector2AccumulateScale(br_vector2 *a, br_vector2 *b, br_scalar s); - // Offset: 592 // Size: 544 // EAX: b @@ -64,14 +58,6 @@ int DRScenePick2D(br_actor *world, br_actor *camera, dr_pick2d_cbfn *callback, v // ECX: ray_dir int DRModelPick2D(br_model *model, br_material *material, br_vector3 *ray_pos, br_vector3 *ray_dir, br_scalar t_near, br_scalar t_far, dr_modelpick2d_cbfn *callback, void *arg); -// Offset: 4148 -// Size: 141 -int FindHighestPolyCallBack(br_model *pModel, br_material *pMaterial, br_vector3 *pRay_pos, br_vector3 *pRay_dir, br_scalar pT, int pF, int pE, int pV, br_vector3 *pPoint, br_vector2 *pMap, void *pArg); - -// Offset: 4292 -// Size: 112 -int FindHighestCallBack(br_actor *pActor, br_model *pModel, br_material *pMaterial, br_vector3 *pRay_pos, br_vector3 *pRay_dir, br_scalar pT_near, br_scalar pT_far, void *pArg); - // Offset: 4404 // Size: 194 // EAX: pPosition diff --git a/src/types/dr_types.h b/src/types/dr_types.h index a6a0fdc2..a953c193 100644 --- a/src/types/dr_types.h +++ b/src/types/dr_types.h @@ -3233,18 +3233,6 @@ typedef struct tInterface_spec { tRectile *recopy_areas; } tInterface_spec; -typedef struct tm { - int tm_sec; - int tm_min; - int tm_hour; - int tm_mday; - int tm_mon; - int tm_year; - int tm_wday; - int tm_yday; - int tm_isdst; -} tm; - typedef enum view_to_screen_type { BR_VTOS_PARALLEL = 0,