Commit Graph

801 Commits (7f6fa2a0089b772671f73b22eb07525a9e60a6d5)

Author SHA1 Message Date
doomchild 1de2efb162 updated documentation 2011-03-09 14:25:32 -06:00
doomchild 828df5fa80 consolidated buffer stuff, so that the callbacks are a lot shorter 2011-03-09 14:20:34 -06:00
doomchild 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
doomchild 50af9e2d7e updated to use the pointer caching callbacks 2011-03-09 12:27:58 -06:00
doomchild 5bd51c2e08 updated to use the allocator callbacks correctly 2011-03-09 12:26:04 -06:00
doomchild 44cbc3fd5c fixed allocator callbacks to take pointers to pointers so they'll actually, you know, WORK 2011-03-09 12:23:20 -06:00
doomchild 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
mikestewart 5c32991c40 Corrected game mode enum and added a mode changing tool to the playground. 2011-03-07 00:19:12 -05:00
Petr Mrázek bbbea3d023 Merge branch 'master' of https://github.com/doomchild/dfhack 2011-03-06 23:57:22 +01:00
Petr Mrázek 9e62ee6e75 Maps + Materials for 31.20. Still many broken offsets! 2011-03-06 20:27:40 +01:00
Petr Mrázek 9b0c426f9c The age of creatures is signed int. 2011-03-06 11:42:02 +01:00
Petr Mrázek 450562437a Memory.xml cleanup, removing redundant information. 2011-03-03 23:54:44 +01:00
doomchild c98bc9da9d updated to actually match the C stuff (not passing allocator callbacks every time, etc) 2011-03-03 14:19:20 -06:00
doomchild d314c733b2 added world and window_io getters 2011-03-03 14:18:28 -06:00
doomchild a816b67362 added key types for window_io module 2011-03-03 14:17:56 -06:00
doomchild 6fc1f31e31 first commit 2011-03-03 14:17:31 -06:00
doomchild 2c9016d2f2 added checks for allocator callback being null 2011-03-03 14:17:09 -06:00
doomchild 4cf037d5d3 changed a couple of argument types to be more explicit 2011-03-03 14:15:38 -06:00
doomchild 368f3c1b2e added World getter renamed get_Window to get_WindowIO 2011-03-03 14:14:59 -06:00
Petr Mrázek f307d2c4c3 Merge https://github.com/doomchild/dfhack 2011-03-03 17:51:27 +01:00
Petr Mrázek 6f7a8e3af5 Export fail removal - sa_feature, other minor changes 2011-03-03 17:50:17 +01:00
doomchild f4be3ef4fe updated to use t_gamemodes struct in Read/WriteGameMode calls 2011-03-03 10:18:27 -06:00
Petr Mrázek 680fe2981e Merge branch 'master' of https://github.com/tomprince/dfhack 2011-03-03 16:56:38 +01:00
Petr Mrázek 552180d430 Merge branch 'master' of https://github.com/doomchild/dfhack 2011-03-03 16:24:26 +01:00
Petr Mrázek faea954da1 Now with less endless loops. 2011-03-02 22:43:46 +01:00
Petr Mrázek 777e997da2 Make vein reading a little saner. 2011-03-02 22:36:02 +01:00
Petr Mrázek 3ff4e2c43e Get rid of 'unknown vein' spam. 2011-03-02 22:32:08 +01:00
Petr Mrázek a969f9893f Fix wine process suspend/resume. They use same mechanism as attach/detach now. 2011-03-02 22:23:24 +01:00
Petr Mrázek 509971d6b1 Small fix of the GameMode enum 2011-03-02 09:07:37 +01:00
Tom Prince 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
Tom Prince 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
Tom Prince f477fc002c Fix lots of -Wall warnings.
Signed-off-by: Tom Prince <tom.prince@ualberta.net>
2011-03-01 17:19:18 -05:00
Petr Mrázek 267bc1d446 Game/Control mode improvements. Use dfposition to check them. 2011-03-01 22:18:26 +01:00
doomchild f56cad1265 added grass vein and world construction readers 2011-03-01 14:39:56 -06:00
doomchild 42670c798b added grass vein and world construction types 2011-03-01 14:39:33 -06:00
doomchild 06ae98c9dd first commit 2011-03-01 14:39:18 -06:00
doomchild 0b77744905 added game mode reader 2011-03-01 14:38:55 -06:00
doomchild bdb0ebd8ea added grass vein and world construction readers 2011-03-01 14:38:18 -06:00
Petr Mrázek fa220531b7 Proper enum for game mode 2011-03-01 13:08:20 +01:00
Petr Mrázek 54a580ac68 Hide depend headers better, upgraded tinyxml 2011-03-01 07:50:56 +01:00
Petr Mrázek b1061d0f94 Game mode reading, removed some include paths 2011-03-01 06:59:23 +01:00
Petr Mrázek c6a402c2b8 One more vein type. No ready for use. 2011-02-27 20:43:44 +01:00
Petr Mrázek 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
Petr Mrázek 4284b948a0 Creature matgloss, creature and color matgloss offsets. 2011-02-27 09:48:08 +01:00
Petr Mrázek d6592502cc No need to start Buildings for reading the custom types 2011-02-25 03:13:50 +01:00
Petr Mrázek 803269122f ... What The Hell ? 2011-02-24 21:34:51 +01:00
Petr Mrázek 820acc7483 Windows fixes 2011-02-24 21:32:12 +01:00
Petr Mrázek 97bfa32a82 More cleanup in the Process lands. 2011-02-24 11:43:33 +01:00
Petr Mrázek 79b78673e5 Fix build on MSVC 2011-02-24 01:32:15 +01:00
Petr Mrázek d26f9ee4a4 Merge branch 'master' of https://github.com/tomprince/dfhack into tomprince-master 2011-02-23 23:48:24 +01:00
Petr Mrázek 62bec260b1 Fix 32bit linux build again. 2011-02-23 21:57:36 +01:00
Petr Mrázek 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
Tom Prince 4806318494 Factor out microsoft string handling functions. 2011-02-23 15:55:07 -05:00
Tom Prince aac3056b12 Get rid of NormalProcess::Private on windows. 2011-02-23 15:27:15 -05:00
Petr Mrázek a5479a4bef Linux 32bit fix. 2011-02-23 20:13:29 +01:00
Tom Prince 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
Tom Prince 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
Tom Prince b3c490857c Refactor DFProcess-linux-{,wine}.cpp into DFProcess-linux-base.cpp. 2011-02-23 06:11:28 -05:00
Tom Prince c287e54793 Merge much of DFProcess-*-SHM.cpp into DFProcess-SHM.cpp. 2011-02-23 04:02:14 -05:00
Tom Prince 9ba80d517f Remove some gratuitous differences in the SHM implementations. 2011-02-23 02:26:55 -05:00
Tom Prince 9b854be327 Remove duplicate code implementing readInt.
Implement one version in terms of the other.
2011-02-23 02:04:29 -05:00
Tom Prince 9964dbac72 Add missing private/ProcessInternal.h 2011-02-23 01:07:22 -05:00
Tom Prince 6ca0dd7c1d Fix Process class. 2011-02-23 04:01:07 +01:00
Petr Mrázek 9f5ee8a790 Many fixes, still many to go. 2011-02-18 02:51:17 +01:00
Petr Mrázek 1c8249c55a Mingw32 fixes 2011-02-18 01:14:16 +01:00
Petr Mrázek 02e6e46d5f Grass veins 2011-02-17 01:54:45 +01:00
Petr Mrázek 72fd88cff3 Windows base map offsets 2011-02-17 01:18:27 +01:00
Petr Mrázek eb1a0b6b22 A little cleanup in Context.cpp, started work on 31.19 2011-02-16 19:29:16 +01:00
Petr Mrázek ad5e207276 make veinlook work with less offsets (maybe) 2011-02-15 00:45:37 +01:00
Petr Mrázek 6c9652258d memory xml bugfix related to valid attribute of the Offsets tag 2011-02-14 21:25:02 +01:00
Petr Mrázek 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
Petr Mrázek 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
Petr Mrázek d16bee48d2 Merge branch 'master' of github.com:peterix/dfhack 2011-02-08 22:57:14 +01:00
Petr Mrázek 5bed6c5949 Sync, autosearch skeleton. 2011-02-08 22:55:40 +01:00
Petr Mrázek 7676120dc8 Windows VM ranges (not tested) 2011-02-08 15:34:34 +01:00
Petr Mrázek 130d965494 TODO use VirtualQuery 2011-02-08 14:34:43 +01:00
Petr Mrázek 8439b3fa7d Required fixes for properly exporting the new symbols. 2010-11-19 02:40:38 +01:00
Petr Mrázek c13b7c035f Fix weather tool/offsets for 31.18. Added a file I missed. 2010-11-19 01:14:41 +01:00
Petr Mrázek ac91f46b6c Merged patches from Rainer Keller 2010-11-17 20:50:50 +01:00
Petr Mrázek 1a93c73737 Big chunk of windows 31.18 offsets. 2010-11-17 04:48:06 +01:00
Petr Mrázek a5d21e612b Fixes, some messing around with the invalidation code 2010-11-08 00:31:40 +01:00
Petr Mrázek 9ac7c1a9f2 memory.xml invalidation (untested) 2010-11-08 00:10:59 +01:00
Petr Mrázek 457b331be7 Small fixes 2010-11-03 10:45:29 +01:00
Petr Mrázek cb6cf89b0c Merge branch 'master' of http://github.com/reverb/dfhack 2010-11-01 10:47:15 +01:00
Petr Mrázek ab1a3a8cef Salt/Stagnant water finally understood. 2010-10-29 07:36:06 +02:00
reverb 4edd33e13a Fix crash when deallocating items module 2010-10-28 17:22:56 -05:00
reverb 5e507163b8 Material fix, custom reaction items seem to work again with offset update and bars work 2010-10-27 22:30:58 -05:00
reverb 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
reverb 48dd2fc424 Merge remote branch 'upstream/master' 2010-10-25 16:12:27 -05:00
Petr Mrázek 70cb93d9f4 Fixed includes, unified formatting. 2010-10-25 04:39:14 +02:00
zilpin 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
unknown 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
zilpin 3acc410857 Tile Types update, and new hellhole n deramp tools in playground 2010-10-17 00:21:18 -04:00
Petr Mrázek b3121b898d Urrgh. Seriously. 2010-10-07 01:23:35 +02:00
Petr Mrázek ec032240aa Merge branch 'master' of http://github.com/belal/dfhack 2010-09-24 19:07:38 +02:00
Petr Mrázek b95ec7a2b3 Merge branch 'master' of http://github.com/doomchild/dfhack 2010-09-24 19:07:07 +02:00
belal 583f997e2f fix linux getPaths to append a null terminator on the strings 2010-09-23 08:33:45 -04:00
Petr Mrázek a8ae899f2e Add checks to handle missing custom workshop offsets. 2010-09-22 18:34:51 +02:00
Petr Mrázek a3870bb5a1 Constructions, buildings, base 31.13 windows entry on DF2010 instead of 31.12. 2010-09-22 18:20:55 +02:00
belal 026a2eb94e Merge branch 'master' of git://github.com/peterix/dfhack into belal 2010-09-22 10:42:22 -04:00
Petr Mrázek 369b7cf701 Fix MSVC10 build error. 2010-09-21 03:18:34 +02:00
doomchild 8ac0b653df Merge remote branch 'upstream/master' 2010-09-20 12:40:44 -05:00
doomchild 1a5bce53a7 added ReadGeology 2010-09-20 12:40:00 -05:00
belal 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
Petr Mrázek 88934f0add Materials done 2010-09-19 06:17:48 +02:00
Petr Mrázek dfdd1467ff Offset stuff 2010-09-18 04:36:14 +02:00
belal 918de0271b fix to get the windowIO.h to compile from a submodule 2010-09-17 09:20:15 -04:00
belal 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
belal 6661d7e1f7 added getPath() for all linux versions as well, should work fine 2010-09-16 18:21:41 -07:00
doomchild 9844a8f8b3 added SetPauseState wrapper 2010-09-16 13:10:13 -05:00
doomchild 70b1a48cea added unregistration functions for callbacks 2010-09-16 13:05:02 -05:00
doomchild 78a12876d5 added ReadInventoryIdx and ReadInventoryPtr wrappers 2010-09-16 13:04:19 -05:00
doomchild 36400f2833 Merge branch 'dotnet' 2010-09-16 09:06:12 -05:00
Petr Mrázek 3592748a50 Bits and pieces 2010-09-16 15:09:42 +02:00
belal 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
belal 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
Petr Mrázek f6b137230a Fixed pause state offset in 31.12 linux version, dfreveal pauses and has improved usability. 2010-09-04 07:43:39 +02:00
doomchild 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
Petr Mrázek 5a5745590a More Creatures rework, this time with more memset 2010-09-03 03:01:37 +02:00
Petr Mrázek dc6aa19083 Creature rework 2010-09-03 02:15:09 +02:00
Petr Mrázek a46422d2a6 Merge branch 'master' of http://github.com/doomchild/dfhack 2010-09-01 20:30:25 +02:00
Petr Mrázek f1307d9f13 Added a common exception for DFHack, made World and Position use it for feature detection. 2010-09-01 18:03:52 +02:00
thewonderidiot 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
Petr Mrázek 86aa19daa4 Fix for Creature module 2010-08-31 17:21:47 +02:00
Petr Mrázek 66c3d30bd8 Fix Gui module so Stonesense can work. 2010-08-31 12:59:48 +02:00
Petr Mrázek ff550a7e09 Fix getPE() 2010-08-31 07:07:37 +02:00
Petr Mrázek b9bee108e1 Sync, fixes. 2010-08-31 06:52:03 +02:00
Petr Mrázek 9bcdc78d00 name of GUI offset group was wrong in its module 2010-08-31 05:32:40 +02:00
doomchild 95166d39a2 changed uint to uint32_t in declaration of VersionInfo::getPE() 2010-08-30 12:37:13 -05:00
doomchild c5c1d52047 fixed spelling of BUILD_DFHACK_C_BINDINGS 2010-08-30 12:36:40 -05:00
Petr Mrázek 95abf6e605 All the modules *should* now use the new offset storage properly. Maybe, needs testing :) 2010-08-30 00:08:17 +02:00
Petr Mrázek 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
Petr Mrázek 85240c78b5 Fix probe utility, Position module 2010-08-28 22:07:31 +02:00
Petr Mrázek d46dcb8342 Maps stuff, geology seems broken 2010-08-28 15:43:53 +02:00
Petr Mrázek 51d545402d Offset dumper reports missing offsets instead of skipping them 2010-08-28 14:06:18 +02:00
Petr Mrázek b44fd18dc8 Merge branch 'master' of http://github.com/belal/dfhack 2010-08-28 13:52:12 +02:00
Petr Mrázek 2703d74fbd Sane output from offset dumper 2010-08-28 12:47:33 +02:00
Petr Mrázek 4d55e37e20 Merge branch 'master' of http://github.com/doomchild/dfhack 2010-08-28 06:36:40 +02:00
Petr Mrázek 84b417cf1a Memory-ng.xml should be consistent now. Offset dumper doesn't complain. 2010-08-28 06:31:44 +02:00
Petr Mrázek 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
Petr Mrázek 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
belal 2df6433fef Fix map reading for dfcopypaste, add simple console application to do the copy/pasting. 2010-08-27 14:56:38 -04:00
Mikko Juola 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
Mikko Juola 4197ad064f Add a dirty hack to stop flickering on non-synchronizing DF processes. 2010-08-27 18:34:12 +03:00
Mikko Juola 35a58cdf0c Add screen_tiles_pointer for Memory.xml and fix reading screen tiles in Position module. 2010-08-27 18:34:12 +03:00
doomchild 60bfc1d420 added the new callbacks to the list 2010-08-27 09:31:08 -05:00
doomchild c7f37b697c added include for Position.h 2010-08-27 09:30:15 -05:00
doomchild 33cd5fb1b4 added ReadHotkeys and getScreenTiles 2010-08-27 09:29:55 -05:00
doomchild fb7cfc45c8 added getType 2010-08-27 09:19:43 -05:00
doomchild cfa39dde7f wrapped ReadGlobalFeatures 2010-08-26 10:29:04 -05:00
doomchild b78b0ad2e6 wrapped ReadMenuState 2010-08-26 10:28:31 -05:00
doomchild fba11842bc add allocator callbacks for t_feature, t_hotkey, and t_screen 2010-08-26 10:27:56 -05:00
doomchild 1327b7236b changed extension to "rst" 2010-08-25 09:20:00 -05:00
Petr Mrázek b33d56354f OffsetGroup class (unfinished) 2010-08-23 19:28:53 +02:00
Petr Mrázek 143f30f64b Merge branch 'master' of http://github.com/sizeak/dfhack
Conflicts:
	library/VersionInfo.cpp
2010-08-23 16:16:58 +02:00
Petr Mrázek 0ddc431013 Merge branch 'master' of http://github.com/doomchild/dfhack 2010-08-23 16:11:46 +02:00
Petr Mrázek 368de864a1 Sync 2010-08-23 01:29:55 +02:00
Petr Mrázek 1bceac2343 Rename memory_info and its factory class. 2010-08-20 14:10:05 +02:00
doomchild 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
doomchild 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
doomchild 464919635f fixed bug where reading en empty job list played with a null pointer 2010-08-19 12:45:43 -05:00
doomchild fd872922a5 updated to match C++ additions 2010-08-18 16:00:58 -05:00
doomchild f2696dadca added updated Write functions 2010-08-18 15:46:15 -05:00
doomchild 2889b01357 updated to use pre-registered callbacks like everything else 2010-08-18 12:59:11 -05:00
simon 9cf2e0f26d Support for reading inventory 2010-08-17 15:21:54 +02:00
doomchild 34b6bc06b6 started in on added docs 2010-08-16 14:52:00 -05:00
doomchild e84ea20fb0 minor cleanup 2010-08-16 14:19:26 -05:00
doomchild d96578a3b4 added missing #include for DFTileTypes.h 2010-08-16 13:50:34 -05:00
doomchild e57be44cde Merge remote branch 'upstream/master' 2010-08-16 13:41:33 -05:00
Petr Mrázek 3b29fddf7b unify build system, start on the new offset file format 2010-08-16 00:45:02 +02:00
Petr Mrázek 94872b8abd A bit of checking in some places. 2010-08-14 18:32:38 +02:00
Petr Mrázek a159707250 Fix memleak with Context not cleaning up. 2010-08-14 01:25:18 +02:00
Petr Mrázek 7fbdd6c69a Cleartask tool, updated docs. 2010-08-13 23:25:14 +02:00
Petr Mrázek bae7b88be0 Make sure the compatible memory.xml is used. 2010-08-13 21:44:17 +02:00
doomchild 78c5ef5c71 added vein readers 2010-08-13 12:31:53 -05:00
doomchild a94c398a0e added vein allocators 2010-08-13 12:31:31 -05:00
doomchild 2a34b9fd79 first commit 2010-08-13 12:30:58 -05:00
doomchild b26506195e Merge remote branch 'upstream/master' 2010-08-13 09:40:45 -05:00
doomchild f6a777bccd added getter for tile type 2010-08-13 09:40:32 -05:00
doomchild cf8c805add just made the tile type array length a #define 2010-08-13 09:39:37 -05:00
Petr Mrázek 8fa3d0811c Make building C bindings optional. 2010-08-13 02:35:10 +02:00
Petr Mrázek 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
Petr Mrázek f6aea927c8 Memory.xml in new format (offsetedit/Memory-ng.xml). The declarations/descriptions are still missing. 2010-08-12 21:38:15 +02:00
Simon Jackson 1e9c4a0450 Added function to get const reference to stored map of labours. Nothing special 2010-08-10 22:28:53 +01:00
sizeak 7d684d12b4 Job writing for mood material editing 2010-08-09 19:28:35 +01:00
Petr Mrázek 3afff27f03 A bit of offset work on linux, uprated README and COMPILE, screen reading code (untested). 2010-07-19 21:42:17 +02:00
Petr Mrázek 0cb5e99a44 Fix for SHM on windows 2010-07-17 20:13:44 +02:00
Petr Mrázek 52178e779f Fixes to merged C API and windows SHM. 2010-07-17 01:55:18 +02:00
Simon Jackson 9bafefbd80 Merge branch 'master' of git://github.com/peterix/dfhack 2010-07-15 12:58:25 +01:00
Simon Jackson 1e7a705129 getType needs lots of work but its ok(ish). Mostly working .10 creature offsets 2010-07-15 12:57:45 +01:00
Petr Mrázek ebbb497630 Merge branch 'master' of http://github.com/doomchild/dfhack 2010-07-15 00:47:51 +02:00
Petr Mrázek 46d776cf46 doxygen index page, OnResume all modules from Context::Resume 2010-07-07 01:35:38 +02:00
doomchild a8b5c461fe added terrain checkers 2010-07-06 14:07:39 -05:00
doomchild 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
doomchild 9ef7a74a44 added MapPoint class 2010-07-06 13:19:55 -05:00
doomchild 3abdd0f2f2 added vein reading functions 2010-07-06 13:18:36 -05:00
doomchild c77a049d8b Merge remote branch 'upstream/master' 2010-07-06 10:57:24 -05:00
Petr Mrázek ec35663b62 Common base for all modules 2010-06-25 07:11:26 +02:00
Simon Jackson 4f009a5c5c Civilisation writing 2010-06-23 03:32:33 +01:00
Simon Jackson e1e1850d8e Position writing 2010-06-22 18:27:27 +01:00
Simon Jackson 3f0ab50b5d mood skill writing 2010-06-22 17:21:09 +01:00
Petr Mrázek 8d07001674 0.31.08 Windows SDL 2010-06-20 19:20:10 +02:00
Petr Mrázek 31167475de Tool for dumping the effective addresses/offsets of a running DF instance 2010-06-20 02:50:37 +02:00
Simon Jackson 95b52d099f flag writing type fix 2010-06-19 20:09:16 +01:00
Petr Mrázek bbb29fe3d5 Find, Filter, FindInRange and Incremental search methods 2010-06-19 03:47:09 +02:00
doomchild 0b9605e08a changed def to class (durrrr) 2010-06-18 10:39:40 -05:00
Simon Jackson 0735c8b84a Merge branch 'master' of git://github.com/peterix/dfhack 2010-06-18 01:18:00 +01:00
Simon Jackson 5fd94efb10 Added moods to memory.xml 2010-06-18 01:17:19 +01:00
Petr Mrázek 41f3432d1c whitespace 2010-06-18 01:17:46 +02:00
Petr Mrázek d3e7701bc8 Fix template brackets 2010-06-18 01:10:03 +02:00
Petr Mrázek 760cb59522 Merge branch 'master' of http://github.com/sizeak/dfhack 2010-06-18 01:08:23 +02:00
Petr Mrázek ecb83f2288 Merge branch 'master' of http://github.com/doomchild/dfhack 2010-06-18 01:08:07 +02:00
Simon Jackson 96c774629a Added mood writing. Mood only, not skill or anything. Seems to work ok 2010-06-17 23:18:01 +01:00
doomchild 5b71ac7dae add __init__ file
renamed flags and types
2010-06-17 16:26:53 -05:00
doomchild fa8238af08 removed reveal and force_suspend to examples 2010-06-17 15:38:48 -05:00
doomchild d58260740f moved the old Python/C stuff to python/deprecated
renamed "c api" to "pydfhack"
2010-06-17 15:32:53 -05:00
Simon Jackson 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
Simon Jackson 39222c972a Merge branch 'master' of git://github.com/peterix/dfhack 2010-06-17 14:16:37 +01:00
Petr Mrázek c53b643886 Fix liquids bug, added status checks to Maps (still not the real thing, but better) 2010-06-17 06:46:20 +02:00
Simon Jackson 9a15f00c8d bug fix, sex writing (seems to work ok), trait writing(untested) 2010-06-16 20:47:05 +01:00
Petr Mrázek 5e105c9571 fix typo 2010-06-16 02:03:37 +02:00
Simon Jackson ba9d2d14c2 Magic number cleaning 2010-06-16 08:01:17 +08:00
Simon Jackson 77d2343742 Attribute writing added 2010-06-16 07:22:39 +08:00
Simon Jackson 8fb05f24db Skill writing added 2010-06-16 07:22:38 +08:00
Simon Jackson 2254f3dfe5 Flag writing function added 2010-06-16 07:22:38 +08:00
Simon Jackson b95efc22fe Happiness writing function added and tested. Seems ok so far 2010-06-16 07:22:38 +08:00
Petr Mrázek b732e63673 long long 2010-06-11 20:13:37 +02:00
Petr Mrázek 3f099f8928 LARGE_INTEGER replacement 2010-06-11 19:53:28 +02:00
Simon Jackson 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
Simon Jackson 3142e75186 Merge branch 'master' of git://github.com/peterix/dfhack 2010-06-10 17:42:38 +01:00
Simon Jackson 8987111cfe Stupid mistake was stupid 2010-06-10 17:31:09 +01:00
Simon Jackson 45031a3724 Added levels done (unless issues) 2010-06-10 16:53:25 +01:00
Petr Mrázek 7885eb8e74 0.31.06-SDL, needs testing 2010-06-10 10:30:56 +02:00
Petr Mrázek 1645df7088 Some offsets for 0.31.04, bugfixes 2010-06-06 00:56:09 +02:00
Petr Mrázek 6b7f3e1816 Big namespace cleaning 2010-06-05 00:02:02 +02:00
Petr Mrázek 115e969530 Build fixes, made precompiled SHM libs 2010-06-04 03:05:38 +02:00
Petr Mrázek b8600169ef Minor comments and other changes 2010-06-01 21:06:16 +02:00
Petr Mrázek 123fb5a9d0 Lots of comments. Using templates in the search tool. 2010-05-30 05:13:59 +02:00
Petr Mrázek 5ee4acfd2e Fixed build problem in C API. Beware of bad memory management! 2010-05-29 23:50:14 +02:00
Petr Mrázek fa0d881e16 Merge branch 'master' of http://github.com/doomchild/dfhack 2010-05-29 23:39:59 +02:00
Petr Mrázek 95b44a8ef3 Documented ContextManager 2010-05-29 22:46:23 +02:00
Petr Mrázek 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
Petr Mrázek ab40868b29 ProcessEnumerator tracks processes properly now. 2010-05-28 05:18:32 +02:00
doomchild 66159d4221 updated to use new callback signatures 2010-05-27 12:35:40 -05:00
doomchild 3caac25145 changed callback signatures to allow for return codes 2010-05-27 12:35:11 -05:00
doomchild 6e91b7c9de updated to include WindowIO_C and World_C 2010-05-26 14:51:39 -05:00
doomchild a962299c20 cleaned up header includes 2010-05-26 14:51:21 -05:00
Petr Mrázek bd4456b5f6 Fix bad SHM reads of ranges above 1MB. 2010-05-26 18:05:12 +02:00
Petr Mrázek af1a41712e Tiny fixes. 2010-05-26 17:54:30 +02:00
Petr Mrázek ee8ac4e508 Missed an include ~_~ 2010-05-26 15:15:14 +02:00
Petr Mrázek 04b71f154c Fun and games. Also turning old DFWindow class into a module tracked by Context. 2010-05-26 12:24:45 +02:00
Petr Mrázek 966a145b3e Moving stuff around, part 3 2010-05-26 08:42:09 +02:00
Petr Mrázek b710ed687a Moving stuff around, part 2 2010-05-26 06:48:23 +02:00
Petr Mrázek cd18db8ccd Reorganize pydfhack 2010-04-02 16:49:07 +02:00
Petr Mrázek d3f1f63d92 Merge branch 'pydfhack' of git://github.com/doomchild/dfhack into DF2010 2010-04-02 16:47:46 +02:00
Petr Mrázek c26da9b84c More DF 2010 reorganization 2010-04-02 16:46:33 +02:00
doomchild 49ecc368bf added getter for window size added ReadHotkeys 2010-04-01 17:01:46 -05:00
doomchild 3324327535 added getter for current cursor creature 2010-04-01 17:01:41 -05:00
doomchild 37cc11615c added setters for view/cursor coordinates 2010-04-01 17:01:34 -05:00
doomchild 07cb3b8ac2 Read*Matgloss calls now return a dictionary of tuples, keyed on the matgloss.id 2010-04-01 17:01:14 -05:00
doomchild 8308b73b6c disabled SWIG build step 2010-04-01 17:01:07 -05:00
doomchild 3be3174c33 added Read*Matgloss calls 2010-04-01 02:55:11 -05:00
doomchild 23460c94d8 added license message 2010-04-01 01:02:03 -05:00
doomchild e39330847b added license message 2010-04-01 01:01:47 -05:00
doomchild fda4482dc5 added license message
added MatGlossPlant struct
2010-04-01 01:01:16 -05:00
doomchild 5f09b47ca8 added license message 2010-04-01 01:00:51 -05:00
doomchild 6af1f482ca add matgloss.cpp 2010-03-31 19:02:08 -05:00
unknown 93058506e0 first commit Read/Write Designations works
Signed-off-by: doomchild <doomchild@theyfear.us>
2010-03-31 17:35:56 -05:00
Petr Mrázek 35960db5aa Fix for out-of-bounds access error with regionoffsets. Breaks compatibility. 2010-03-31 18:16:18 +02:00
Petr Mrázek eccdc6896e Fix argstream.h 2010-03-30 04:43:06 +02:00
Petr Mrázek 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
Petr Mrázek 85d347442d Accelerated reading of creatures 2010-03-28 17:22:15 +02:00
Petr Mrázek 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
Petr Mrázek 4d939363b5 Many fixes to DFHack tools and examples 2010-03-26 13:01:46 +01:00
Petr Mrázek 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
Petr Mrázek 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
Petr Mrázek dbeb342c6a Make the python wrapper compile again 2010-03-25 22:13:56 +01:00
Petr Mrázek 822265443c Make the API a bit saner about the used data types and structures 2010-03-25 21:37:09 +01:00
Petr Mrázek 13fcdb8b8f Fix one more InitReadNames call 2010-03-23 00:37:35 +01:00
Petr Mrázek efadfe98b2 Add some more exception handling to InitRead API methods 2010-03-23 00:35:23 +01:00
Zhentar 4287abbc94 Add pregnancy and blood stuff to the creature struct 2010-03-21 15:47:24 -05:00
Petr Mrázek 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
Petr Mrázek c283197b71 Flush input in veinlook, so it doesn't 'lag' so bad 2010-03-18 20:05:32 +01:00
Petr Mrázek 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
Petr Mrázek df4de4a333 Detach in API destructor 2010-03-16 22:12:05 +01:00
belal 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
Petr Mrázek e4dc165954 Merge branch 'shm-multi' 2010-03-14 23:17:54 +01:00
Petr Mrázek 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
belal 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
Petr Mrázek 310669737e Port multiple client SHM to Windows 2010-03-13 17:44:36 +01:00
belal 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
Petr Mrázek 834a64c282 Fix horrible race conditions in suspend and resume 2010-03-12 18:29:11 +01:00
belal 791ac8dd75 modify the renamer and creature dump to output the new current cursor creature code 2010-03-12 09:21:45 -05:00
Petr Mrázek 0dd14bb9c8 Cosmetic changes, really 2010-03-12 12:14:20 +01:00
Petr Mrázek 9d503515dd Another try at locking 2010-03-12 00:13:50 +01:00
belal 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
belal 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
Petr Mrázek 62ae8df573 per-process file locks on linux (stored in /tmp/DFHack/PID/)
minor signed/unsigned fix
2010-03-09 21:25:17 +01:00
Petr Mrázek 5c4ef73f4d Merge branch 'shm-only' 2010-03-09 15:31:44 +01:00
Petr Mrázek 7207996940 Prevent windows process enumerator from listing the same process twice 2010-03-09 15:21:53 +01:00
Petr Mrázek f0087926c5 Revert "Nuked many Process classes. Only SHM remains. We'll see how it goes :)"
This reverts commit b3424418e6.

Conflicts:

	library/DFProcess-linux-SHM.cpp
	library/DFProcess-windows-SHM.cpp
	library/DFProcess.h
	library/DFProcessEnumerator-linux.cpp
	library/DFProcessEnumerator-windows.cpp

Minor manual changes were required.
2010-03-09 15:15:15 +01:00
Petr Mrázek 3e581908c1 Each DF process on windows now has unique mutex and shm names. 2010-03-09 13:41:55 +01:00
Petr Mrázek 9d7574dafe DF disappeared exception 2010-03-09 03:30:22 +01:00
Petr Mrázek 1c499121e6 Fixes to memory.xml, name reading 2010-03-08 18:27:19 +01:00
Petr Mrázek b1a15b6fb3 Merge branch 'version_compatiblity' of git://github.com/belal/dfhack 2010-03-08 14:52:40 +01:00
Petr Mrázek e5c3ed9ad3 Fix python and a gcc syntax error 2010-03-08 14:50:32 +01:00
Petr Mrázek d2c84df4c8 Merge branch 'master' of git://github.com/Zhentar/dfhack into mergeb
Conflicts:
	library/DFHackAPI.cpp
2010-03-08 13:56:32 +01:00
Petr Mrázek 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
Zhentar 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
belal 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
Petr Mrázek 90baaad19b Allow recognizing multiple DF SHM processes by the client 2010-03-08 01:54:46 +01:00
Petr Mrázek 60a1da0923 d19_2 support, building vtables, some minor bugfixes
tested with stonesense
2010-03-06 21:21:01 +01:00
Petr Mrázek 96512a7e1d Linux d19 support 2010-03-05 22:19:27 +01:00
Petr Mrázek 958ca0e384 Some map module bits 2010-03-05 16:06:02 +01:00
Zhentar 65bf8f69fd Proper-fy name handling for creatures. For surnames and such, official DF logic is used. 2010-03-05 00:02:41 -06:00
Petr Mrázek 9aedc56186 A waitWhile method copy turned into wrapper 2010-03-05 02:45:53 +01:00
Petr Mrázek 8e8d320a0b Don't build SHM on 64bit, makes no sense
Added origin to mapblock40d
2010-03-05 01:26:39 +01:00
Petr Mrázek 798ce9fb0a CR-LF mess 2010-03-05 00:55:57 +01:00
Petr Mrázek c86464502c SHM rework, stage 2 2010-03-05 00:05:01 +01:00
Petr Mrázek 6e69dcdeed Use sched_yield depending on CPU affinity 2010-03-04 04:40:06 +01:00
Petr Mrázek 0192520d43 SHM rework, stage 1 2010-03-03 05:43:38 +01:00
Petr Mrázek b3424418e6 Nuked many Process classes. Only SHM remains. We'll see how it goes :) 2010-03-02 01:18:34 +01:00
Petr Mrázek 9f7609de65 GCC exception fix 2010-03-01 01:21:54 +01:00
Petr Mrázek 0a23757797 Merge branch 'errorhandling' of git://github.com/mizipzor/dfhack 2010-03-01 01:13:07 +01:00
mizipzor 160992ec9c added exceptions to meminfomanager 2010-02-28 21:44:14 +01:00
Petr Mrázek c4cb3afd0b Fix for Windows exceptions 2010-02-28 19:59:07 +01:00
Petr Mrázek fa878f2e9d Fix terrible Linux SHM performance on single-core 2010-02-28 18:08:44 +01:00
Petr Mrázek 05250b4eb5 Make Linux Process validation not fail with MissingMemoryDefinition 2010-02-28 06:21:50 +01:00
mizipzor c13e37adf6 Merge branch 'master' of git://github.com/peterix/dfhack into errorhandling 2010-02-28 05:52:48 +01:00
Petr Mrázek 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
Petr Mrázek 029f1a6cf8 Merge branch 'errorhandling' of git://github.com/mizipzor/dfhack 2010-02-28 04:26:10 +01:00
Petr Mrázek 7c73c7abe6 CMake swig integration 2010-02-28 04:11:06 +01:00
mizipzor b680af0b26 fixed setting of flags to false in two init functions 2010-02-28 03:45:38 +01:00
mizipzor 6be18fbf20 sprinkled some exceptions over the memory reading 2010-02-28 03:34:54 +01:00
mizipzor 2b1940430f added many MissingAddress exception throws 2010-02-28 02:53:47 +01:00
mizipzor f2dcbc6372 added exceptions to API::ReadGeology and API::InitReadBuildings 2010-02-28 02:50:16 +01:00
mizipzor 19cd686ac4 added exceptions to API::InitMap 2010-02-28 02:37:05 +01:00
mizipzor decb20ef67 Merge branch 'master' of git://github.com/peterix/dfhack into errorhandling 2010-02-28 02:29:29 +01:00
Petr Mrázek cf4042acce Fix header and code desync 2010-02-28 02:07:42 +01:00
Petr Mrázek 7a85682ea0 Many fixes to DFHack::API
Wrapper generation still manual, but makes a lot more sense
2010-02-28 01:25:04 +01:00
mizipzor 4f85f37b01 added some exceptions to handle errors 2010-02-28 01:13:34 +01:00
Petr Mrázek 21a74c0bfa Fix problem with wrapper generation 2010-02-27 16:47:11 +01:00
Petr Mrázek 7805b591dd Sync 2010-02-27 13:24:32 +01:00
Petr Mrázek 562c30c703 Python stuffs 2010-02-26 22:23:43 +01:00
Petr Mrázek 347eb66d21 Changes for better SWIG support 2010-02-26 22:22:10 +01:00
Petr Mrázek 626d266e27 Added GCC visibility support 2010-02-25 23:43:37 +01:00
Petr Mrázek 4509e275ce Tabs to spaces 2010-02-25 17:53:41 +01:00
Petr Mrázek de5b2ecb4e Fixes for crash bugs and memory corruption. 2010-02-25 17:50:52 +01:00
belal 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
Petr Mrázek bdc22b4052 leftovers 2010-02-25 15:33:13 +01:00