AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-19 04:26:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Dreamcast: Simplify loading messages

Browse Source
This commit is contained in:
UnknownShadow200 2024-02-08 19:10:48 +11:00
parent 2634c0bb12
commit 7d3bdb7f53
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Physics.c
View File

@ -218,13 +218,23 @@ void Searcher_CalcTime(Vec3* vel, struct AABB *entityBB, struct AABB* blockBB, f
float dy = vel->y > 0.0f ? blockBB->Min.y - entityBB->Max.y : entityBB->Min.y - blockBB->Max.y;
float dz = vel->z > 0.0f ? blockBB->Min.z - entityBB->Max.z : entityBB->Min.z - blockBB->Max.z;
*tx = vel->x == 0.0f ? MATH_LARGENUM : Math_AbsF(dx / vel->x);
*ty = vel->y == 0.0f ? MATH_LARGENUM : Math_AbsF(dy / vel->y);
*tz = vel->z == 0.0f ? MATH_LARGENUM : Math_AbsF(dz / vel->z);
if (entityBB->Max.x >= blockBB->Min.x && entityBB->Min.x <= blockBB->Max.x) {
*tx = 0.0f; /* Inlined XIntersects test */
} else {
*tx = vel->x == 0.0f ? MATH_LARGENUM : Math_AbsF(dx / vel->x);
}
if (entityBB->Max.x >= blockBB->Min.x && entityBB->Min.x <= blockBB->Max.x) *tx = 0.0f; /* Inlined XIntersects */
if (entityBB->Max.y >= blockBB->Min.y && entityBB->Min.y <= blockBB->Max.y) *ty = 0.0f; /* Inlined YIntersects */
if (entityBB->Max.z >= blockBB->Min.z && entityBB->Min.z <= blockBB->Max.z) *tz = 0.0f; /* Inlined ZIntersects */
if (entityBB->Max.y >= blockBB->Min.y && entityBB->Min.y <= blockBB->Max.y) {
*ty = 0.0f; /* Inlined YIntersects test */
} else {
*ty = vel->y == 0.0f ? MATH_LARGENUM : Math_AbsF(dy / vel->y);
}
if (entityBB->Max.z >= blockBB->Min.z && entityBB->Min.z <= blockBB->Max.z) {
*tz = 0.0f; /* Inlined ZIntersects test */
} else {
*tz = vel->z == 0.0f ? MATH_LARGENUM : Math_AbsF(dz / vel->z);
}
}
void Searcher_Free(void) {

9
src/Platform_Dreamcast.c
View File

@ -468,17 +468,14 @@ static void InitSDCard(void) {
static void InitModem(void) {
int err;
Platform_LogConst("Trying to init modem..");
Platform_LogConst("Initialising modem..");
if (!modem_init()) {
Platform_LogConst("Modem initing failed"); return;
}
Platform_LogConst("Trying to init ppp..");
ppp_init();
Platform_LogConst("Trying to init ppp modem..");
Platform_LogConst("Dialling modem.. (can take around 20 seconds)");
err = ppp_modem_init("111111111111", 0, NULL);
if (err) {
Platform_Log1("Establishing link failed (%i)", &err); return;
@ -486,7 +483,7 @@ static void InitModem(void) {
ppp_set_login("dream", "dreamcast");
Platform_LogConst("Trying to ppp connect..");
Platform_LogConst("Connecting link.. (can take around 20 seconds)");
err = ppp_connect();
if (err) {
Platform_Log1("Connecting link failed (%i)", &err); return;