From e8b35eae36f56492069d8f242c078ec5275d1a0b Mon Sep 17 00:00:00 2001
From: Olivier Gayot <duskcoder@gmail.com>
Date: Thu, 8 Jan 2015 16:53:35 +0100
Subject: handle the selection of a target in a generic way.

we do not split the code of the selection of a target anymore.

Each action now does a very simple thing and as much efficiently as
possible.

every old function that are not used anymore have been removed.

Signed-off-by: Olivier Gayot <duskcoder@gmail.com>
---
 priv_entries.h | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'priv_entries.h')

diff --git a/priv_entries.h b/priv_entries.h
index c2fa5c6..a0fe66e 100644
--- a/priv_entries.h
+++ b/priv_entries.h
@@ -10,12 +10,12 @@ struct entry_t white_magic_entries[] = {
     {
         .name = "Cure",
         .children_cnt = 0,
-        .f = Fattaquer,
+        .f = cast_cure,
         .data = NULL,
     }, {
         .name = "Cure +",
         .children_cnt = 0,
-        .f = Fattaquer,
+        .f = cast_cure,
         .data = NULL,
     },
 };
@@ -24,67 +24,67 @@ struct entry_t black_magic_entries[] = {
     {
         .name = "Fire",
         .children_cnt = 0,
-        .f = Fmagieelement,
+        .f = cast_element,
         .data = (enum element_t []) { ELEMENT_FIRE },
     }, {
         .name = "Fire +",
         .children_cnt = 0,
-        .f = Fmagieelement,
+        .f = cast_element,
         .data = (enum element_t []) { ELEMENT_FIRE },
     }, {
         .name = "Fire x",
         .children_cnt = 0,
-        .f = Fmagieelement,
+        .f = cast_element,
         .data = (enum element_t []) { ELEMENT_FIRE },
     }, {
         .name = "Ice -",
         .children_cnt = 0,
-        .f = Fmagieelement,
+        .f = cast_element,
         .data = (enum element_t []) { ELEMENT_ICE },
     }, {
         .name = "Ice +",
         .children_cnt = 0,
-        .f = Fmagieelement,
+        .f = cast_element,
         .data = (enum element_t []) { ELEMENT_ICE },
     }, {
         .name = "Ice x",
         .children_cnt = 0,
-        .f = Fmagieelement,
+        .f = cast_element,
         .data = (enum element_t []) { ELEMENT_ICE },
     }, {
         .name = "Thunder",
         .children_cnt = 0,
-        .f = Fmagieelement,
+        .f = cast_element,
         .data = (enum element_t []) { ELEMENT_THUNDER },
     }, {
         .name = "Thunder +",
         .children_cnt = 0,
-        .f = Fmagieelement,
+        .f = cast_element,
         .data = (enum element_t []) { ELEMENT_THUNDER },
     }, {
         .name = "Thunder x",
         .children_cnt = 0,
-        .f = Fmagieelement,
+        .f = cast_element,
         .data = (enum element_t []) { ELEMENT_THUNDER },
     }, {
         .name = "Water",
         .children_cnt = 0,
-        .f = Fmagieelement,
+        .f = cast_element,
         .data = (enum element_t []) { ELEMENT_WATER },
     }, {
         .name = "Water + ",
         .children_cnt = 0,
-        .f = Fmagieelement,
+        .f = cast_element,
         .data = (enum element_t []) { ELEMENT_WATER },
     }, {
         .name = "Water x",
         .children_cnt = 0,
-        .f = Fmagieelement,
+        .f = cast_element,
         .data = (enum element_t []) { ELEMENT_WATER },
     }, {
         .name = "Choc",
         .children_cnt = 0,
-        .f = Fmagieelement,
+        .f = cast_element,
         .data = (enum element_t []) { ELEMENT_NONE },
     },
 };
@@ -93,22 +93,22 @@ struct entry_t object_entries[] = {
     {
         .name = "Potion",
         .children_cnt = 0,
-        .f = Fpotion,
+        .f = use_potion,
         .data = (int []) { POTION },
     }, {
         .name = "Potion +",
         .children_cnt = 0,
-        .f = Fpotion,
+        .f = use_potion,
         .data = (int []) { POTIONPLUS },
     }, {
         .name = "Ether",
         .children_cnt = 0,
-        .f = Fether,
+        .f = use_ether,
         .data = (int []) { ETHER },
     }, {
         .name = "Ether + ",
         .children_cnt = 0,
-        .f = Fether,
+        .f = use_ether,
         .data = (int []) { ETHERPLUS },
     },
 };
@@ -117,7 +117,7 @@ struct entry_t action_entries_g[] = {
     {
         .name = "Attack",
         .children_cnt = 0,
-        .f = Fattaquer,
+        .f = attack,
         .data = NULL,
     }, {
         .name = "White Magic",
-- 
cgit v1.2.3