-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
McArcady
authored and
McArcady
committed
Apr 8, 2021
1 parent
5a2351f
commit eaaf2a2
Showing
5 changed files
with
34 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
--- a/plugins/CMakeLists.txt 2021-04-05 17:47:01.148189093 +0200 | ||
+++ b/plugins/CMakeLists.txt 2021-04-05 17:49:44.366894564 +0200 | ||
@@ -134,6 +134,7 @@ | ||
dfhack_plugin(isoworldremote isoworldremote.cpp PROTOBUFS isoworldremote) | ||
dfhack_plugin(jobutils jobutils.cpp) | ||
add_subdirectory(labormanager) | ||
+ dfhack_plugin(kloker kloker.cpp) | ||
dfhack_plugin(lair lair.cpp) | ||
dfhack_plugin(liquids liquids.cpp Brushes.h LINK_LIBRARIES lua) | ||
dfhack_plugin(luasocket luasocket.cpp LINK_LIBRARIES clsocket lua dfhack-tinythread) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
--- a/plugins/kloker.cpp 2021-04-05 18:21:05.240235124 +0200 | ||
+++ b/plugins/kloker.cpp 2021-04-08 21:00:39.721671597 +0200 | ||
@@ -44,7 +44,8 @@ | ||
#include "df/nemesis_record.h" | ||
#include "df/historical_entity.h" | ||
#include "df/historical_figure.h" | ||
#include "df/historical_figure_info.h" | ||
+#include "df/historical_figure_relationships.h" | ||
#include "df/histfig_hf_link.h" | ||
#include "df/histfig_hf_link_type.h" | ||
#include "df/activity_event.h" | ||
@@ -6155,7 +6155,7 @@ | ||
rg += ",Gods " + cur->godline; | ||
int rn = rg.size(), dn = ds.size(); | ||
|
||
- if (rn + dn > to_lim) { | ||
+ if ((rn + dn > to_lim) && (to_lim - rn >= 3)) { | ||
ds.resize(to_lim - rn - 3); | ||
ds += ".. "; | ||
dn = ds.size(); |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters