kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

remove redundant SQ definitions

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-13 20:31:14 -05:00
parent 425e05a58b
commit 50e1368ae1
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/MM/ch/conga.c
View File

@@ -2,7 +2,7 @@
#include "rand.h" #include "rand.h"
#include "functions.h" #include "functions.h"
#include "variables.h" #include "variables.h"
#include <math.h>
#ifndef MIN #ifndef MIN
#define MIN(s,t) ((s)<(t)?(s):(t)) #define MIN(s,t) ((s)<(t)?(s):(t))
#endif #endif
@@ -11,10 +11,6 @@
#define MAX(s,t) ((s)<(t)?(t):(s)) #define MAX(s,t) ((s)<(t)?(t):(s))
#endif #endif
#ifndef SQUARE
#define SQUARE(s) ((s)*(s))
#endif
void func_80328FB0(Actor *, f32); void func_80328FB0(Actor *, f32);
void subaddie_set_state_with_direction(Actor*, s32, f32, s32); void subaddie_set_state_with_direction(Actor*, s32, f32, s32);
@@ -194,7 +190,7 @@ void __chConga_sendOrangeProjectile(ActorMarker *congaMarker){
orangePtr->velocity_y = (60.0)*((conga_state == 7) ? 0.5: 1.0); orangePtr->velocity_y = (60.0)*((conga_state == 7) ? 0.5: 1.0);
orangePtr->velocity_z = plyr.pos_z - orangePtr->position_z; orangePtr->velocity_z = plyr.pos_z - orangePtr->position_z;
if(SQUARE(plyr.pos_z - m->propPtr->z) + SQUARE(plyr.pos_x - m->propPtr->x) < 40000.0f ){ if(SQ(plyr.pos_z - m->propPtr->z) + SQ(plyr.pos_x - m->propPtr->x) < 40000.0f ){
temp_f20 = randf2(2.4f, 4.4f); temp_f22 = randf2(2.4f, 4.4f); //f22 temp_f20 = randf2(2.4f, 4.4f); temp_f22 = randf2(2.4f, 4.4f); //f22
orangePtr->velocity[0] *= (randf() < 0.5)? temp_f20 : -temp_f20; orangePtr->velocity[0] *= (randf() < 0.5)? temp_f20 : -temp_f20;
orangePtr->velocity[1] = randf2(1.8f, 2.2f) * 60.0; orangePtr->velocity[1] = randf2(1.8f, 2.2f) * 60.0;

3
src/core2/code_7AF80.c
View File

@@ -4,10 +4,9 @@
#include <core1/viewport.h> #include <core1/viewport.h>
#include <core2/file.h> #include <core2/file.h>
#include <math.h>
#include "prop.h" #include "prop.h"
#define SQ(x) ((x) * (x))
extern f32 ml_distanceSquared_vec3f(f32[3], f32[3]); extern f32 ml_distanceSquared_vec3f(f32[3], f32[3]);
extern f32 func_802586B0(f32[3], f32[3]); extern f32 func_802586B0(f32[3], f32[3]);
extern void mapModel_getCubeBounds(s32 min[3], s32 max[3]); extern void mapModel_getCubeBounds(s32 min[3], s32 max[3]);

5
src/core2/code_D89E0.c
View File

@@ -1,14 +1,11 @@
#include <ultra64.h> #include <ultra64.h>
#include "functions.h" #include "functions.h"
#include "variables.h" #include "variables.h"
#include <math.h>
extern f32 mapModel_getFloorY(f32[3]); extern f32 mapModel_getFloorY(f32[3]);
extern f32 func_80257204(f32, f32, f32, f32); extern f32 func_80257204(f32, f32, f32, f32);
#define SQ(x) ((x) * (x))
typedef struct { typedef struct {
f32 unk0; f32 unk0;
f32 unk4; f32 unk4;