ToME WikiI don't remeber what this patch does. Something to do with store names, anyway.
diff -udpr --exclude='*.o' --exclude='*.raw' tome.orig/game/engine/info.lua tome3.4/game/engine/info.lua
--- tome.orig/game/engine/info.lua 2004-04-21 20:00:01.000000000 -0600
+++ tome3.4/game/engine/info.lua 2004-04-30 18:54:50.565911632 -0600
@@ -769,8 +769,8 @@ function(t)
e.item = lookup_kind(e.item[1], e.item[2])
end
- t.table[t.table_num + 1][1] = e.chance
- t.table[t.table_num + 1][2] = e.item
+ t.table[t.table_num + 1][2] = e.chance
+ t.table[t.table_num + 1][1] = e.item
t.table_num = t.table_num + 1
end
end
diff -udpr --exclude='*.o' --exclude='*.raw' tome.orig/game/tome/data/stores/stores.lua tome3.4/game/tome/data/stores/stores.lua
--- tome.orig/game/tome/data/stores/stores.lua 2004-04-14 20:00:03.000000000 -0600
+++ tome3.4/game/tome/data/stores/stores.lua 2004-04-30 18:54:59.319580872 -0600
@@ -22,12 +22,12 @@ new_store
__index__ = 0
name = "General Store"
display = '1' color = color.LIGHT_UMBER
- max_items = 24
+ max_obj = 24
actions = {0, 0, 1, 2, 3, 4}
owners = {0, 0, 1, 2}
item_kinds =
{
{ chance=100 item="& Wooden Torch~" },
{ chance=95 item="& Brass Lantern~" },
{ chance=95 item="& Flask~ of oil" },
{ chance=100 item="& Ration~ of Food" },
@@ -52,7 +52,7 @@ new_store
__index__ = 1
name = "Armoury"
display = '2' color = color.SLATE
- max_items = 24
+ max_obj = 24
actions = {0, 0, 1, 2, 3, 4}
owners = {0, 0, 1, 2}
item_kinds =
@@ -87,7 +87,7 @@ new_store
__index__ = 2
name = "Weaponsmith"
display = '3' color = color.WHITE
- max_items = 24
+ max_obj = 24
actions = {23, 0, 1, 2, 3, 4}
owners = {23, 0, 1, 2}
item_kinds =
@@ -132,7 +132,7 @@ new_store
__index__ = 3
name = "Temple"
display = '4' color = color.GREEN
- max_items = 24
+ max_obj = 24
actions = {0, 0, 1, 2, 3, 4}
owners = {0, 0, 1, 2}
item_kinds =
@@ -189,7 +189,7 @@ new_store
__index__ = 4
name = "Alchemy shop"
display = '5' color = color.BLUE
- max_items = 24
+ max_obj = 24
actions = {0, 0, 1, 2, 3, 4}
owners = {0, 0, 1, 2}
item_kinds =
@@ -258,7 +258,7 @@ new_store
__index__ = 5
name = "Magic shop"
display = '6' color = color.RED
- max_items = 24
+ max_obj = 24
actions = {0, 0, 1, 2, 3, 4}
owners = {0, 0, 1, 2}
item_kinds =
@@ -304,7 +304,7 @@ new_store
__index__ = 6
name = "Black Market"
display = '7' color = color.LIGHT_DARK
- max_items = 24
+ max_obj = 24
actions = {30, 0, 1, 2, 3, 4}
owners = {30, 0, 1, 2}
flags =
@@ -320,7 +320,7 @@ new_store
__index__ = 7
name = "Home"
display = '8' color = color.YELLOW
- max_items = 24
+ max_obj = 24
actions = {0, 0, 54, 55, 3, 0}
owners = {0, 0, 54, 55}
}
@@ -330,7 +330,7 @@ new_store
__index__ = 8
name = "Book Store"
display = '9' color = color.ORANGE
- max_items = 24
+ max_obj = 24
actions = {0, 0, 1, 2, 3, 4}
owners = {0, 0, 1, 2}
item_kinds =
@@ -353,7 +353,7 @@ new_store
__index__ = 9
name = "Pet Shop"
display = '+' color = color.BLUE
- max_items = 12
+ max_obj = 12
actions = {0, 0, 1, 2, 3, 4}
owners = {0, 0, 1, 2}
flags =
@@ -375,7 +375,7 @@ new_store
__index__ = 10
name = "Mayor's Office"
display = '+' color = color.ORANGE
- max_items = 0
+ max_obj = 0
actions = {0, 0, 16, 0, 35, 0}
owners = {0, 0, 16, 0}
}
@@ -385,7 +385,7 @@ new_store
__index__ = 11
name = "Inn"
display = '+' color = color.WHITE
- max_items = 8
+ max_obj = 8
actions = {2, 4, 5, 6, 7, 0}
owners = {2, 4, 5, 6}
item_kinds =
@@ -396,7 +396,7 @@ new_store
{ chance=100 item="& Pint~ of Fine Wine" },
{ chance=100 item="& Pint~ of Fine Ale" },
}
}
new_store
@@ -404,7 +404,7 @@ new_store
__index__ = 12
name = "The Soothsayer"
display = '+' color = color.LIGHT_BLUE
- max_items = 2
+ max_obj = 2
actions = {0, 0, 2, 0, 8, 0}
owners = {0, 0, 2, 0}
flags =
@@ -429,7 +429,7 @@ new_store
__index__ = 13
name = "Library"
display = '+' color = color.LIGHT_UMBER
- max_items = 2
+ max_obj = 2
actions = {0, 0, 14, 15, 16, 2}
owners = {0, 0, 14, 15}
item_kinds =
@@ -444,7 +444,7 @@ new_store
__index__ = 14
name = "Castle"
display = '+' color = color.ORANGE
- max_items = 0
+ max_obj = 0
actions = {0, 0, 16, 35, 0, 0}
owners = {0, 0, 16, 35}
}
@@ -454,7 +454,7 @@ new_store
__index__ = 15
name = "Casino"
display = '+' color = color.SLATE
- max_items = 0
+ max_obj = 0
actions = {13, 0, 9, 10, 0, 12}
owners = {13, 0, 9, 10}
}
@@ -464,7 +464,7 @@ new_store
__index__ = 16
name = "Beastmaster Shanty"
display = '+' color = color.GREEN
- max_items = 0
+ max_obj = 0
actions = {18, 0, 21, 22, 0, 0}
owners = {18, 0, 21, 22}
}
@@ -477,7 +477,7 @@ new_store
__index__ = 17
name = "Fighters Hall"
display = '+' color = color.SLATE
- max_items = 0
+ max_obj = 0
actions = {0, 0, 24, 25, 0, 0}
owners = {0, 0, 24, 25}
}
@@ -487,7 +487,7 @@ new_store
__index__ = 18
name = "Tower of Magery"
display = '+' color = color.BLUE
- max_items = 0
+ max_obj = 0
actions = {0, 0, 26, 27, 0, 0}
owners = {0, 0, 26, 27}
}
@@ -497,7 +497,7 @@ new_store
__index__ = 19
name = "Inner Temple"
display = '+' color = color.LIGHT_GREEN
- max_items = 0
+ max_obj = 0
actions = {0, 0, 28, 29, 0, 0}
owners = {0, 0, 28, 29}
}
@@ -507,7 +507,7 @@ new_store
__index__ = 20
name = "Paladins Guild"
display = '+' color = color.GREEN
- max_items = 0
+ max_obj = 0
actions = {0, 0, 28, 25, 0, 0}
owners = {0, 0, 28, 25}
}
@@ -517,7 +517,7 @@ new_store
__index__ = 21
name = "Rangers Guild"
display = '+' color = color.UMBER
- max_items = 0
+ max_obj = 0
actions = {0, 0, 31, 32, 0, 0}
owners = {0, 0, 31, 32}
}
@@ -527,7 +527,7 @@ new_store
__index__ = 22
name = "Thunderlords' Nest"
display = '+' color = color.LIGHT_UMBER
- max_items = 0
+ max_obj = 0
actions = {0, 0, 33, 2, 34, 0}
owners = {0, 0, 33, 2}
}
@@ -537,7 +537,7 @@ new_store
__index__ = 23
name = "The Mirror"
display = '+' color = color.LIGHT_UMBER
- max_items = 0
+ max_obj = 0
actions = {0, 0, 44, 15, 16, 43}
owners = {0, 0, 44, 15}
}
@@ -547,7 +547,7 @@ new_store
__index__ = 24
name = "Seat of Ruling"
display = '+' color = color.LIGHT_UMBER
- max_items = 0
+ max_obj = 0
actions = {0, 0, 17, 35, 0, 0}
owners = {0, 0, 17, 35}
}
@@ -557,7 +557,7 @@ new_store
__index__ = 25
name = "Wizards Spire"
display = '+' color = color.LIGHT_UMBER
- max_items = 0
+ max_obj = 0
actions = {60, 0, 26, 27, 0, 0}
owners = {60, 0, 26, 27}
}
@@ -567,7 +567,7 @@ new_store
__index__ = 26
name = "Priests Circle"
display = '+' color = color.ORANGE
- max_items = 0
+ max_obj = 0
actions = {0, 0, 28, 29, 0, 0}
owners = {0, 0, 28, 29}
}
@@ -577,7 +577,7 @@ new_store
__index__ = 27
name = "Tower of the King"
display = '+' color = color.LIGHT_UMBER
- max_items = 0
+ max_obj = 0
actions = {0, 0, 17, 35, 0, 0}
owners = {0, 0, 17, 35}
}
@@ -587,7 +587,7 @@ new_store
__index__ = 28
name = "Library"
display = '+' color = color.LIGHT_UMBER
- max_items = 2
+ max_obj = 2
actions = {0, 0, 14, 15, 16, 2}
owners = {0, 0, 14, 15}
item_kinds =
@@ -602,7 +602,7 @@ new_store
__index__ = 29
name = "The White Tree"
display = '+' color = color.WHITE
- max_items = 8
+ max_obj = 8
actions = {2, 4, 5, 6, 7, 0}
owners = {2, 4, 5, 6}
item_kinds =
@@ -621,7 +621,7 @@ new_store
__index__ = 30
name = "Craftsmaster"
display = '+' color = color.SLATE
- max_items = 0
+ max_obj = 0
actions = {0, 0, 24, 25, 0, 0}
owners = {0, 0, 24, 25}
}
@@ -631,7 +631,7 @@ new_store
__index__ = 31
name = "Earth-Dome (Nature)"
display = '+' color = color.LIGHT_UMBER
- max_items = 0
+ max_obj = 0
actions = {0, 0, 39, 0, 0, 0}
owners = {0, 0, 39, 0}
}
@@ -641,7 +641,7 @@ new_store
__index__ = 32
name = "Minstrels Haven"
display = '+' color = color.LIGHT_UMBER
- max_items = 0
+ max_obj = 0
actions = {0, 0, 40, 41, 0, 0}
owners = {0, 0, 40, 41}
}
@@ -651,7 +651,7 @@ new_store
__index__ = 33
name = "Star-Dome"
display = '+' color = color.LIGHT_UMBER
- max_items = 0
+ max_obj = 0
actions = {0, 0, 46, 47, 0, 0}
owners = {0, 0, 46, 47}
}
@@ -661,7 +661,7 @@ new_store
__index__ = 34
name = "Valarin Temple"
display = '+' color = color.LIGHT_UMBER
- max_items = 0
+ max_obj = 0
actions = {0, 0, 28, 48, 0, 0}
owners = {0, 0, 28, 48}
}
@@ -671,7 +671,7 @@ new_store
__index__ = 35
name = "Sea-Dome"
display = '+' color = color.LIGHT_UMBER
- max_items = 0
+ max_obj = 0
actions = {0, 0, 49, 35, 0, 0}
owners = {0, 0, 49, 35}
}
@@ -681,7 +681,7 @@ new_store
__index__ = 36
name = "The Golden Flower"
display = '+' color = color.LIGHT_UMBER
- max_items = 0
+ max_obj = 0
actions = {0, 0, 50, 51, 0, 0}
owners = {0, 0, 50, 51}
}
@@ -691,7 +691,7 @@ new_store
__index__ = 37
name = "The Fountain"
display = '+' color = color.LIGHT_UMBER
- max_items = 0
+ max_obj = 0
actions = {0, 0, 52, 53, 0, 0}
owners = {0, 0, 52, 53}
}
@@ -702,7 +702,7 @@ new_store
__index__ = 38
name = "Axe Smith"
display = '3' color = color.WHITE
- max_items = 12
+ max_obj = 12
actions = {0, 0, 1, 2, 3, 4}
owners = {0, 0, 1, 2}
flags =
@@ -723,7 +723,7 @@ new_store
__index__ = 39
name = "Hafted Smith"
display = '3' color = color.WHITE
- max_items = 12
+ max_obj = 12
actions = {0, 0, 1, 2, 3, 4}
owners = {0, 0, 1, 2}
flags =
@@ -744,7 +744,7 @@ new_store
__index__ = 40
name = "Polearm Smith"
display = '3' color = color.WHITE
- max_items = 12
+ max_obj = 12
actions = {0, 0, 1, 2, 3, 4}
owners = {0, 0, 1, 2}
flags =
@@ -765,7 +765,7 @@ new_store
__index__ = 41
name = "Sword Smith"
display = '3' color = color.WHITE
- max_items = 12
+ max_obj = 12
actions = {0, 0, 1, 2, 3, 4}
owners = {0, 0, 1, 2}
flags =
@@ -786,7 +786,7 @@ new_store
__index__ = 42
name = "Rare Jewelry Shop"
display = '6' color = color.VIOLET
- max_items = 10
+ max_obj = 10
actions = {0, 0, 1, 2, 3, 4}
owners = {0, 0, 1, 2}
flags =
@@ -811,7 +811,7 @@ new_store
__index__ = 43
name = "Jewelry Shop"
display = '6' color = color.YELLOW
- max_items = 20
+ max_obj = 20
actions = {0, 0, 1, 2, 3, 4}
owners = {0, 0, 1, 2}
flags =
@@ -836,7 +836,7 @@ new_store
__index__ = 44
name = "Footwear Shop"
display = '2' color = color.RED
- max_items = 12
+ max_obj = 12
actions = {0, 0, 1, 2, 3, 4}
owners = {0, 0, 1, 2}
flags =
@@ -858,7 +858,7 @@ new_store
__index__ = 45
name = "Rare Footwear Shop"
display = '2' color = color.RED
- max_items = 8
+ max_obj = 8
actions = {0, 0, 1, 2, 3, 4}
owners = {0, 0, 1, 2}
flags =
@@ -881,7 +881,7 @@ new_store
__index__ = 46
name = "Library"
display = '9' color = color.YELLOW
- max_items = 24
+ max_obj = 24
actions = {27, 0, 1, 2, 3, 4}
owners = {27, 0, 1, 2}
flags =
@@ -918,7 +918,7 @@ new_store
__index__ = 47
name = "Forbidden Library"
display = '9' color = color.VIOLET
- max_items = 12
+ max_obj = 12
actions = {27, 0, 1, 2, 3, 4}
owners = {27, 0, 1, 2}
flags =
@@ -956,7 +956,7 @@ new_store
__index__ = 48
name = "Expensive Black Market"
display = '7' color = color.VIOLET
- max_items = 12
+ max_obj = 12
actions = {0, 0, 1, 2, 3, 4}
owners = {0, 0, 1, 2}
flags =
@@ -975,7 +975,7 @@ new_store
__index__ = 49
name = "Common Shop"
display = '1' color = color.LIGHT_UMBER
- max_items = 12
+ max_obj = 12
actions = {0, 0, 1, 2, 3, 4}
owners = {0, 0, 1, 2}
flags =
@@ -1007,7 +1007,7 @@ new_store
__index__ = 50
name = "Dragon Hunter"
display = '2' color = color.VIOLET
- max_items = 12
+ max_obj = 12
actions = {0, 0, 1, 2, 3, 4}
owners = {0, 0, 1, 2}
flags =
@@ -1030,7 +1030,7 @@ new_store
__index__ = 51
name = "Speed Ring Market"
display = '6' color = color.LIGHT_GREEN
- max_items = 6
+ max_obj = 6
actions = {0, 0, 1, 2, 3, 4}
owners = {0, 0, 1, 2}
flags =
@@ -1053,7 +1053,7 @@ new_store
__index__ = 52
name = "Scribe"
display = '5' color = color.LIGHT_BLUE
- max_items = 12
+ max_obj = 12
actions = {0, 0, 1, 2, 3, 4}
owners = {0, 0, 1, 2}
flags =
@@ -1075,7 +1075,7 @@ new_store
__index__ = 53
name = "Potion Store"
display = '5' color = color.LIGHT_BLUE
- max_items = 12
+ max_obj = 12
actions = {0, 0, 1, 2, 3, 4}
owners = {0, 0, 1, 2}
flags =
@@ -1098,7 +1098,7 @@ new_store
__index__ = 54
name = "Recaller"
display = '+' color = color.BLUE
- max_items = 2
+ max_obj = 2
actions = {33, 0, 1, 2, 3, 0}
owners = {33, 0, 1, 2}
flags =
@@ -1119,7 +1119,7 @@ new_store
__index__ = 55
name = "Master Archer"
display = '3' color = color.GREEN
- max_items = 24
+ max_obj = 24
actions = {0, 0, 1, 2, 3, 4}
owners = {0, 0, 1, 2}
flags =
@@ -1149,7 +1149,7 @@ new_store
__index__ = 56
name = "Merchants Guild"
display = '+' color = color.GREEN
- max_items = 0
+ max_obj = 0
actions = {0, 0, 56, 57, 58, 0}
owners = {0, 0, 56, 57}
}
@@ -1159,7 +1159,7 @@ new_store
__index__ = 57
name = "The Mathom-house"
display = '+' color = color.GREEN
- max_items = 1200
+ max_obj = 1200
actions = {0, 0, 59, 0, 3, 0}
owners = {0, 0, 59, 0}
flags =
@@ -1174,7 +1174,7 @@ new_store
__index__ = 58
name = "The Prancing Pony"
display = '+' color = color.WHITE
- max_items = 8
+ max_obj = 8
actions = {2, 4, 5, 6, 7, 0}
owners = {2, 4, 5, 6}
item_kinds =
@@ -1194,7 +1194,7 @@ new_store
__index__ = 59
name = "Mining Supply store"
display = '+' color = color.SLATE
- max_items = 24
+ max_obj = 24
actions = {0, 0, 1, 2, 3, 4}
owners = {0, 0, 1, 2}
flags =
@@ -1222,7 +1222,7 @@ new_store
__index__ = 60
name = "Library"
display = '+' color = color.LIGHT_UMBER
- max_items = 2
+ max_obj = 2
actions = {61, 0, 14, 15, 16, 2}
owners = {61, 0, 14, 15}
item_kinds =
diff -udpr --exclude='*.o' --exclude='*.raw' tome.orig/src/cache.ls tome3.4/src/cache.ls
--- tome.orig/src/cache.ls 2004-04-16 20:00:06.000000000 -0600
+++ tome3.4/src/cache.ls 2004-04-30 18:45:03.865103712 -0600
@@ -106,7 +106,7 @@ SAVE:ba_info[max_ba_idx]=>stores/actions
struct store_info_type
{
- u32b name; /* Name (offset) */
+ cptr name; /* Name (offset) */
s16b table[STORE_CHOICES][2]; /* Table -- Legal item kinds */
byte table_num; /* Number of items */
diff -udpr --exclude='*.o' --exclude='*.raw' tome.orig/src/externs.h tome3.4/src/externs.h
--- tome.orig/src/externs.h 2004-04-09 20:00:11.000000000 -0600
+++ tome3.4/src/externs.h 2004-04-29 10:04:24.584128328 -0600
@@ -389,9 +389,7 @@ extern player_sex *sex_info;
extern wilderness_type_info *wf_info;
extern int wildc2i[256];
-extern header *st_head;
extern store_info_type *st_info;
-extern char *st_name;
extern store_action_type *ba_info;
extern owner_type *ow_info;
extern set_type *set_info;
diff -udpr --exclude='*.o' --exclude='*.raw' tome.orig/src/files.c tome3.4/src/files.c
--- tome.orig/src/files.c 2004-04-07 20:00:08.000000000 -0600
+++ tome3.4/src/files.c 2004-04-29 10:03:21.469723176 -0600
@@ -2560,7 +2560,7 @@ void file_character_print_store(PHYSFS_f
if (st_ptr->stock_num)
{
/* Header with name of the town */
- fprintf(fff, " [%s Inventory - %s]\n\n", st_name + st_info[store].name, place->name);
+ fprintf(fff, " [%s Inventory - %s]\n\n", st_info[store].name, place->name);
/* Dump all available items */
for (i = 0; i < st_ptr->stock_num; i++)
diff -udpr --exclude='*.o' --exclude='*.raw' tome.orig/src/object1.c tome3.4/src/object1.c
--- tome.orig/src/object1.c 2004-04-21 20:00:14.000000000 -0600
+++ tome3.4/src/object1.c 2004-04-29 10:02:46.183087560 -0600
@@ -3407,12 +3407,12 @@ bool object_out_desc(object_type *q_ptr,
else if (o_ptr->found == OBJ_FOUND_STORE)
{
text_out(format("\nYou bought it from the %s.",
- st_info[o_ptr->found_aux1].name + st_name));
+ st_info[o_ptr->found_aux1].name ));
}
else if (o_ptr->found == OBJ_FOUND_STOLEN)
{
text_out(format("\nYou stole it from the %s.",
- st_info[o_ptr->found_aux1].name + st_name));
+ st_info[o_ptr->found_aux1].name ));
}
else if (o_ptr->found == OBJ_FOUND_SELFMADE)
{
diff -udpr --exclude='*.o' --exclude='*.raw' tome.orig/src/spells1.c tome3.4/src/spells1.c
--- tome.orig/src/spells1.c 2004-04-16 20:00:09.000000000 -0600
+++ tome3.4/src/spells1.c 2004-04-28 10:38:53.495819352 -0600
@@ -2229,10 +2229,10 @@ bool res_stat(int stat, bool full)
if (full)
{
/* Restore if needed */
- if (p_ptr->stat_ind[stat] != p_ptr->stat_max[stat])
+ if (p_ptr->stat_cur[stat] != p_ptr->stat_max[stat])
{
/* Restore */
- p_ptr->stat_ind[stat] = p_ptr->stat_max[stat];
+ p_ptr->stat_cur[stat] = p_ptr->stat_max[stat];
/* Remove temporary drain */
p_ptr->stat_cnt[stat] = 0;
diff -udpr --exclude='*.o' --exclude='*.raw' tome.orig/src/store.c tome3.4/src/store.c
--- tome.orig/src/store.c 2004-02-08 20:00:06.000000000 -0700
+++ tome3.4/src/store.c 2004-04-29 10:02:32.648145184 -0600
@@ -747,7 +747,7 @@ static bool store_will_buy(object_type *
if (object_value(o_ptr) <= 0) return (FALSE);
/* Lua can define things to buy */
- if (process_hooks_ret(HOOK_STORE_BUY, "d", "(d,s,O)", st_ptr->st_idx, st_info[st_ptr->st_idx].name + st_name, o_ptr))
+ if (process_hooks_ret(HOOK_STORE_BUY, "d", "(d,s,O)", st_ptr->st_idx, st_info[st_ptr->st_idx].name , o_ptr))
{
return process_hooks_return[0].num;
}
@@ -1169,7 +1169,7 @@ static void store_create(void)
obj_all_done = FALSE;
/* Lua can define things to buy */
- if (process_hooks_ret(HOOK_STORE_STOCK, "O", "(d,s,d)", st_ptr->st_idx, st_info[st_ptr->st_idx].name + st_name, return_level()))
+ if (process_hooks_ret(HOOK_STORE_STOCK, "O", "(d,s,d)", st_ptr->st_idx, st_info[st_ptr->st_idx].name , return_level()))
{
obj_all_done = TRUE;
q_ptr = process_hooks_return[0].o_ptr;
@@ -1626,7 +1626,7 @@ void display_store(void)
else if ((has_flag(&st_info[st_ptr->st_idx], FLAG_MUSEUM)))
{
- cptr store_name = (st_name + st_info[cur_store_num].name);
+ cptr store_name = (st_info[cur_store_num].name);
/* Show the name of the store */
strnfmt(buf, 80, "%s", store_name);
@@ -1645,7 +1645,7 @@ void display_store(void)
/* Normal stores */
else
{
- cptr store_name = (st_name + st_info[cur_store_num].name);
+ cptr store_name = (st_info[cur_store_num].name);
cptr owner_name = (ot_ptr->name);
/* Put the owner name and race */
Only in tome3.4/src: t
Only in tome3.4/src: tolua
Only in tome3.4/src: tome
diff -udpr --exclude='*.o' --exclude='*.raw' tome.orig/src/types.h tome3.4/src/types.h
--- tome.orig/src/types.h 2004-04-16 20:00:11.000000000 -0600
+++ tome3.4/src/types.h 2004-04-29 09:59:14.926203488 -0600
@@ -970,7 +970,7 @@ typedef struct store_info_type store_inf
struct store_info_type
{
- u32b name; /* Name (offset) */
+ cptr name; /* Name (offset) */
s16b table[STORE_CHOICES][2]; /* Table -- Legal item kinds */
byte table_num; /* Number of items */
diff -udpr --exclude='*.o' --exclude='*.raw' tome.orig/src/variable.c tome3.4/src/variable.c
--- tome.orig/src/variable.c 2004-03-20 20:00:10.000000000 -0700
+++ tome3.4/src/variable.c 2004-04-29 10:02:56.918455536 -0600
@@ -913,9 +913,7 @@ int wildc2i[256];
/*
* The store/building types arrays
*/
-header *st_head;
store_info_type *st_info;
-char *st_name;
/* char *st_text; */
/*
diff -udpr --exclude='*.o' --exclude='*.raw' tome.orig/src/xtra2.c tome3.4/src/xtra2.c
--- tome.orig/src/xtra2.c 2004-02-05 20:00:08.000000000 -0700
+++ tome3.4/src/xtra2.c 2004-04-29 10:02:00.388049464 -0600
@@ -5696,7 +5696,7 @@ static int target_set_aux(int y, int x,
/* Hack -- special handling for building doors */
if (feat == FEAT_SHOP)
{
- name = st_name + st_info[c_ptr->special].name;
+ name = st_info[c_ptr->special].name;
}
else
{