6 duplicates remaining

src/BRSRC13/CORE/FW/brprintf.c

@@ -1,4 +1,4 @@
-#include "printf.h"
+#include "brprintf.h"
 
 char rscid[48];
 

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"

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 <stdarg.h>
 

src/BRSRC13/CORE/STD/brmath.c

@@ -1,4 +1,4 @@
-#include "math.h"
+#include "brmath.h"
 
 char rscid[46];
 

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"

src/BRSRC13/CORE/STD/brstddiag.c

@@ -1,4 +1,4 @@
-#include "stddiag.h"
+#include "brstddiag.h"
 
 br_diaghandler BrStdioDiagHandler;
 br_diaghandler *_BrDefaultDiagHandler;

src/BRSRC13/CORE/STD/brstdfile.c

@@ -1,4 +1,4 @@
-#include "stdfile.h"
+#include "brstdfile.h"
 
 #include <stdio.h>
 #include <string.h>

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"

src/BRSRC13/CORE/STD/brstdmem.c

@@ -1,4 +1,4 @@
-#include "stdmem.h"
+#include "brstdmem.h"
 
 #include <stdlib.h>
 

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"

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

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) {

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);

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() {

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();

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

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

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() {

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();

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

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

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,