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
f6aea927c8
Memory.xml in new format (offsetedit/Memory-ng.xml). The declarations/descriptions are still missing.
2010-08-12 21:38:15 +02:00
1e9c4a0450
Added function to get const reference to stored map of labours. Nothing special
2010-08-10 22:28:53 +01:00
7d684d12b4
Job writing for mood material editing
2010-08-09 19:28:35 +01:00
3afff27f03
A bit of offset work on linux, uprated README and COMPILE, screen reading code (untested).
2010-07-19 21:42:17 +02:00
0cb5e99a44
Fix for SHM on windows
2010-07-17 20:13:44 +02:00
52178e779f
Fixes to merged C API and windows SHM.
2010-07-17 01:55:18 +02:00
9bafefbd80
Merge branch 'master' of git://github.com/peterix/dfhack
2010-07-15 12:58:25 +01:00
1e7a705129
getType needs lots of work but its ok(ish). Mostly working .10 creature offsets
2010-07-15 12:57:45 +01:00
ebbb497630
Merge branch 'master' of http://github.com/doomchild/dfhack
2010-07-15 00:47:51 +02:00
46d776cf46
doxygen index page, OnResume all modules from Context::Resume
2010-07-07 01:35:38 +02:00
a8b5c461fe
added terrain checkers
2010-07-06 14:07:39 -05:00
e7751f8fd9
changed vein readers to return a pointer to a buffer of just one kind of vein at a time
2010-07-06 13:45:35 -05:00
9ef7a74a44
added MapPoint class
2010-07-06 13:19:55 -05:00
3abdd0f2f2
added vein reading functions
2010-07-06 13:18:36 -05:00
c77a049d8b
Merge remote branch 'upstream/master'
2010-07-06 10:57:24 -05:00
ec35663b62
Common base for all modules
2010-06-25 07:11:26 +02:00
4f009a5c5c
Civilisation writing
2010-06-23 03:32:33 +01:00
e1e1850d8e
Position writing
2010-06-22 18:27:27 +01:00
3f0ab50b5d
mood skill writing
2010-06-22 17:21:09 +01:00
8d07001674
0.31.08 Windows SDL
2010-06-20 19:20:10 +02:00
31167475de
Tool for dumping the effective addresses/offsets of a running DF instance
2010-06-20 02:50:37 +02:00
95b52d099f
flag writing type fix
2010-06-19 20:09:16 +01:00
bbb29fe3d5
Find, Filter, FindInRange and Incremental search methods
2010-06-19 03:47:09 +02:00
0b9605e08a
changed def to class (durrrr)
2010-06-18 10:39:40 -05:00
0735c8b84a
Merge branch 'master' of git://github.com/peterix/dfhack
2010-06-18 01:18:00 +01:00
5fd94efb10
Added moods to memory.xml
2010-06-18 01:17:19 +01:00
41f3432d1c
whitespace
2010-06-18 01:17:46 +02:00
d3e7701bc8
Fix template brackets
2010-06-18 01:10:03 +02:00
760cb59522
Merge branch 'master' of http://github.com/sizeak/dfhack
2010-06-18 01:08:23 +02:00
ecb83f2288
Merge branch 'master' of http://github.com/doomchild/dfhack
2010-06-18 01:08:07 +02:00
96c774629a
Added mood writing. Mood only, not skill or anything. Seems to work ok
2010-06-17 23:18:01 +01:00
5b71ac7dae
add __init__ file
...
renamed flags and types
2010-06-17 16:26:53 -05:00
fa8238af08
removed reveal and force_suspend to examples
2010-06-17 15:38:48 -05:00
d58260740f
moved the old Python/C stuff to python/deprecated
...
renamed "c api" to "pydfhack"
2010-06-17 15:32:53 -05:00
061108c685
weird skill reading byte alignment fix (reverted to how it was original minus the offsetof change)
2010-06-17 19:24:18 +01:00
39222c972a
Merge branch 'master' of git://github.com/peterix/dfhack
2010-06-17 14:16:37 +01:00
c53b643886
Fix liquids bug, added status checks to Maps (still not the real thing, but better)
2010-06-17 06:46:20 +02:00
9a15f00c8d
bug fix, sex writing (seems to work ok), trait writing(untested)
2010-06-16 20:47:05 +01:00
5e105c9571
fix typo
2010-06-16 02:03:37 +02:00
ba9d2d14c2
Magic number cleaning
2010-06-16 08:01:17 +08:00
77d2343742
Attribute writing added
2010-06-16 07:22:39 +08:00
8fb05f24db
Skill writing added
2010-06-16 07:22:38 +08:00
2254f3dfe5
Flag writing function added
2010-06-16 07:22:38 +08:00
b95efc22fe
Happiness writing function added and tested. Seems ok so far
2010-06-16 07:22:38 +08:00
b732e63673
long long
2010-06-11 20:13:37 +02:00
3f099f8928
LARGE_INTEGER replacement
2010-06-11 19:53:28 +02:00
0562ce9802
Ok fixed level data to work from 0 to xp needed for next level. Due to xp starting from 0 for each level, getting the level based on xp had to be removed so now you can only get level data by level, which returns a struct containing level, name and xp need to next level.
2010-06-11 00:00:21 +01:00
3142e75186
Merge branch 'master' of git://github.com/peterix/dfhack
2010-06-10 17:42:38 +01:00
8987111cfe
Stupid mistake was stupid
2010-06-10 17:31:09 +01:00
45031a3724
Added levels done (unless issues)
2010-06-10 16:53:25 +01:00
7885eb8e74
0.31.06-SDL, needs testing
2010-06-10 10:30:56 +02:00
1645df7088
Some offsets for 0.31.04, bugfixes
2010-06-06 00:56:09 +02:00
6b7f3e1816
Big namespace cleaning
2010-06-05 00:02:02 +02:00
115e969530
Build fixes, made precompiled SHM libs
2010-06-04 03:05:38 +02:00
b8600169ef
Minor comments and other changes
2010-06-01 21:06:16 +02:00
123fb5a9d0
Lots of comments. Using templates in the search tool.
2010-05-30 05:13:59 +02:00
5ee4acfd2e
Fixed build problem in C API. Beware of bad memory management!
2010-05-29 23:50:14 +02:00
fa0d881e16
Merge branch 'master' of http://github.com/doomchild/dfhack
2010-05-29 23:39:59 +02:00
95b44a8ef3
Documented ContextManager
2010-05-29 22:46:23 +02:00
7300e61f8a
ContextManager and ProcessEnumerator have the basic functionality done.
...
Created a test program to validate them and show how to use them.
2010-05-29 21:34:36 +02:00
ab40868b29
ProcessEnumerator tracks processes properly now.
2010-05-28 05:18:32 +02:00
66159d4221
updated to use new callback signatures
2010-05-27 12:35:40 -05:00
3caac25145
changed callback signatures to allow for return codes
2010-05-27 12:35:11 -05:00
6e91b7c9de
updated to include WindowIO_C and World_C
2010-05-26 14:51:39 -05:00
a962299c20
cleaned up header includes
2010-05-26 14:51:21 -05:00
bd4456b5f6
Fix bad SHM reads of ranges above 1MB.
2010-05-26 18:05:12 +02:00
af1a41712e
Tiny fixes.
2010-05-26 17:54:30 +02:00
ee8ac4e508
Missed an include ~_~
2010-05-26 15:15:14 +02:00
04b71f154c
Fun and games. Also turning old DFWindow class into a module tracked by Context.
2010-05-26 12:24:45 +02:00
966a145b3e
Moving stuff around, part 3
2010-05-26 08:42:09 +02:00
b710ed687a
Moving stuff around, part 2
2010-05-26 06:48:23 +02:00
cd18db8ccd
Reorganize pydfhack
2010-04-02 16:49:07 +02:00
d3f1f63d92
Merge branch 'pydfhack' of git://github.com/doomchild/dfhack into DF2010
2010-04-02 16:47:46 +02:00
c26da9b84c
More DF 2010 reorganization
2010-04-02 16:46:33 +02:00
49ecc368bf
added getter for window size added ReadHotkeys
2010-04-01 17:01:46 -05:00
3324327535
added getter for current cursor creature
2010-04-01 17:01:41 -05:00
37cc11615c
added setters for view/cursor coordinates
2010-04-01 17:01:34 -05:00
07cb3b8ac2
Read*Matgloss calls now return a dictionary of tuples, keyed on the matgloss.id
2010-04-01 17:01:14 -05:00
8308b73b6c
disabled SWIG build step
2010-04-01 17:01:07 -05:00
3be3174c33
added Read*Matgloss calls
2010-04-01 02:55:11 -05:00
23460c94d8
added license message
2010-04-01 01:02:03 -05:00
e39330847b
added license message
2010-04-01 01:01:47 -05:00
fda4482dc5
added license message
...
added MatGlossPlant struct
2010-04-01 01:01:16 -05:00
5f09b47ca8
added license message
2010-04-01 01:00:51 -05:00
6af1f482ca
add matgloss.cpp
2010-03-31 19:02:08 -05:00
93058506e0
first commit Read/Write Designations works
...
Signed-off-by: doomchild <doomchild@theyfear.us>
2010-03-31 17:35:56 -05:00
35960db5aa
Fix for out-of-bounds access error with regionoffsets. Breaks compatibility.
2010-03-31 18:16:18 +02:00
eccdc6896e
Fix argstream.h
2010-03-30 04:43:06 +02:00
71fc49897f
Accelerated creatures work on Windows
...
Refactored vector reading, proper length of vectors from MSVC9 is known (0x18, triplet starts at 0xC)
2010-03-30 02:26:52 +02:00
85d347442d
Accelerated reading of creatures
2010-03-28 17:22:15 +02:00
6522d0c498
Even more fixes for random crashes in some less common cases (DF in the menu, etc...)
2010-03-26 13:38:49 +01:00
4d939363b5
Many fixes to DFHack tools and examples
2010-03-26 13:01:46 +01:00
517aa0e6e3
Merge branch 'master' of git://github.com/Zhentar/dfhack
...
Conflicts:
examples/CMakeLists.txt
library/DFHackAPI.cpp
Also added offsets for all supported versions
2010-03-26 02:40:17 +01:00
f0edb0c33d
Map block flags added to the API
...
Added a RAMP_TOP tile shape, ramp characters for veinlook
Merged in the magma_create util by Aleric, tweaked it a bit, made it use the block flags
2010-03-26 00:42:07 +01:00
dbeb342c6a
Make the python wrapper compile again
2010-03-25 22:13:56 +01:00
822265443c
Make the API a bit saner about the used data types and structures
2010-03-25 21:37:09 +01:00
13fcdb8b8f
Fix one more InitReadNames call
2010-03-23 00:37:35 +01:00
efadfe98b2
Add some more exception handling to InitRead API methods
2010-03-23 00:35:23 +01:00
4287abbc94
Add pregnancy and blood stuff to the creature struct
2010-03-21 15:47:24 -05:00
71f8474e11
Added reading/writing support for effects like mist
...
Veinlook shows effects for it's middle block
Veinlook now uses wide-character ncurses
2010-03-20 17:30:13 +01:00
c283197b71
Flush input in veinlook, so it doesn't 'lag' so bad
2010-03-18 20:05:32 +01:00
d2afd21318
Stop synchronous suspend from eating CPU cycles.
...
Untested on windows.
Breaks the SHM protocol. New SHM server library is required.
2010-03-18 19:55:01 +01:00
df4de4a333
Detach in API destructor
2010-03-16 22:12:05 +01:00
a2eb3a6892
add iostream to DFProcess.h include, std:: prefix to the output line, DT was getting mad about them not being defined
2010-03-14 20:28:36 -04:00
e4dc165954
Merge branch 'shm-multi'
2010-03-14 23:17:54 +01:00
5fe279d8ec
Added a cache mechanism to vtable lookups
...
Fixed python bindings (build, not actual functionality)
Fixed building subtypes on linux
2010-03-14 22:58:28 +01:00
12abef8ace
used different creature vector than before, this is the correct one, the old one was missing some creatures, and the current_creature index was not right, also found the offsets for mood and artifacts for 40d
...
Everything should work now from 40d,40d2->40d19 on windows, linux was already done before
I also modified creaturedump.cpp to show mood and aritifacts if a creature has one, also the mood is now a int rather than a uint, as we check for -1
2010-03-14 13:21:52 -04:00
310669737e
Port multiple client SHM to Windows
2010-03-13 17:44:36 +01:00
0582354191
Merge remote branch 'remotes/peterix/master' into version_compatiblity
...
trying merge
Conflicts:
examples/creaturedump.cpp
output/Memory.xml
2010-03-13 08:45:30 -05:00
834a64c282
Fix horrible race conditions in suspend and resume
2010-03-12 18:29:11 +01:00
791ac8dd75
modify the renamer and creature dump to output the new current cursor creature code
2010-03-12 09:21:45 -05:00
0dd14bb9c8
Cosmetic changes, really
2010-03-12 12:14:20 +01:00
9d503515dd
Another try at locking
2010-03-12 00:13:50 +01:00
e500b13533
offsets are all correct for 40d, creature offsets are not constant all the way back to 38.a, so more work needs to be done there
...
This could probably be used in stonesense as it is though, all the map data is correct
2010-03-10 21:24:31 -05:00
3ae8b56a49
Addresses all the way back to 173.38a, not checked yet, and offsets may have changed in the versions, but it is a start!
...
Also changing the current_creature offset, have to make sure what I changed it to is in the d# releases, but I think it is
This branch is still a work in progress
2010-03-09 22:05:31 -05:00
62ae8df573
per-process file locks on linux (stored in /tmp/DFHack/PID/)
...
minor signed/unsigned fix
2010-03-09 21:25:17 +01:00
5c4ef73f4d
Merge branch 'shm-only'
2010-03-09 15:31:44 +01:00
7207996940
Prevent windows process enumerator from listing the same process twice
2010-03-09 15:21:53 +01:00
f0087926c5
Revert "Nuked many Process classes. Only SHM remains. We'll see how it goes :)"
...
This reverts commit b3424418e6
2010-03-09 15:15:15 +01:00
3e581908c1
Each DF process on windows now has unique mutex and shm names.
2010-03-09 13:41:55 +01:00
9d7574dafe
DF disappeared exception
2010-03-09 03:30:22 +01:00
1c499121e6
Fixes to memory.xml, name reading
2010-03-08 18:27:19 +01:00
b1a15b6fb3
Merge branch 'version_compatiblity' of git://github.com/belal/dfhack
2010-03-08 14:52:40 +01:00
e5c3ed9ad3
Fix python and a gcc syntax error
2010-03-08 14:50:32 +01:00
d2c84df4c8
Merge branch 'master' of git://github.com/Zhentar/dfhack into mergeb
...
Conflicts:
library/DFHackAPI.cpp
2010-03-08 13:56:32 +01:00
36a6f1f0a4
mod-core rework
...
squashed some init commands together
fixed a problem with non-atomic shm command reading on the DF side that caused segfaults
2010-03-08 07:31:12 +01:00
052dd53c03
Further cleanup for name stuff; fixing examples that I broke and handling settlements. Also added mood, so that it can be determined whether or not the dwarf's artifact was created.
2010-03-07 20:01:30 -06:00
0c8c1d0eec
Modified Memory.xml to support all d# versions, modified Vtable meminfo reading, so it auto-resolves all vtables now, so you should never have to do any rebasing or anything. Fixed some bugs in windows meminfo as well
2010-03-07 21:00:31 -05:00
90baaad19b
Allow recognizing multiple DF SHM processes by the client
2010-03-08 01:54:46 +01:00
60a1da0923
d19_2 support, building vtables, some minor bugfixes
...
tested with stonesense
2010-03-06 21:21:01 +01:00
96512a7e1d
Linux d19 support
2010-03-05 22:19:27 +01:00
958ca0e384
Some map module bits
2010-03-05 16:06:02 +01:00
65bf8f69fd
Proper-fy name handling for creatures. For surnames and such, official DF logic is used.
2010-03-05 00:02:41 -06:00
9aedc56186
A waitWhile method copy turned into wrapper
2010-03-05 02:45:53 +01:00
8e8d320a0b
Don't build SHM on 64bit, makes no sense
...
Added origin to mapblock40d
2010-03-05 01:26:39 +01:00
798ce9fb0a
CR-LF mess
2010-03-05 00:55:57 +01:00
c86464502c
SHM rework, stage 2
2010-03-05 00:05:01 +01:00
6e69dcdeed
Use sched_yield depending on CPU affinity
2010-03-04 04:40:06 +01:00
0192520d43
SHM rework, stage 1
2010-03-03 05:43:38 +01:00
b3424418e6
Nuked many Process classes. Only SHM remains. We'll see how it goes :)
2010-03-02 01:18:34 +01:00
9f7609de65
GCC exception fix
2010-03-01 01:21:54 +01:00
0a23757797
Merge branch 'errorhandling' of git://github.com/mizipzor/dfhack
2010-03-01 01:13:07 +01:00
160992ec9c
added exceptions to meminfomanager
2010-02-28 21:44:14 +01:00
c4cb3afd0b
Fix for Windows exceptions
2010-02-28 19:59:07 +01:00
fa878f2e9d
Fix terrible Linux SHM performance on single-core
2010-02-28 18:08:44 +01:00
05250b4eb5
Make Linux Process validation not fail with MissingMemoryDefinition
2010-02-28 06:21:50 +01:00
c13e37adf6
Merge branch 'master' of git://github.com/peterix/dfhack into errorhandling
2010-02-28 05:52:48 +01:00
f4f566e7c4
Fixed exceptions on GCC
...
Fixed dfbauxte tool - no longer includes internal headers
Moved part of DFVector into a .cpp file
2010-02-28 05:35:54 +01:00
029f1a6cf8
Merge branch 'errorhandling' of git://github.com/mizipzor/dfhack
2010-02-28 04:26:10 +01:00
7c73c7abe6
CMake swig integration
2010-02-28 04:11:06 +01:00
b680af0b26
fixed setting of flags to false in two init functions
2010-02-28 03:45:38 +01:00
6be18fbf20
sprinkled some exceptions over the memory reading
2010-02-28 03:34:54 +01:00
2b1940430f
added many MissingAddress exception throws
2010-02-28 02:53:47 +01:00
f2dcbc6372
added exceptions to API::ReadGeology and API::InitReadBuildings
2010-02-28 02:50:16 +01:00
19cd686ac4
added exceptions to API::InitMap
2010-02-28 02:37:05 +01:00
decb20ef67
Merge branch 'master' of git://github.com/peterix/dfhack into errorhandling
2010-02-28 02:29:29 +01:00
cf4042acce
Fix header and code desync
2010-02-28 02:07:42 +01:00
7a85682ea0
Many fixes to DFHack::API
...
Wrapper generation still manual, but makes a lot more sense
2010-02-28 01:25:04 +01:00
4f85f37b01
added some exceptions to handle errors
2010-02-28 01:13:34 +01:00
21a74c0bfa
Fix problem with wrapper generation
2010-02-27 16:47:11 +01:00
7805b591dd
Sync
2010-02-27 13:24:32 +01:00
562c30c703
Python stuffs
2010-02-26 22:23:43 +01:00
347eb66d21
Changes for better SWIG support
2010-02-26 22:22:10 +01:00
626d266e27
Added GCC visibility support
2010-02-25 23:43:37 +01:00
4509e275ce
Tabs to spaces
2010-02-25 17:53:41 +01:00
de5b2ecb4e
Fixes for crash bugs and memory corruption.
2010-02-25 17:50:52 +01:00
a5d42e4051
Code for getting the current and all settlements in the world, currently has offsets for the settlement location, name, and area size. Right now the current settlement causes msvc to claim the heap is corrupted, I think due to the fact that the current_settlement vector only has 1 item in it. I think it may be a bug in the vector code, as my code is basically identical between the current settlement and the other settlements.
...
Signed-off-by: belal <jimbelal@gmail.com>
2010-02-25 17:50:52 +01:00
bdc22b4052
leftovers
2010-02-25 15:33:13 +01:00
49a2f97601
Silly building reading bug fixed
2010-02-25 14:59:29 +01:00
eff3462bf9
Less spam!
2010-02-25 14:43:38 +01:00
726519e2ca
Major memory_info rework.
...
All <class> tags and vtable="" attributes in Memory.xml are now obsolete.
<multiclass> tags are still important, but don't need the vtable attrs.
Vtables are resolved automatically.
All this will be left in Memory.xml until utility authors update to this version or newer.
2010-02-25 13:41:57 +01:00
70f22d008e
Support for d18 on windows
...
Also deployment to people who get Memory.xml from git...
Fixed wine process attach bug
2010-02-23 22:29:55 +01:00
bb141fe8f6
Linux d18 ncurses support for shm lib
...
Some boost preparations
2010-02-23 19:26:15 +01:00
1e04722a63
Refactor of memory_info class, now with more d-pointer
2010-02-22 23:34:20 +01:00
fbad1cb5a3
Fixed annoying MSVC bug and MSVC warning spam
2010-02-22 00:18:44 +01:00
9300cc48cc
Break the debug builds. Bugs must never be hidden.
2010-02-21 18:35:14 +01:00
9268a79a66
Reading of tiletypes under ice - 'ice veins'
2010-02-21 05:51:29 +01:00
3c7c197f7a
Removed bogus block flags, added actual dirty bit :)
2010-02-20 16:33:30 +01:00
26568fe5ea
Added 'dirty' bit of a block to veinlook, API.
2010-02-20 12:58:52 +01:00
5cfb401d49
Merge branch 'master' of git://github.com/mizipzor/dfhack
2010-02-19 21:41:02 +01:00
7f404483f1
fixed (fix as in hack) crash when std::string was used to store a command line argument
2010-02-19 21:24:20 +01:00
adbf4b81b4
updated cmakelists
2010-02-19 20:55:11 +01:00
32e08c6687
removed gopt
2010-02-19 20:52:07 +01:00
34f7894255
one constructor had three compile errors, just commented it out
2010-02-19 20:51:33 +01:00
c8b9c36d36
code format
2010-02-19 20:48:46 +01:00
6586bba48c
added argstream
2010-02-19 20:48:17 +01:00
7ab1fcd019
added proper exports to gopt.h
...
renamed gopt.c to gopt.cpp
2010-02-19 19:04:55 +01:00
8e6f528e72
Merge branch 'master' of git://github.com/belal/dfhack
2010-02-19 03:35:36 +01:00
f71fef9ef5
Process::readClassName implemented
2010-02-19 02:48:03 +01:00
7ce8935aef
Add offsets for versions d9-d17 for windows and linux, windows has been tested, linux has not, but it should be right unless I screwed something up
...
Signed-off-by: belal <jimbelal@gmail.com>
2010-02-18 15:29:45 -05:00
da19d92f16
Asserts into IFs
2010-02-18 21:28:28 +01:00
49cd747a59
Merge branch 'master' of git://github.com/mizipzor/dfhack
...
Conflicts:
examples/CMakeLists.txt
2010-02-18 18:45:46 +01:00
3def16e85f
added gopt to CMakeLists.txt
2010-02-18 18:31:18 +01:00
7679e48794
fixed compile errors in gopt
2010-02-18 18:25:24 +01:00
f0ec4144ed
added gopt
2010-02-18 18:23:09 +01:00
e9e1d2b8b9
Tabs to spaces
2010-02-18 18:06:32 +01:00
2e02efa8d2
Merge branch 'master' of git://github.com/belal/dfhack
2010-02-18 17:55:43 +01:00
387e1e8794
Finish up code for hotkeys and notes, just need to find offsets for linux versions and windows < d17
...
Signed-off-by: belal <jimbelal@gmail.com>
2010-02-17 21:08:54 -05:00
42a12ffaec
Veinlook now goes to map edges
...
API change: isValidBlock now checks for map boundaries
API change: added getBlockPtr. It returns a DF pointer to a block.
2010-02-18 02:10:39 +01:00
e71f41fd42
test commit of notes-windows d17
...
Signed-off-by: belal <jimbelal@gmail.com>
2010-02-17 18:33:08 -05:00
2bde06a2af
Added veinlook, linux SHM produces less spam messages.
...
Veinlook is a tool that allows looking at the map and the different vein types it contains. This adds ncurses as a dependency on Linux.
2010-02-17 17:49:19 +01:00
054fec0afc
Updated README and COMPILE, split tools into tools and examples.
...
Tools are now useful, and with a working user interaction where applicable.
Examples are a collection of benchmarks, tests and simple unfinished ideas.
2010-02-16 07:21:38 +01:00
56969fb977
Added std::string read/write by belal. Extremely volatile.
2010-02-16 00:04:15 +01:00
568fcd6105
designation and traffic bits turned into enums
2010-02-14 00:45:46 +00:00
a17cb053d4
quick creature API fix
2010-02-13 16:19:11 +00:00
a8d35f3724
fake SDL.dll for the SHM bridge now compiles right using the MS compiler
2010-02-13 00:47:08 +00:00
de32b65c11
engraving offsets for linux d16, attempt to fix MSVC bugs
2010-02-12 23:25:41 +00:00
63f82cd580
API changes: InitRead* methods made safer - they now return false on error
2010-02-11 21:08:39 +00:00
7fcc4d5e22
resolved a shm suspend/resume bug on windows
2010-02-11 05:10:23 +00:00
b1ce815370
massive Memory.xml VTable sections restructure, support for d17 added in Memory.xml, needs testing. shm not updated yet
2010-02-10 00:20:15 +00:00
5b0a03b16d
merged itemdesignator and menustate patches
2010-01-18 16:44:24 +00:00
9f1216fa2f
fixes
2010-01-11 18:57:57 +00:00
7c784bce32
deadlock-filled windows SHM version
2010-01-11 06:27:59 +00:00
ebd14ea1bb
copy of linux SHM
2010-01-08 05:56:36 +00:00
4430b43851
windows shm server part
2010-01-08 05:52:37 +00:00
a01217f267
fixes
2010-01-05 20:51:58 +00:00
242bf47143
some rearrangement of the shm server part, preparing for the windows port
2010-01-04 05:20:28 +00:00
91f64ac8ba
iteration for huge reads and writes, async suspend call for polling
2010-01-02 02:25:21 +00:00
a597c69915
make SHM header fixed-size
2010-01-01 23:21:55 +00:00
84c68fb31c
fix attach/detach
2010-01-01 22:19:09 +00:00
037d1369cb
syntax fixes, some things were out of sync
2010-01-01 02:30:35 +00:00
c7c446a33a
merged previous patch from belal (things intended for Dwarf Therapist)
2010-01-01 02:14:41 +00:00
117fcce0d9
merged item patch from belal
2010-01-01 01:49:32 +00:00
aef02eddce
use of memory barriers in the shm server and client code
2009-12-27 03:51:54 +00:00
b0d65de269
making stuff a bit more readable
2009-12-25 16:55:10 +00:00
de7c2185eb
shared memory manipulation is now entirely contained in the SHMProcess class
2009-12-25 02:49:35 +00:00
efce0ab21b
merge in shm branch
2009-12-22 21:19:39 +00:00
4582e0548b
I fail at merging patches ... there's no helping me
2009-12-19 01:10:05 +00:00
3888d0fc06
fixed tons of warnings, removed dependency on xtest
2009-12-13 21:03:19 +00:00
e5fa10c268
windows build fix and other small things, Windows 2000 support broken
2009-12-13 19:46:40 +00:00
1d25a995b8
comments, leftovers, fixed repeated character input on linux
2009-12-13 04:43:06 +00:00
cb4197f4fc
foo
2009-12-13 04:14:44 +00:00
9ea2876203
cleanup in windows version of DFKeys
2009-12-13 04:08:42 +00:00
b132228f22
use of synthetic key events on linux
2009-12-13 03:44:29 +00:00
2adfe39f9f
give DF a small breathing room for processing X events
2009-12-13 01:39:58 +00:00
bb2a455dbb
eliminated ugly switch statement from linux DFkeys
2009-12-13 01:24:09 +00:00
63dedc5da3
move t_special to a new file
2009-12-13 00:56:11 +00:00
069597f10c
more cleanup
2009-12-13 00:47:58 +00:00
58986ef838
cleanup #2
2009-12-13 00:20:25 +00:00
1ea77b477e
cleanup #1
2009-12-12 23:56:28 +00:00
337d42e15a
merged input injection patch by belal
2009-12-12 19:52:30 +00:00
9c54031180
reserve space for biome vectors, tiny fix to tiletype table
2009-11-25 18:19:09 +00:00
5c93d339db
got rid of many temporary objects in string reading
2009-11-24 10:34:42 +00:00
6cb7c4a636
optimizations
2009-11-22 14:43:53 +00:00
99f6e0860f
fix memleak in creature reading
2009-11-21 10:55:00 +00:00
989fa8f887
ForceResume call
2009-11-19 01:48:18 +00:00
67adb64a46
fix missing return, tweaked attachtest to show suspend/resume speed in a sensible manner
2009-11-19 00:36:03 +00:00
141f056350
purged some compiler-specific code
2009-11-18 22:56:11 +00:00
a6ffb58fdb
optimized map initialization, more sanity checks
2009-11-18 21:27:13 +00:00
dea1ce858b
merged window dimension and item matgloss patches from belal
2009-11-18 03:35:43 +00:00
29c0932ff7
split out memory.xml reading functionality out of the processenumerator
2009-11-18 02:33:17 +00:00
30d80debfb
removed obsolete header files
2009-11-17 16:07:57 +00:00
d4aad2387e
fixed wine process find codepath, added some suspend and resume calls to the tools, some data consistency tweaks
2009-11-17 15:37:08 +00:00
2f710730ac
merged item support by belal
2009-11-17 14:52:47 +00:00
6975661733
massive refactors of process, processmanager is now processenumerator, better split between windows and linux code, finalized suspend/resume
2009-11-17 03:19:13 +00:00
5be36e0f42
load dfvector whole instead of on-demand
2009-11-16 20:00:14 +00:00
47b61a907d
suspend and continue calls, a method for reading creatures within a volume
2009-11-16 16:47:22 +00:00
b8c9a36897
cursor/window offsets for all versions, finished incremental search tool
2009-11-15 20:41:10 +00:00
7e3af38941
add support for enumerating process memory ranges. full of fail on windows.
2009-11-15 04:25:00 +00:00
37d08a05ca
creatures almost done
2009-11-14 03:46:56 +00:00
e88e9b2951
more creature rework, now with none of the strings
2009-11-13 14:28:42 +00:00
7489fe51ab
fix for the ambiguous abs() call, slowly reworking creatures
2009-11-13 13:35:44 +00:00
7ce31ae483
shallow copy fix from belal
2009-11-12 17:50:50 +00:00
370655a516
move creature getters to the public API
2009-11-12 01:53:49 +00:00
30d8a015fd
cursor and window coords reading and writing (only for 40d16 on windows right now)
2009-11-12 01:39:43 +00:00
e8e3f9e794
view and cursor coords for 40d16 on windows
2009-11-12 01:05:07 +00:00
4f279680b5
using D pointer, a proper interface
2009-11-11 03:37:28 +00:00
88771ab973
merged another big creature patch from belal, moved C API to unmaintained, starting a big cleanup of the new code
2009-11-09 23:18:20 +00:00
8185f72b63
fixes
2009-11-08 12:51:54 +00:00
215bb64a1e
tons of stuff
2009-11-07 23:35:38 +00:00
a7bf3595b7
merged a big patch from belal, unstable on anything but windows 40d16
2009-11-07 21:05:10 +00:00
41475d1918
manual merge of patch from http://www.bay12games.com/forum/index.php?topic=41916.msg850579#msg850579
2009-11-06 01:04:17 +00:00
d3b62a7672
research into buildings, building hexdump tool
2009-11-04 01:01:55 +00:00
45695d7a69
metals and plants were swapped
2009-11-02 12:53:39 +00:00
45a4d4d799
voodoo
2009-11-01 10:57:31 +00:00
02a12782a7
voodoo
2009-11-01 10:56:23 +00:00
482e8b4447
voodoo
2009-11-01 10:20:13 +00:00
8a45c15af9
voodoo
2009-11-01 10:09:19 +00:00
9dfe3e2096
voodoo
2009-11-01 09:58:49 +00:00
2bee198946
more voodoo
2009-11-01 09:32:47 +00:00
0853ce83ff
update
2009-10-31 18:18:59 +00:00
78ec035f02
completely different approach to attach/detach on linux
2009-10-31 18:09:13 +00:00
a538417604
doh
2009-10-30 07:54:43 +00:00
759783e501
linux install target for dfhack, ability to set data path
2009-10-30 00:56:40 +00:00
851e105556
fixes to writing to memory on linux
2009-10-29 19:22:12 +00:00
f79076054d
more checks
2009-10-29 18:16:51 +00:00
6d4763db22
some perror calls ...
2009-10-29 17:54:02 +00:00
63582a7a70
even more printf debugging :P
2009-10-29 17:52:40 +00:00
9db0d5490a
more error checking around opening /proc/pid/mem
2009-10-29 17:40:39 +00:00
42e0d2a1d5
more output
2009-10-29 15:37:06 +00:00
33f8b627d0
attachtest utility to test 1000x attach/detach combos in a cycle
2009-10-29 15:23:01 +00:00
1110786d4c
error checking for attach
2009-10-29 14:39:40 +00:00
d84ed97d5a
creature flags from Toady
2009-10-29 14:06:05 +00:00
7e8fecccec
retry on memory reading error
2009-10-29 00:45:23 +00:00
42e5cdc361
preparing for debugging
2009-10-28 22:40:21 +00:00
adb33b88f9
fixed swapped metal and plant matgloss, got rid of deprecated old stuff
2009-10-28 15:40:10 +00:00
b7780e2dc6
fix tiny memleaks from DF vectors
2009-10-28 02:18:53 +00:00
db2e98a404
including headers in cmakelists - great idea suggested by Nexii Malthus
2009-10-26 21:50:08 +00:00
1ec85dd611
voodoo programming
2009-10-26 03:14:34 +00:00
2c5c1f3a32
hidden ambusher bit - maybe
2009-10-26 03:06:11 +00:00
6fb365b558
creature flags, lots of unknown ones
2009-10-24 02:32:57 +00:00
1d704c646b
missing newline caused warnings
2009-10-23 19:53:34 +00:00
3246b33a31
always force consistency
2009-10-23 18:07:38 +00:00
a09f45df71
resolved some problems
2009-10-23 18:05:42 +00:00
f5acba111e
flags for creatures. no idea what they mean
2009-10-23 16:50:36 +00:00
1ac83c8a0f
fix mingw build
2009-10-23 14:21:56 +00:00
e637488cbd
update to the C API
2009-10-23 14:00:15 +00:00
dab8d37c03
creature dump test, valid offsets for linux d9 and d11
2009-10-23 10:54:24 +00:00
876dcbf7cc
base support for creatures
2009-10-23 01:39:19 +00:00
f05f0b16b2
fixed MSVC build, added build instructions for it, internal stdint.h implementation for MSVC
2009-10-22 02:14:16 +00:00
b5137240dc
merged C API patch from Jifodus
2009-10-22 00:18:49 +00:00
80240a8719
tweak to not upset KDevelop semantic analysis
2009-10-04 22:32:31 +00:00
8e72f2af0e
Visual Studio compatibility patch from jifodus
2009-10-04 13:08:20 +00:00
e85df7cfc0
fix tile type badness
2009-09-21 21:41:19 +00:00
921802ce00
sync
2009-09-18 11:31:56 +00:00
28fb6f5703
sync, rearranging things in khazad
2009-09-15 20:46:45 +00:00
ea2dca0e28
revert process debug call, it's slow and dangerous
2009-09-14 20:47:20 +00:00
c5144b5fde
sync
2009-09-14 20:02:16 +00:00
fac88478bd
code moved from khazad
2009-09-14 00:02:46 +00:00
Petr Mrázek
belal
doomchild
belal
thewonderidiot
Mikko Juola
simon
Simon Jackson
doomchild
unknown
Zhentar
mizipzor