npc interact turn to face player

src/dusk/rpg/entity/entity.c

@@ -43,9 +43,6 @@ void entityUpdate(entity_t *entity) {
   entityAnimUpdate(entity);
 
   // Movement code.
-  if(ENTITY_CALLBACKS[entity->type].freeMovement != NULL) {
-    ENTITY_CALLBACKS[entity->type].freeMovement(entity);
-  }
   if(
     cutsceneModeIsInputAllowed() &&
     ENTITY_CALLBACKS[entity->type].movement != NULL

src/dusk/rpg/entity/entitytype.h

@@ -37,20 +37,6 @@ typedef struct {
    * @param entity Pointer to the entity to move.
    */
   void (*movement)(entity_t *entity);
-
-  /**
-   * Free movement callback. Always runs regardless of cutscene state.
-   * @param entity Pointer to the entity to move.
-   */
-  void (*freeMovement)(entity_t *entity);
-
-  /**
-   * Interaction callback for the entity type.
-   * @param player Pointer to the player entity.
-   * @param entity Pointer to the entity to interact with.
-   * @return True if the entity handled the interaction, false otherwise.
-   */
-  bool_t (*interact)(entity_t *player, entity_t *entity);
 } entitycallback_t;
 
 static const entitycallback_t ENTITY_CALLBACKS[ENTITY_TYPE_COUNT] = {
@@ -64,7 +50,5 @@ static const entitycallback_t ENTITY_CALLBACKS[ENTITY_TYPE_COUNT] = {
   [ENTITY_TYPE_NPC] = {
     .init = npcInit,
     .movement = npcMovement,
-    .freeMovement = npcFreeMovement,
-    .interact = npcInteract
   }
 };

src/dusk/rpg/entity/interact/entityinteract.c

@@ -21,11 +21,20 @@ void entityInteractWith(entity_t *player, entity_t *target) {
         "Interact cutscene pointer cannot be NULL"
       );
       cutsceneSystemStartCutscene(target->interact.data.cutscene);
-      return;
+      break;
 
     case ENTITY_INTERACT_PRINT:
       uiTextboxMainSetText(target->interact.data.message);
-      return;
+
+      // If NPC turn to face player.
+      if(target->type == ENTITY_TYPE_NPC) {
+        target->data.npc.interactState = NPC_INTERACT_STATE_CONVERSING;
+        target->animation = ENTITY_ANIM_IDLE;
+        entityTurn(target, entityDirGetOpposite(player->direction));
+      }
+
+      // entityTurn(player, player->direction); // Redundant (for now)
+      break;
 
     case ENTITY_INTERACT_NULL:
       break;
@@ -34,7 +43,4 @@ void entityInteractWith(entity_t *player, entity_t *target) {
       assertUnreachable("Unknown entity interact type");
       break;
   }
-
-  if(ENTITY_CALLBACKS[target->type].interact == NULL) return;
-  ENTITY_CALLBACKS[target->type].interact(player, target);
 }

src/dusk/rpg/entity/interact/entityinteract.h

@@ -16,8 +16,11 @@ typedef struct entity_s entity_t;
  */
 typedef enum {
   ENTITY_INTERACT_NULL = 0,
+
   ENTITY_INTERACT_CUTSCENE,
   ENTITY_INTERACT_PRINT,
+  ENTITY_INTERACT_CALLBACK,
+
   ENTITY_INTERACT_COUNT
 } entityinteracttype_t;
 
@@ -27,6 +30,7 @@ typedef enum {
 typedef union {
   const cutscene_t *cutscene;
   const char_t *message;
+  void (*callback)(entity_t *player, entity_t *target);
 } entityinteractdata_t;
 
 /**

src/dusk/rpg/entity/npc/npc.c

@@ -12,17 +12,27 @@
 #include "rpg/rpgtextbox.h"
 
 const npcmovecallback_t NPC_MOVE_CALLBACKS[NPC_MOVE_TYPE_COUNT] = {
-  [NPC_MOVE_TYPE_NULL]        = { NULL,               NULL                  },
+  [NPC_MOVE_TYPE_NULL] = { 0 },
-  [NPC_MOVE_TYPE_RANDOM_TURN] = { npcRandomTurnInit,  npcRandomTurnMovement },
+  
+  [NPC_MOVE_TYPE_RANDOM_TURN] = {
+    npcRandomTurnInit,
+    npcRandomTurnMovement
+  },
+
   [NPC_MOVE_TYPE_RANDOM_WALK] = {
     npcRandomWalkInit,
     npcRandomWalkMovement
   },
+
   [NPC_MOVE_TYPE_RANDOM_TURN_AND_WALK] = {
     npcRandomTurnAndWalkInit,
     npcRandomTurnAndWalkMovement
   },
-  [NPC_MOVE_TYPE_PATH] = { npcPathInit, npcPathMovement, true },
+
+  [NPC_MOVE_TYPE_PATH] = {
+    npcPathInit,
+    npcPathMovement
+  },
 };
 
 void npcInit(entity_t *entity) {
@@ -40,23 +50,10 @@ void npcSetMoveType(entity_t *entity, const npcmovetype_t moveType) {
 
 void npcMovement(entity_t *entity) {
   assertNotNull(entity, "Entity pointer cannot be NULL");
+  
   npc_t *npc = &entity->data.npc;
+  if(npc->interactState != NPC_INTERACT_STATE_NONE) return;
+
   const npcmovecallback_t *cb = &NPC_MOVE_CALLBACKS[npc->moveType];
-  if(!cb->alwaysRun && cb->movement != NULL) cb->movement(entity);
+  if(cb->movement != NULL) cb->movement(entity);
-}
-
-void npcFreeMovement(entity_t *entity) {
-  assertNotNull(entity, "Entity pointer cannot be NULL");
-  npc_t *npc = &entity->data.npc;
-  const npcmovecallback_t *cb = &NPC_MOVE_CALLBACKS[npc->moveType];
-  if(cb->alwaysRun && cb->movement != NULL) cb->movement(entity);
-}
-
-bool_t npcInteract(entity_t *player, entity_t *npc) {
-  assertNotNull(player, "Player entity pointer cannot be NULL");
-  assertNotNull(npc, "NPC entity pointer cannot be NULL");
-
-  cutsceneSystemStartCutscene(&TEST_CUTSCENE);
-  // rpgTextboxShow(RPG_TEXTBOX_POS_BOTTOM, "Hello World!");
-  return false;
 }

src/dusk/rpg/entity/npc/npc.h

@@ -13,6 +13,12 @@
 
 typedef struct entity_s entity_t;
 
+typedef enum {
+  NPC_INTERACT_STATE_NONE,
+  NPC_INTERACT_STATE_CONVERSING,
+  NPC_INTERACT_STATE_COUNT
+} npcinteractstate_t;
+
 typedef enum {
   NPC_MOVE_TYPE_NULL,
   NPC_MOVE_TYPE_RANDOM_TURN,
@@ -30,6 +36,7 @@ typedef union {
 } npcmovedata_t;
 
 typedef struct npc_s {
+  npcinteractstate_t interactState;
   npcmovetype_t moveType;
   npcmovedata_t moveData;
 } npc_t;
@@ -39,8 +46,6 @@ typedef struct {
   void (*init)(npc_t *npc);
   /** Called each movement tick. */
   void (*movement)(entity_t *entity);
-  /** True if movement runs regardless of cutscene state. */
-  bool_t alwaysRun;
 } npcmovecallback_t;
 
 extern const npcmovecallback_t NPC_MOVE_CALLBACKS[NPC_MOVE_TYPE_COUNT];
@@ -74,11 +79,3 @@ void npcMovement(entity_t *entity);
  * @param entity Pointer to the entity structure to update.
  */
 void npcFreeMovement(entity_t *entity);
-
-/**
- * Handles interaction with an NPC entity.
- *
- * @param player Pointer to the player entity.
- * @param npc Pointer to the NPC entity.
- */
-bool_t npcInteract(entity_t *player, entity_t *npc);