mirror of
https://github.com/mwpenny/portal64-still-alive.git
synced 2024-10-19 22:27:36 -04:00
Merge pull request #36 from Deconimus/encapsulate_decorIdFromCollisionObject
Encapsulate looking up a decorId from CollisionObjects
This commit is contained in:
commit
87af5a059c
|
@ -236,4 +236,8 @@ int decorIdForObjectDefinition(struct DecorObjectDefinition* def) {
|
|||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
int decorIdForCollisionObject(struct CollisionObject* collisionObject) {
|
||||
return decorIdForObjectDefinition((struct DecorObjectDefinition*)collisionObject->collider);
|
||||
}
|
||||
|
|
|
@ -19,4 +19,6 @@
|
|||
struct DecorObjectDefinition* decorObjectDefinitionForId(int id);
|
||||
int decorIdForObjectDefinition(struct DecorObjectDefinition* def);
|
||||
|
||||
int decorIdForCollisionObject(struct CollisionObject* collisionObject); // evil hack
|
||||
|
||||
#endif
|
|
@ -26,7 +26,7 @@ void fizzlerTrigger(void* data, struct CollisionObject* objectEnteringTrigger) {
|
|||
}
|
||||
|
||||
if (fizzler->cubeSignalIndex != -1) {
|
||||
int decorType = decorIdForObjectDefinition((struct DecorObjectDefinition*)objectEnteringTrigger->collider);
|
||||
int decorType = decorIdForCollisionObject(objectEnteringTrigger);
|
||||
if (decorType == DECOR_TYPE_CUBE || decorType == DECOR_TYPE_CUBE_UNIMPORTANT) {
|
||||
signalsSend(fizzler->cubeSignalIndex);
|
||||
}
|
||||
|
|
|
@ -15,8 +15,7 @@ enum ObjectTriggerType triggerDetermineType(struct CollisionObject* objectEnteri
|
|||
return TRIGGER_TYPE_TO_MASK(ObjectTriggerTypePlayer);
|
||||
}
|
||||
|
||||
int decorType = decorIdForObjectDefinition((struct DecorObjectDefinition*)objectEnteringTrigger->collider);
|
||||
|
||||
int decorType = decorIdForCollisionObject(objectEnteringTrigger);
|
||||
if (decorType == DECOR_TYPE_CUBE || decorType == DECOR_TYPE_CUBE_UNIMPORTANT) {
|
||||
return gScene.player.grabConstraint.object == objectEnteringTrigger ? TRIGGER_TYPE_TO_MASK(ObjectTriggerTypeCubeHover) | TRIGGER_TYPE_TO_MASK(ObjectTriggerTypeCube) : TRIGGER_TYPE_TO_MASK(ObjectTriggerTypeCube);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue