d347713860
Merge remote branch 'upstream/master'
2011-03-14 09:54:19 -05:00
6ed74065d1
Cleanmap bugfix.
2011-03-14 09:18:09 +01:00
cb86f52993
minor liquids bugfix, added typedef for planecoord so that stonesense builds. Build system bits. Doxygen bits.
2011-03-13 19:38:32 +01:00
b6d02768b4
No DbgHelp.h
2011-03-12 11:01:53 +01:00
f0f3960bb0
added read_vegetation
2011-03-11 16:59:36 -06:00
de8226e142
fixed a couple of allocator callback names
...
added __str__ method to Tree
2011-03-11 16:59:25 -06:00
c5e9f67389
added ReadVegetation implementation
2011-03-11 16:58:42 -06:00
870be3a1e7
added tree buffer allocators
...
renamed a couple of allocators for consistency
2011-03-11 16:58:22 -06:00
6e54715706
added ReadVegetation
2011-03-11 16:56:21 -06:00
df3c6d706f
fixed a couple of small pointer bugs
2011-03-11 16:11:34 -06:00
4e3a66fcd8
Merge branch 'master' of https://github.com/doomchild/dfhack
2011-03-11 22:38:25 +01:00
5aeac3d43d
updated CreatureCaste, and CreatureType structs
...
added MatglossPlant and creature type descriptor structs
got the creature type allocator callback working
2011-03-11 14:13:52 -06:00
f6a7de9ba6
updated getters to use the changed pointer caching stuff
2011-03-11 14:12:07 -06:00
5b29bf5280
changed pointer cache to use array addresses instead of pointer ids
2011-03-11 14:11:36 -06:00
b9e8aa8952
Materials_getRaceEx finally works as expected
2011-03-11 14:10:51 -06:00
49b7f8acb5
fixed a couple of bad return values
2011-03-11 14:10:22 -06:00
b75f513238
updated creature caste and type structs
...
removed some (now) unneeded callbacks
made a better t_creaturetype -> c_creaturetype converter
2011-03-11 14:09:51 -06:00
c223bb858f
Added MapExtras, ported dfliquids to MapCache. Fixed vein non-ident bug in dfvdig.
2011-03-11 03:09:45 +01:00
1de2efb162
updated documentation
2011-03-09 14:25:32 -06:00
828df5fa80
consolidated buffer stuff, so that the callbacks are a lot shorter
2011-03-09 14:20:34 -06:00
1839c6b843
fixed callback registration
...
allocator callbacks now cache the buffers and associated pointers so they don't get collected too early
added CreatureCaste, TileColor, and CreatureType classes
2011-03-09 12:29:29 -06:00
50af9e2d7e
updated to use the pointer caching callbacks
2011-03-09 12:27:58 -06:00
5bd51c2e08
updated to use the allocator callbacks correctly
2011-03-09 12:26:04 -06:00
44cbc3fd5c
fixed allocator callbacks to take pointers to pointers so they'll actually, you know, WORK
2011-03-09 12:23:20 -06:00
187a8a0578
added a function to read all the veins at once
...
updated vein reading functions to use the allocator callbacks correctly
2011-03-09 12:22:00 -06:00
5c32991c40
Corrected game mode enum and added a mode changing tool to the playground.
2011-03-07 00:19:12 -05:00
bbbea3d023
Merge branch 'master' of https://github.com/doomchild/dfhack
2011-03-06 23:57:22 +01:00
9e62ee6e75
Maps + Materials for 31.20. Still many broken offsets!
2011-03-06 20:27:40 +01:00
9b0c426f9c
The age of creatures is signed int.
2011-03-06 11:42:02 +01:00
450562437a
Memory.xml cleanup, removing redundant information.
2011-03-03 23:54:44 +01:00
c98bc9da9d
updated to actually match the C stuff (not passing allocator callbacks every time, etc)
2011-03-03 14:19:20 -06:00
d314c733b2
added world and window_io getters
2011-03-03 14:18:28 -06:00
a816b67362
added key types for window_io module
2011-03-03 14:17:56 -06:00
6fc1f31e31
first commit
2011-03-03 14:17:31 -06:00
2c9016d2f2
added checks for allocator callback being null
2011-03-03 14:17:09 -06:00
4cf037d5d3
changed a couple of argument types to be more explicit
2011-03-03 14:15:38 -06:00
368f3c1b2e
added World getter renamed get_Window to get_WindowIO
2011-03-03 14:14:59 -06:00
f307d2c4c3
Merge https://github.com/doomchild/dfhack
2011-03-03 17:51:27 +01:00
6f7a8e3af5
Export fail removal - sa_feature, other minor changes
2011-03-03 17:50:17 +01:00
f4be3ef4fe
updated to use t_gamemodes struct in Read/WriteGameMode calls
2011-03-03 10:18:27 -06:00
680fe2981e
Merge branch 'master' of https://github.com/tomprince/dfhack
2011-03-03 16:56:38 +01:00
552180d430
Merge branch 'master' of https://github.com/doomchild/dfhack
2011-03-03 16:24:26 +01:00
faea954da1
Now with less endless loops.
2011-03-02 22:43:46 +01:00
777e997da2
Make vein reading a little saner.
2011-03-02 22:36:02 +01:00
3ff4e2c43e
Get rid of 'unknown vein' spam.
2011-03-02 22:32:08 +01:00
a969f9893f
Fix wine process suspend/resume. They use same mechanism as attach/detach now.
2011-03-02 22:23:24 +01:00
509971d6b1
Small fix of the GameMode enum
2011-03-02 09:07:37 +01:00
f28a29d29d
Fix some warnings on linux using C99 scanf modifiers.
...
Signed-off-by: Tom Prince <tom.prince@ualberta.net>
2011-03-01 17:36:26 -05:00
a82e249205
Move definition of sa_feature to .cpp to avoid unsed variable warning.
...
Signed-off-by: Tom Prince <tom.prince@ualberta.net>
2011-03-01 17:29:27 -05:00
f477fc002c
Fix lots of -Wall warnings.
...
Signed-off-by: Tom Prince <tom.prince@ualberta.net>
2011-03-01 17:19:18 -05:00
267bc1d446
Game/Control mode improvements. Use dfposition to check them.
2011-03-01 22:18:26 +01:00
f56cad1265
added grass vein and world construction readers
2011-03-01 14:39:56 -06:00
42670c798b
added grass vein and world construction types
2011-03-01 14:39:33 -06:00
06ae98c9dd
first commit
2011-03-01 14:39:18 -06:00
0b77744905
added game mode reader
2011-03-01 14:38:55 -06:00
bdb0ebd8ea
added grass vein and world construction readers
2011-03-01 14:38:18 -06:00
fa220531b7
Proper enum for game mode
2011-03-01 13:08:20 +01:00
54a580ac68
Hide depend headers better, upgraded tinyxml
2011-03-01 07:50:56 +01:00
b1061d0f94
Game mode reading, removed some include paths
2011-03-01 06:59:23 +01:00
c6a402c2b8
One more vein type. No ready for use.
2011-02-27 20:43:44 +01:00
254aec1787
Alternate way to read vegetation using a vector in map blocks. 31.19 only for now.
2011-02-27 13:59:45 +01:00
4284b948a0
Creature matgloss, creature and color matgloss offsets.
2011-02-27 09:48:08 +01:00
d6592502cc
No need to start Buildings for reading the custom types
2011-02-25 03:13:50 +01:00
803269122f
... What The Hell ?
2011-02-24 21:34:51 +01:00
820acc7483
Windows fixes
2011-02-24 21:32:12 +01:00
97bfa32a82
More cleanup in the Process lands.
2011-02-24 11:43:33 +01:00
79b78673e5
Fix build on MSVC
2011-02-24 01:32:15 +01:00
d26f9ee4a4
Merge branch 'master' of https://github.com/tomprince/dfhack into tomprince-master
2011-02-23 23:48:24 +01:00
62bec260b1
Fix 32bit linux build again.
2011-02-23 21:57:36 +01:00
a62196dea3
Merge branch 'master' of https://github.com/tomprince/dfhack into tomprince-master
...
Conflicts:
library/DFProcess-linux.cpp
2011-02-23 21:55:24 +01:00
4806318494
Factor out microsoft string handling functions.
2011-02-23 15:55:07 -05:00
aac3056b12
Get rid of NormalProcess::Private on windows.
2011-02-23 15:27:15 -05:00
a5479a4bef
Linux 32bit fix.
2011-02-23 20:13:29 +01:00
63ab8672d3
Add create*Process functions to create process instances.
...
This allows us to remove friendship of DFProcessEnumerator for Process
subclasses.
2011-02-23 06:13:10 -05:00
2927b08f93
Remove handle-body idiom of DFProcess on linux.
...
Since the classes aren't exposed to the client, there is no reason to
split the class.
2011-02-23 06:11:28 -05:00
b3c490857c
Refactor DFProcess-linux-{,wine}.cpp into DFProcess-linux-base.cpp.
2011-02-23 06:11:28 -05:00
c287e54793
Merge much of DFProcess-*-SHM.cpp into DFProcess-SHM.cpp.
2011-02-23 04:02:14 -05:00
9ba80d517f
Remove some gratuitous differences in the SHM implementations.
2011-02-23 02:26:55 -05:00
9b854be327
Remove duplicate code implementing readInt.
...
Implement one version in terms of the other.
2011-02-23 02:04:29 -05:00
9964dbac72
Add missing private/ProcessInternal.h
2011-02-23 01:07:22 -05:00
6ca0dd7c1d
Fix Process class.
2011-02-23 04:01:07 +01:00
9f5ee8a790
Many fixes, still many to go.
2011-02-18 02:51:17 +01:00
1c8249c55a
Mingw32 fixes
2011-02-18 01:14:16 +01:00
02e6e46d5f
Grass veins
2011-02-17 01:54:45 +01:00
72fd88cff3
Windows base map offsets
2011-02-17 01:18:27 +01:00
eb1a0b6b22
A little cleanup in Context.cpp, started work on 31.19
2011-02-16 19:29:16 +01:00
ad5e207276
make veinlook work with less offsets (maybe)
2011-02-15 00:45:37 +01:00
6c9652258d
memory xml bugfix related to valid attribute of the Offsets tag
2011-02-14 21:25:02 +01:00
3835ba0f75
Search tools run on windows and moved to supported, some windows segment/heap/PE section enumeration work.
...
New windows dependency: ntdll.lib
2011-02-14 03:58:32 +01:00
e958b8432a
More work on windos VM map method (compiles, needs testing), some MSVC 2010 nonsense warnings disabled.
2011-02-12 10:26:36 +01:00
d16bee48d2
Merge branch 'master' of github.com:peterix/dfhack
2011-02-08 22:57:14 +01:00
5bed6c5949
Sync, autosearch skeleton.
2011-02-08 22:55:40 +01:00
7676120dc8
Windows VM ranges (not tested)
2011-02-08 15:34:34 +01:00
130d965494
TODO use VirtualQuery
2011-02-08 14:34:43 +01:00
8439b3fa7d
Required fixes for properly exporting the new symbols.
2010-11-19 02:40:38 +01:00
c13b7c035f
Fix weather tool/offsets for 31.18. Added a file I missed.
2010-11-19 01:14:41 +01:00
ac91f46b6c
Merged patches from Rainer Keller
2010-11-17 20:50:50 +01:00
1a93c73737
Big chunk of windows 31.18 offsets.
2010-11-17 04:48:06 +01:00
a5d21e612b
Fixes, some messing around with the invalidation code
2010-11-08 00:31:40 +01:00
9ac7c1a9f2
memory.xml invalidation (untested)
2010-11-08 00:10:59 +01:00
457b331be7
Small fixes
2010-11-03 10:45:29 +01:00
cb6cf89b0c
Merge branch 'master' of http://github.com/reverb/dfhack
2010-11-01 10:47:15 +01:00
ab1a3a8cef
Salt/Stagnant water finally understood.
2010-10-29 07:36:06 +02:00
4edd33e13a
Fix crash when deallocating items module
2010-10-28 17:22:56 -05:00
5e507163b8
Material fix, custom reaction items seem to work again with offset update and bars work
2010-10-27 22:30:58 -05:00
df012b4bae
Fixes animal bars but may need to be reworked if other item types were messed up. Also, fix shouldn't break other types.
2010-10-25 16:15:14 -05:00
48dd2fc424
Merge remote branch 'upstream/master'
2010-10-25 16:12:27 -05:00
70cb93d9f4
Fixed includes, unified formatting.
2010-10-25 04:39:14 +02:00
92d0468694
added more information to probe.
...
added pit-with-floor option to hellhole.
bug fixes for the fake magma pipe in hellhole.
2010-10-20 12:31:16 -04:00
ba88c86670
dfitemdump appears to work. Materials still buggy (Pig Iron Bar != Mule Bar). This has been bugged since .12 or earlier
2010-10-19 05:07:07 -05:00
3acc410857
Tile Types update, and new hellhole n deramp tools in playground
2010-10-17 00:21:18 -04:00
b3121b898d
Urrgh. Seriously.
2010-10-07 01:23:35 +02:00
ec032240aa
Merge branch 'master' of http://github.com/belal/dfhack
2010-09-24 19:07:38 +02:00
b95ec7a2b3
Merge branch 'master' of http://github.com/doomchild/dfhack
2010-09-24 19:07:07 +02:00
583f997e2f
fix linux getPaths to append a null terminator on the strings
2010-09-23 08:33:45 -04:00
a8ae899f2e
Add checks to handle missing custom workshop offsets.
2010-09-22 18:34:51 +02:00
a3870bb5a1
Constructions, buildings, base 31.13 windows entry on DF2010 instead of 31.12.
2010-09-22 18:20:55 +02:00
026a2eb94e
Merge branch 'master' of git://github.com/peterix/dfhack into belal
2010-09-22 10:42:22 -04:00
369b7cf701
Fix MSVC10 build error.
2010-09-21 03:18:34 +02:00
8ac0b653df
Merge remote branch 'upstream/master'
2010-09-20 12:40:44 -05:00
1a5bce53a7
added ReadGeology
2010-09-20 12:40:00 -05:00
0f7a27d611
fix the WindowIO-windows.cpp module to work correctly with the new DF, also made it a little simpler.
2010-09-19 19:50:20 -04:00
88934f0add
Materials done
2010-09-19 06:17:48 +02:00
dfdd1467ff
Offset stuff
2010-09-18 04:36:14 +02:00
918de0271b
fix to get the windowIO.h to compile from a submodule
2010-09-17 09:20:15 -04:00
3dfbc5fb21
update widows getPath to only output the path, not the path and exe filename, to correspond with the linux versions
2010-09-16 21:44:38 -04:00
6661d7e1f7
added getPath() for all linux versions as well, should work fine
2010-09-16 18:21:41 -07:00
9844a8f8b3
added SetPauseState wrapper
2010-09-16 13:10:13 -05:00
70b1a48cea
added unregistration functions for callbacks
2010-09-16 13:05:02 -05:00
78a12876d5
added ReadInventoryIdx and ReadInventoryPtr wrappers
2010-09-16 13:04:19 -05:00
36400f2833
Merge branch 'dotnet'
2010-09-16 09:06:12 -05:00
3592748a50
Bits and pieces
2010-09-16 15:09:42 +02:00
d2db7524a1
Keeping the current working directory addition, but reverting the current tileset and color stuff, as the tileset was just an initializer, not the actual current one, just going to have to read the init.txt file myself
...
Revert "Add function to get the current working directory of the DF process, as well as offsets for the relative paths of the current tileset and color file, also created a simple program to dump those three things out"
This reverts commit 040f8f7b7a
2010-09-13 09:45:53 -04:00
040f8f7b7a
Add function to get the current working directory of the DF process, as well as offsets for the relative paths of the current tileset and color file, also created a simple program to dump those three things out
2010-09-12 21:38:21 -04:00
f6b137230a
Fixed pause state offset in 31.12 linux version, dfreveal pauses and has improved usability.
2010-09-04 07:43:39 +02:00
315aab0d57
added registration functions for callbacks, since some languages can't directly access DLL data exports (*cough*P/Invoke*cough*)
2010-09-03 10:31:14 -05:00
5a5745590a
More Creatures rework, this time with more memset
2010-09-03 03:01:37 +02:00
dc6aa19083
Creature rework
2010-09-03 02:15:09 +02:00
a46422d2a6
Merge branch 'master' of http://github.com/doomchild/dfhack
2010-09-01 20:30:25 +02:00
f1307d9f13
Added a common exception for DFHack, made World and Position use it for feature detection.
2010-09-01 18:03:52 +02:00
988b1d8692
Added support for reading and setting the weather.
...
Signed-off-by: Mike Stewart <thewonderiidot@gmail.com>
2010-09-01 11:22:19 -04:00
86aa19daa4
Fix for Creature module
2010-08-31 17:21:47 +02:00
66c3d30bd8
Fix Gui module so Stonesense can work.
2010-08-31 12:59:48 +02:00
ff550a7e09
Fix getPE()
2010-08-31 07:07:37 +02:00
b9bee108e1
Sync, fixes.
2010-08-31 06:52:03 +02:00
9bcdc78d00
name of GUI offset group was wrong in its module
2010-08-31 05:32:40 +02:00
95166d39a2
changed uint to uint32_t in declaration of VersionInfo::getPE()
2010-08-30 12:37:13 -05:00
c5c1d52047
fixed spelling of BUILD_DFHACK_C_BINDINGS
2010-08-30 12:36:40 -05:00
95abf6e605
All the modules *should* now use the new offset storage properly. Maybe, needs testing :)
2010-08-30 00:08:17 +02:00
2dd8aed7a0
Merge branch 'master' of git://genodeen.net/adeon_dfhack
...
Conflicts:
CMakeLists.txt
library/modules/Position.cpp
2010-08-28 22:47:38 +02:00
85240c78b5
Fix probe utility, Position module
2010-08-28 22:07:31 +02:00
d46dcb8342
Maps stuff, geology seems broken
2010-08-28 15:43:53 +02:00
51d545402d
Offset dumper reports missing offsets instead of skipping them
2010-08-28 14:06:18 +02:00
b44fd18dc8
Merge branch 'master' of http://github.com/belal/dfhack
2010-08-28 13:52:12 +02:00
2703d74fbd
Sane output from offset dumper
2010-08-28 12:47:33 +02:00
4d55e37e20
Merge branch 'master' of http://github.com/doomchild/dfhack
2010-08-28 06:36:40 +02:00
84b417cf1a
Memory-ng.xml should be consistent now. Offset dumper doesn't complain.
2010-08-28 06:31:44 +02:00
e762f1caea
Merge branch 'master' of git://bigbox.banquise.net/dfhack
...
Conflicts:
tools/examples/creaturedump.cpp
tools/supported/dumpoffsets.cpp
2010-08-28 04:39:03 +02:00
f2dea86819
Seemingly working VersionInfo loading parts. The offset names are now all wrong in the modules. DO NOT USE
2010-08-28 03:57:56 +02:00
2df6433fef
Fix map reading for dfcopypaste, add simple console application to do the copy/pasting.
2010-08-27 14:56:38 -04:00
afdc91265d
Revert "Add a dirty hack to stop flickering on non-synchronizing DF processes."
...
This reverts commit 3a33e64acc4da7270eef30ef595fc6f82eb72efc.
I guess it's better this way.
2010-08-27 18:34:13 +03:00
4197ad064f
Add a dirty hack to stop flickering on non-synchronizing DF processes.
2010-08-27 18:34:12 +03:00
35a58cdf0c
Add screen_tiles_pointer for Memory.xml and fix reading screen tiles in Position module.
2010-08-27 18:34:12 +03:00
60bfc1d420
added the new callbacks to the list
2010-08-27 09:31:08 -05:00
c7f37b697c
added include for Position.h
2010-08-27 09:30:15 -05:00
33cd5fb1b4
added ReadHotkeys and getScreenTiles
2010-08-27 09:29:55 -05:00
fb7cfc45c8
added getType
2010-08-27 09:19:43 -05:00
cfa39dde7f
wrapped ReadGlobalFeatures
2010-08-26 10:29:04 -05:00
b78b0ad2e6
wrapped ReadMenuState
2010-08-26 10:28:31 -05:00
fba11842bc
add allocator callbacks for t_feature, t_hotkey, and t_screen
2010-08-26 10:27:56 -05:00
1327b7236b
changed extension to "rst"
2010-08-25 09:20:00 -05:00
b33d56354f
OffsetGroup class (unfinished)
2010-08-23 19:28:53 +02:00
143f30f64b
Merge branch 'master' of http://github.com/sizeak/dfhack
...
Conflicts:
library/VersionInfo.cpp
2010-08-23 16:16:58 +02:00
0ddc431013
Merge branch 'master' of http://github.com/doomchild/dfhack
2010-08-23 16:11:46 +02:00
368de864a1
Sync
2010-08-23 01:29:55 +02:00
1bceac2343
Rename memory_info and its factory class.
2010-08-20 14:10:05 +02:00
a08258e36b
"import pydftypes" changed to "import dftypes"
...
buildings now using custom workshop callback
creatures now using material callback
fixed return value for civ and race index getters
2010-08-19 12:51:02 -05:00
a508542d7c
added material and custom workshop buffer callback
...
updated Creature class definition with new members
fixed field size in Skill class
2010-08-19 12:47:45 -05:00
464919635f
fixed bug where reading en empty job list played with a null pointer
2010-08-19 12:45:43 -05:00
fd872922a5
updated to match C++ additions
2010-08-18 16:00:58 -05:00
f2696dadca
added updated Write functions
2010-08-18 15:46:15 -05:00
2889b01357
updated to use pre-registered callbacks like everything else
2010-08-18 12:59:11 -05:00
9cf2e0f26d
Support for reading inventory
2010-08-17 15:21:54 +02:00
34b6bc06b6
started in on added docs
2010-08-16 14:52:00 -05:00
e84ea20fb0
minor cleanup
2010-08-16 14:19:26 -05:00
d96578a3b4
added missing #include for DFTileTypes.h
2010-08-16 13:50:34 -05:00
e57be44cde
Merge remote branch 'upstream/master'
2010-08-16 13:41:33 -05:00
3b29fddf7b
unify build system, start on the new offset file format
2010-08-16 00:45:02 +02:00
94872b8abd
A bit of checking in some places.
2010-08-14 18:32:38 +02:00
a159707250
Fix memleak with Context not cleaning up.
2010-08-14 01:25:18 +02:00
7fbdd6c69a
Cleartask tool, updated docs.
2010-08-13 23:25:14 +02:00
bae7b88be0
Make sure the compatible memory.xml is used.
2010-08-13 21:44:17 +02:00
78c5ef5c71
added vein readers
2010-08-13 12:31:53 -05:00
a94c398a0e
added vein allocators
2010-08-13 12:31:31 -05:00
2a34b9fd79
first commit
2010-08-13 12:30:58 -05:00
b26506195e
Merge remote branch 'upstream/master'
2010-08-13 09:40:45 -05:00
f6a777bccd
added getter for tile type
2010-08-13 09:40:32 -05:00
cf8c805add
just made the tile type array length a #define
2010-08-13 09:39:37 -05:00
8fa3d0811c
Make building C bindings optional.
2010-08-13 02:35:10 +02:00
21f7f8e703
Moved memory defs to /data. Memory.xml is copied into the right folder at build time (works even with MSVC).
2010-08-13 02:23:38 +02:00
doomchild
Petr Mrázek
mikestewart
Tom Prince
reverb
zilpin
belal
belal
thewonderidiot
Mikko Juola
simon