Commit Graph

2952 Commits (ec222c0b245c3d93070635f8ab0f67712fbb729b)

Author SHA1 Message Date
lethosor ec222c0b24 Catch exceptions in stockpile (un)serialization
From #964, protobuf exceptions in loadstock/savestock would either fail by only
logging an error to the console (when run from the Lua UI) or by crashing the
game entirely (when run from the console).

Figuring out what actually causes the exceptions in the first place (possibly a
misunderstood structure layout?) would be a better solution than this, but this
will at least stop crashes for now.
2016-10-29 02:35:27 -04:00
jj c640006069 ruby: some more updates for x64, fix df_flagarray size 2016-10-28 16:40:14 +02:00
lethosor d62d263793 ruby: Fix potential onupdate crash when cur_year is missing 2016-10-26 20:55:16 -04:00
lethosor cf329c7ceb Ruby: fix Qnil and Qtrue constants with 64-bit Ruby 2.x
These have different values on x64 Ruby 2.x (see USE_FLONUM in ruby.h in the
ruby source). This was causing dump_rb_error to crash, since it was walking an
array until it got to Qnil (but thinking Qnil was 4 instead of 8) and trying to
print each element as a string. There were probably more subtle issues with
Qnil and Qtrue being wrong too.
2016-10-26 20:44:35 -04:00
lethosor defedb351e Fix raw_vcall crash on Linux/OS X x64 2016-10-26 09:34:14 -04:00
lethosor 2c230f0d3e Improve protobuf file regeneration (no longer uses a dummy status.txt file) 2016-10-24 22:51:27 -04:00
lethosor 4fdbba0207 Only touch protobuf generated files if they actually changed 2016-10-24 22:28:51 -04:00
lethosor 5c83c16a99 Fix memview x64 address display 2016-10-24 10:06:41 -04:00
Japa 25a64a2102 Merged branch develop into develop 2016-10-21 22:55:38 +05:30
Japa a0b0c16a8b Actually apply the designation changes in RemoteFortressReader 2016-10-21 22:55:28 +05:30
lethosor 3df74de021 Fix rb_dfget_vtable_ptr on x64
This was causing rb_dfget_rtti_classname to receive a truncated pointer and
crash
2016-10-21 11:46:53 -04:00
jj 97f29229cd ruby: fix weird freeze when printing large strings to the console on linux64 2016-10-21 17:00:02 +02:00
jj f586692ed6 plugins/ruby: update for 64bits 2016-10-21 14:52:26 +02:00
lethosor e3ff89ba03 Fix compile error 2016-10-19 16:21:38 -04:00
Japa 701adc12b3 Add ability for remotefortressreader.cpp to accept dig designations. 2016-10-19 22:21:50 +05:30
Japa 919507d9a0 Send over dig designations from un-taken job postings in remotefortressreader.cpp. 2016-10-19 20:00:30 +05:30
lethosor 16c77efb43 Fix whitespace issues 2016-10-15 16:05:33 -04:00
lethosor 4c21bbd5ae Add Lua::TableInsert() helper 2016-10-15 14:55:48 -04:00
lethosor 8a138fcc4c Avoid polluting global namespace in MapCache.h 2016-10-15 14:53:10 -04:00
Japa 8d84b0d968 Merged branch v0.43.03 into develop 2016-10-13 19:27:06 +05:30
lethosor 1c20ebe62c Make title-folder work without SDL_WM_GetCaption 2016-10-08 17:02:45 -04:00
lethosor 2806fe73a9 ruby: Support for loading Ruby 2.x libruby
Check for rb_float_new and rb_float_new_in_heap, as documented in #271
2016-10-08 17:01:52 -04:00
Japa 58ed20b25b Send world map snow coverage over remotefortressreader. 2016-10-06 22:16:40 +05:30
lethosor 714ba1a030 Warn if ruby library is missing instead of breaking installation 2016-09-26 18:28:59 -04:00
lethosor caa6a81669 Add ruby library for linux x64
Built by @dseguin: https://github.com/DFHack/dfhack/pull/989

Closes dfhack/dfhack#989
2016-09-26 17:46:50 -04:00
lethosor 7abb82b6d1 Switch to downloading 32-bit libruby on Linux and Windows 2016-09-26 17:36:57 -04:00
lethosor 888a09bed5 Switch to downloading OS X libruby 2016-09-26 17:24:35 -04:00
lethosor 8f2cc5bc4d Fix and reorganize remotefortressreader includes 2016-09-04 16:06:26 -04:00
Japa e205dc82a5 Merge pull request #991 from JapaMala/v0.43.03
Removed the other foreach.
2016-08-29 22:30:43 +05:30
Japa 1862106fd1 Removed the other foreach. 2016-08-29 22:29:40 +05:30
Japa b09ee3407c Merge branch 'v0.43.03' of https://github.com/JapaMala/dfhack into develop
Conflicts:
	library/xml
	plugins/remotefortressreader.cpp
2016-08-29 22:06:37 +05:30
Japa af5d4ec5a8 removed foreach. 2016-08-29 21:43:20 +05:30
lethosor bbaf129adf Fix ruby codegen for bitfields/enums with long base-type 2016-08-27 15:24:53 -04:00
Japa 7d145de4a7 Translate histfig mats into creature mats, rather than sending the entire histfig population. 2016-08-26 23:48:32 +05:30
Japa 91cb734a25 Send histfig materials over remotefortressreader.cpp, using unique ids. 2016-08-26 12:23:50 +05:30
Japa 5c3260c382 Actually check spatter amounts properly 2016-08-26 08:49:54 +05:30
Japa db7be082ef Only copy spatters if they actually have any amount. 2016-08-25 23:56:30 +05:30
Japa a3ab757642 Add spatters to remotefortressreader.cpp 2016-08-25 21:14:23 +05:30
lethosor 6ce470ad57 Add basic lua expression support to memview
Currently just supports basic field accesses (world.x, screen.y.z).
No support for world.x - 4, etc.

Closes #976
2016-08-24 16:26:34 -04:00
lethosor f4b0c2fcfc color-dfhack-text: Fix potential overflow issue 2016-08-22 23:18:58 -04:00
lethosor 93ac937cb9 Add new job types to autohauler 2016-08-21 22:24:41 -04:00
lethosor 9171149afb Update submodule refs 2016-08-18 23:42:17 -04:00
lethosor de731b0299 Move save_dir back into cur_savegame and update submodules 2016-08-14 12:41:09 -04:00
lethosor e965f5318f Replace many includes with forward declarations in modules/Maps.h 2016-08-13 21:44:01 -04:00
lethosor a1c25570df Move labormanager to plugins/, per request 2016-08-11 23:49:15 -04:00
lethosor 99813038e9 Update labormanager for unit.relations removal and fix warnings 2016-08-11 23:42:58 -04:00
lethosor bceeea39ba Merge remote-tracking branch 'ab9rf/develop' (labormanager) into develop 2016-08-11 23:37:22 -04:00
Kelly Kinkade a55ce5f1d9 labormanager: whitespace 2016-08-11 16:58:35 -05:00
Kelly Kinkade 5ab930ba4d labormanager: small tweaks
Handle cloth crafts correctly; handle pit jobs correctly; handle
bookcase construction correctly; deal with new break behavior better;
change assignment of clean labor; tweak hauling assignments slightly to
avoid overallocation; assign pull lever to everyone and clean to all
nonbusy dwarfs
2016-08-11 16:56:34 -05:00
lethosor 215afa34f3 Update for 64-bit unit changes
Includes xml, stonesense, scripts

Ref DFHack/df-structures@25cb373
2016-08-10 23:50:00 -04:00