From 0256a1976018481c23ce60ff5ef56a097bbf57b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Tue, 13 Jul 2010 03:21:18 +0200 Subject: [PATCH] Fix for veinlook bug related to module reset on resume. Offsets only for supported tools, creature stuff will come later. --- output/Memory.xml | 92 +++++++++++++++++++++++++++++++++++- tools/supported/veinlook.cpp | 4 ++ 2 files changed, 95 insertions(+), 1 deletion(-) diff --git a/output/Memory.xml b/output/Memory.xml index cf5a8d886..d9537981c 100755 --- a/output/Memory.xml +++ b/output/Memory.xml @@ -1680,7 +1680,18 @@ map_data_1b60_offset 0x1B9c map size Y: 0x16c4b14 --> - + rebase="0xD030" + + + 1a85839ab03df082974dc5629d3fbc26 + 0x4C3897C0 +
0xaff2d8
0xaf12d0 +
+ + 349d1ad6eda7b6c5e87f8e4726a0999a + 0x4C398089 + + .-"""-. ' \ |,. ,-. | _________________________ @@ -2186,6 +2197,85 @@ map_data_1b60_offset 0x1B9c e37750890350d7b9d8203879aff8fa5c + + + + 4f1f988bc1b425d4193d3d8b7b0579a5 + stealing memory... + looking for vectors... + ------------------- + !!LANGUAGE TABLES!! + ------------------- + translation vector: 0x932bf2c + lang vector: 0x932bf14 + word table offset: 0x1c + ------------- + !!MATERIALS!! + ------------- + inorganics: + 0x932bda8 + organics: + 0x932bdb4 + trees: + 0x932bdd8 + plants: + 0x932bdc0 + color descriptors: + 0x93302b8 + Amber color:0xaf842e0 + all descriptors: + 0x93302d0 + toad-first creature types: + 0x932be54 + all creature types: + 0x932be2c + 0x932be54 + Toad: 0xb076f88 + Toad: rawname = 0x0 + Toad: character (not reliable) = 0x20 + Toad: caste vector = 0x60 + Toad: extract? vector = 0x18f4 + Toad: colors = 0x36 + + + 3e7bea269018a6fb88ef53715685aa64 + stealing memory... + looking for vectors... + ------------------- + !!LANGUAGE TABLES!! + ------------------- + translation vector: 0x932bf2c + lang vector: 0x932bf14 + word table offset: 0x1c + ------------- + !!MATERIALS!! + ------------- + inorganics: + 0x932bda8 + organics: + 0x932bdb4 + trees: + 0x932bdd8 + plants: + 0x932bdc0 + color descriptors: + 0x93302b8 + Amber color:0xcc3a770 + all descriptors: + 0x93302d0 + toad-first creature types: + 0x932be54 + elephant-first creature types: + all creature types: + 0x932be2c + 0x932be54 + Toad: 0xc77d798 + Toad: rawname = 0x0 + Toad: character (not reliable) = 0x20 + Toad: caste vector = 0x60 + Toad: extract? vector = 0x18f4 + Toad: colors = 0x36 + diff --git a/tools/supported/veinlook.cpp b/tools/supported/veinlook.cpp index e0fc79004..1f489b355 100644 --- a/tools/supported/veinlook.cpp +++ b/tools/supported/veinlook.cpp @@ -719,6 +719,10 @@ main(int argc, char *argv[]) // Supend, read/write data DF->Suspend(); + // restart cleared modules + Maps->Start(); + Mats->Start(); + Mats->ReadInorganicMaterials(); uint32_t effectnum; /* if(DF.InitReadEffects(effectnum))