Revert "Merge branch 'master' of git.osdn.net:/gitroot/hengband/hengband"

[hengband/hengband.git] / src / store.h

diff --git a/src/store.h b/src/store.h
index 99986fb..e64b6c5 100644 (file)
--- a/src/store.h
+++ b/src/store.h
@@ -1,53 +1,4 @@
-#pragma once
-
-/*
- * A store owner
- */
-typedef struct owner_type owner_type;
-
-struct owner_type
-{
-       concptr owner_name;     /* Name */
-       PRICE max_cost;         /* Purse limit */
-       byte max_inflate;       /* Inflation (max) */
-       byte min_inflate;       /* Inflation (min) */
-       byte haggle_per;        /* Haggle unit */
-       byte insult_max;        /* Insult limit */
-       byte owner_race;        /* Owner race */
-};
-
-
-/*
- * A store, with an owner, various state flags, a current stock
- * of items, and a table of items that are often purchased.
- */
-typedef struct store_type store_type;
-
-struct store_type
-{
-       byte type;                              /* Store type */
-
-       byte owner;                             /* Owner index */
-       byte extra;                             /* Unused for now */
-
-       s16b insult_cur;                /* Insult counter */
-
-       s16b good_buy;                  /* Number of "good" buys */
-       s16b bad_buy;                   /* Number of "bad" buys */
-
-       s32b store_open;                /* Closed until this turn */
-
-       s32b last_visit;                /* Last visited on this turn */
-
-       s16b table_num;                 /* Table -- Number of entries */
-       s16b table_size;                /* Table -- Total Size of Array */
-       s16b *table;                    /* Table -- Legal item kinds */
-
-       s16b stock_num;                 /* Stock -- Number of entries */
-       s16b stock_size;                /* Stock -- Total Size of Array */
-       object_type *stock;             /* Stock -- Actual stock items */
-};
-
+
 /*
  * Store types
  */
@@ -79,14 +30,15 @@ struct store_type
 
 /* store.c */
 extern bool combine_and_reorder_home(int store_num);
-extern void do_cmd_store(player_type *player_ptr);
-extern void store_shuffle(player_type *player_ptr, int which);
-extern void store_maint(player_type *player_ptr, int town_num, int store_num);
+extern void do_cmd_store(void);
+extern void store_shuffle(int which);
+extern void store_maint(int town_num, int store_num);
 extern void store_init(int town_num, int store_num);
-
-// どこからも呼ばれていない.
-extern void move_to_black_market(player_type *player_ptr, object_type *o_ptr);
+extern void move_to_black_market(object_type * o_ptr);
 
 extern const owner_type owners[MAX_STORES][MAX_OWNERS];
 
 extern byte store_table[MAX_STORES][STORE_CHOICES][2];
+
+
+