無駄に残ってソース汚しになっていたPython関係のコードを削除。script.cと、z-config.hの中のUSE_SCRIPT辺りの記述は一応残している。

[hengband/hengband.git] / src / birth.c

diff --git a/src/birth.c b/src/birth.c
index 5e06e98..22f2d9b 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -2255,17 +2255,6 @@ static bool get_player_realms(void)
 {
         int i, count;
 
-#ifdef USE_SCRIPT
-       int result = get_player_realms_callback();
-
-       if (result == -1)
-               /* Restart */
-               return FALSE;
-       else if (result == 1)
-               /* Success */
-               return TRUE;
-#endif /* USE_SCRIPT */
-
        /* Clean up infomation of modifications */
        put_str("                                   ", 3, 40);
        put_str("                                   ", 4, 40);
@@ -3525,10 +3514,6 @@ void player_outfit(void)
        object_type     *q_ptr;
 
 
-#ifdef USE_SCRIPT
-       if (player_outfit_callback()) return;
-#endif /* USE_SCRIPT */
-
        /* Get local object */
        q_ptr = &forge;
 
@@ -3551,10 +3536,6 @@ void player_outfit(void)
                        object_aware(q_ptr);
                        object_known(q_ptr);
 
-#ifdef USE_SCRIPT
-                       q_ptr->python = object_create_callback(q_ptr);
-#endif /* USE_SCRIPT */
-
                        (void)inven_carry(q_ptr);
 
                        break;
@@ -3567,10 +3548,6 @@ void player_outfit(void)
                        object_aware(q_ptr);
                        object_known(q_ptr);
 
-#ifdef USE_SCRIPT
-                       q_ptr->python = object_create_callback(q_ptr);
-#endif /* USE_SCRIPT */
-
                        (void)inven_carry(q_ptr);
                }
        }
@@ -3588,10 +3565,6 @@ void player_outfit(void)
                object_aware(q_ptr);
                object_known(q_ptr);
 
-#ifdef USE_SCRIPT
-               q_ptr->python = object_create_callback(q_ptr);
-#endif /* USE_SCRIPT */
-
                (void)inven_carry(q_ptr);
        }
        else if (p_ptr->pclass != CLASS_NINJA)
@@ -3603,10 +3576,6 @@ void player_outfit(void)
                object_aware(q_ptr);
                object_known(q_ptr);
 
-#ifdef USE_SCRIPT
-       q_ptr->python = object_create_callback(q_ptr);
-#endif /* USE_SCRIPT */
-
                (void)inven_carry(q_ptr);
        }
 
@@ -3622,10 +3591,6 @@ void player_outfit(void)
                object_aware(q_ptr);
                object_known(q_ptr);
 
-#ifdef USE_SCRIPT
-               q_ptr->python = object_create_callback(q_ptr);
-#endif /* USE_SCRIPT */
-
                (void)inven_carry(q_ptr);
        }
        if (p_ptr->pclass == CLASS_RANGER)
@@ -3636,10 +3601,6 @@ void player_outfit(void)
                object_aware(q_ptr);
                object_known(q_ptr);
 
-#ifdef USE_SCRIPT
-               q_ptr->python = object_create_callback(q_ptr);
-#endif /* USE_SCRIPT */
-
                (void)inven_carry(q_ptr);
        }
        else if (p_ptr->pclass == CLASS_ARCHER)
@@ -3651,10 +3612,6 @@ void player_outfit(void)
                object_aware(q_ptr);
                object_known(q_ptr);
 
-#ifdef USE_SCRIPT
-               q_ptr->python = object_create_callback(q_ptr);
-#endif /* USE_SCRIPT */
-
                (void)inven_carry(q_ptr);
        }
        else if (p_ptr->pclass == CLASS_HIGH_MAGE)
@@ -3667,10 +3624,6 @@ void player_outfit(void)
                object_aware(q_ptr);
                object_known(q_ptr);
 
-#ifdef USE_SCRIPT
-               q_ptr->python = object_create_callback(q_ptr);
-#endif /* USE_SCRIPT */
-
                (void)inven_carry(q_ptr);
        }
        else if (p_ptr->pclass == CLASS_SORCERER)
@@ -3684,10 +3637,6 @@ void player_outfit(void)
                        object_aware(q_ptr);
                        object_known(q_ptr);
 
-#ifdef USE_SCRIPT
-                       q_ptr->python = object_create_callback(q_ptr);
-#endif /* USE_SCRIPT */
-
                        (void)inven_carry(q_ptr);
                }
        }
@@ -3702,10 +3651,6 @@ void player_outfit(void)
                        object_aware(q_ptr);
                        object_known(q_ptr);
 
-#ifdef USE_SCRIPT
-                       q_ptr->python = object_create_callback(q_ptr);
-#endif /* USE_SCRIPT */
-
                        (void)inven_carry(q_ptr);
                }
 
@@ -3715,10 +3660,6 @@ void player_outfit(void)
                object_aware(q_ptr);
                object_known(q_ptr);
 
-#ifdef USE_SCRIPT
-               q_ptr->python = object_create_callback(q_ptr);
-#endif /* USE_SCRIPT */
-
                (void)inven_carry(q_ptr);
 
                object_prep(q_ptr, lookup_kind(TV_FOOD, SV_FOOD_WAYBREAD));
@@ -3727,10 +3668,6 @@ void player_outfit(void)
                object_aware(q_ptr);
                object_known(q_ptr);
 
-#ifdef USE_SCRIPT
-               q_ptr->python = object_create_callback(q_ptr);
-#endif /* USE_SCRIPT */
-
                (void)inven_carry(q_ptr);
 
                object_prep(q_ptr, lookup_kind(TV_FOOD, SV_FOOD_JERKY));
@@ -3739,10 +3676,6 @@ void player_outfit(void)
                object_aware(q_ptr);
                object_known(q_ptr);
 
-#ifdef USE_SCRIPT
-               q_ptr->python = object_create_callback(q_ptr);
-#endif /* USE_SCRIPT */
-
                (void)inven_carry(q_ptr);
 
                object_prep(q_ptr, lookup_kind(TV_FOOD, SV_FOOD_PINT_OF_ALE));
@@ -3751,10 +3684,6 @@ void player_outfit(void)
                object_aware(q_ptr);
                object_known(q_ptr);
 
-#ifdef USE_SCRIPT
-               q_ptr->python = object_create_callback(q_ptr);
-#endif /* USE_SCRIPT */
-
                (void)inven_carry(q_ptr);
 
                object_prep(q_ptr, lookup_kind(TV_FOOD, SV_FOOD_PINT_OF_WINE));
@@ -3763,10 +3692,6 @@ void player_outfit(void)
                object_aware(q_ptr);
                object_known(q_ptr);
 
-#ifdef USE_SCRIPT
-               q_ptr->python = object_create_callback(q_ptr);
-#endif /* USE_SCRIPT */
-
                (void)inven_carry(q_ptr);
        }
        else if (p_ptr->pclass == CLASS_NINJA)
@@ -3778,10 +3703,6 @@ void player_outfit(void)
                object_aware(q_ptr);
                object_known(q_ptr);
 
-#ifdef USE_SCRIPT
-               q_ptr->python = object_create_callback(q_ptr);
-#endif /* USE_SCRIPT */
-
                (void)inven_carry(q_ptr);
        }
 
@@ -3831,10 +3752,6 @@ void player_outfit(void)
                object_aware(q_ptr);
                object_known(q_ptr);
 
-#ifdef USE_SCRIPT
-               q_ptr->python = object_create_callback(q_ptr);
-#endif /* USE_SCRIPT */
-
                (void)inven_carry(q_ptr);
        }
 }
@@ -3853,17 +3770,6 @@ static bool get_player_race(void)
        char    buf[80], cur[80];
 
 
-#ifdef USE_SCRIPT
-       int result = get_player_race_callback();
-
-       if (result == -1)
-               /* Restart */
-               return FALSE;
-       else if (result == 1)
-               /* Success */
-               return TRUE;
-#endif /* USE_SCRIPT */
-
        /* Extra info */
        clear_from(10);
 #ifdef JP
@@ -4052,17 +3958,6 @@ static bool get_player_class(void)
        cptr    str;
 
 
-#ifdef USE_SCRIPT
-       int result = get_player_class_callback();
-
-       if (result == -1)
-               /* Restart */
-               return FALSE;
-       else if (result == 1)
-               /* Success */
-               return TRUE;
-#endif /* USE_SCRIPT */
-
        /* Extra info */
        clear_from(10);
 #ifdef JP
@@ -4277,17 +4172,6 @@ static bool get_player_seikaku(void)
        cptr    str;
 
 
-#ifdef USE_SCRIPT
-       int result = get_player_seikaku_callback();
-
-       if (result == -1)
-               /* Restart */
-               return FALSE;
-       else if (result == 1)
-               /* Success */
-               return TRUE;
-#endif /* USE_SCRIPT */
-
        /* Extra info */
        clear_from(10);
 #ifdef JP
@@ -5093,10 +4977,6 @@ static bool player_birth_aux(void)
        char buf[80], cur[80];
        char inp[80];
 
-#ifdef USE_SCRIPT
-       int result;
-#endif /* USE_SCRIPT */
-
 
        /*** Intro ***/
 
@@ -5143,20 +5023,6 @@ static bool player_birth_aux(void)
 #endif
 
 
-#ifdef USE_SCRIPT
-       /*
-        * Ask for the world
-        */
-       result = get_world_callback();
-
-       if (result == -1)
-               /* Restart */
-               return FALSE;
-
-       /* Clean up */
-       clear_from(10);
-#endif /* USE_SCRIPT */
-
        /*** Player sex ***/
 
        /* Extra info */