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
Zhentar
belal
mizipzor