mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-24 16:01:26 +00:00
Code Issues Projects Releases Wiki Activity

Colliders: colType -> colMaterial (#2186)

Browse source 
* colType -> colMaterial

* fixups
This commit is contained in:
Dragorn421 2024-09-12 03:18:46 +02:00 • committed by GitHub
parent 64570e871f
commit f193311013
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
249 changed files with 448 additions and 448 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_En_Ny/z_en_ny.c
View file

@ -51,7 +51,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = {
static ColliderJntSphInit sColliderInit = {
{
COLTYPE_NONE,
COL_MATERIAL_NONE,
AT_ON | AT_TYPE_ENEMY,
AC_ON | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,
@ -140,7 +140,7 @@ void EnNy_Init(Actor* thisx, PlayState* play) {
PRINTF("En_Ny_actor_move2[ %x ] ！！\n", EnNy_UpdateUnused);
this->actor.colChkInfo.mass = 0xFF;
this->actor.update = EnNy_UpdateUnused;
this->collider.base.colType = COLTYPE_METAL;
this->collider.base.colMaterial = COL_MATERIAL_METAL;
}
}