Sara/fencer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: changed handle message signature to (T*, MessageID, uintptr_t)

Browse source
This commit is contained in:
Sara 2023-11-29 14:18:51 +01:00
parent af6c8d33ea
commit 29a40ce082
7 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
game/src/Enemy.c
View file

@ -66,11 +66,13 @@ void EnemyDestroy(Enemy* self) {
void EnemyOnCollision(Enemy* self, Collision collision) {}
void EnemyOnOverlap(Enemy* self, Collider* other) {}
void* EnemyHandleMessage(Enemy* self, MessageID id, void* data) {
void* EnemyHandleMessage(Enemy* self, MessageID id, uintptr_t data) {
switch(id) {
case MESSAGE_DEAL_DAMAGE:
self->health -= (uintptr_t)data;
self->health -= (int)data;
self->hurt = 1;
if(self->health <= 0)
game_world_destroy_entity(Enemy_as_BehaviourEntity(self));
break;
default:
break;

2
game/src/Enemy.h
View file

@ -43,7 +43,7 @@ extern void EnemyDraw(Enemy* self);
extern void EnemyOnCollision(Enemy* self, Collision collision);
extern void EnemyOnOverlap(Enemy* self, Collider* other);
extern void* EnemyHandleMessage(Enemy* self, MessageID id, void* data);
extern void* EnemyHandleMessage(Enemy* self, MessageID id, uintptr_t data);
extern Transform* EnemyGetTransform(Enemy* self);
extern RigidBody* EnemyGetRigidBody(Enemy* self);

2
game/src/PlayerStates.c
View file

@ -57,7 +57,7 @@ void PlayerAttackTrigger(Player* self) {
MakeVector(0.1f, 0.06f), PHYSICS_LAYER_COMBAT, self->rigidbody);
if(found != NULL) {
PhysicsEntity entity = collider_get_owner(found);
entity.message_receiver->handle_message(entity.data, 1, (void*)1u);
entity.message_receiver->handle_message(entity.data, 1, 1u);
}
++self->animationTriggers;
}

6
game/src/Prop.c
View file

@ -61,10 +61,10 @@ RigidBody* PropGetRigidBody(Prop* self) {
return self->rigidbody;
}
void* PropReceiveMessage(Prop* self, MessageID message, void* data) {
void* PropReceiveMessage(Prop* self, MessageID message, uintptr_t data) {
if(message == 1) {
int damage = *(int*)data;
game_world_destroy_entity(Prop_as_BehaviourEntity(self));
unsigned damage = (int)data;
LOG_INFO("Punching bag took %u damage", damage);
}
return 0;
}

2
game/src/Prop.h
View file

@ -31,7 +31,7 @@ void PropOnOverlap(Prop* self, Collider* other);
Transform* PropGetTransform(Prop* self);
RigidBody* PropGetRigidBody(Prop* self);
void* PropReceiveMessage(Prop* self, MessageID message, void* data);
void* PropReceiveMessage(Prop* self, MessageID message, uintptr_t data);
static long PropGetDepth(Prop* self) { return -(int)(self->transform.position.y * 1000); }