From 8a9e3d1a728aa1478956dd710ebb69b287b65d44 Mon Sep 17 00:00:00 2001 From: Quietust Date: Mon, 11 Aug 2014 15:07:52 -0500 Subject: [PATCH] Plugin cleanup - always do "using df::global::[foo]". Also, get rid of old 0.34.11 binpatches --- library/xml | 2 +- patches/v0.34.11 SDL/armorstand-capacity.dif | 142 ----------------- patches/v0.34.11 SDL/custom-reagent-size.dif | 91 ----------- patches/v0.34.11 SDL/deconstruct-heapfall.dif | 61 -------- patches/v0.34.11 SDL/deconstruct-teleport.dif | 104 ------------- .../v0.34.11 SDL/hospital-overstocking.dif | 62 -------- patches/v0.34.11 SDL/training-ammo.dif | 83 ---------- patches/v0.34.11 SDL/weaponrack-unassign.dif | 61 -------- .../v0.34.11 linux/armorstand-capacity.dif | 147 ------------------ .../v0.34.11 linux/custom-reagent-size.dif | 40 ----- .../v0.34.11 linux/deconstruct-heapfall.dif | 83 ---------- .../v0.34.11 linux/deconstruct-teleport.dif | 139 ----------------- .../v0.34.11 linux/hospital-overstocking.dif | 60 ------- patches/v0.34.11 linux/training-ammo.dif | 85 ---------- .../v0.34.11 linux/weaponrack-unassign.dif | 45 ------ .../v0.34.11 osx/hospital-overstocking.dif | 20 --- plugins/building-hacks.cpp | 2 - plugins/burrows.cpp | 5 +- plugins/catsplosion.cpp | 3 +- plugins/command-prompt.cpp | 12 +- plugins/digFlood.cpp | 16 +- plugins/dwarfmonitor.cpp | 2 +- plugins/fix-armory.cpp | 4 +- plugins/follow.cpp | 3 +- plugins/infiniteSky.cpp | 15 +- plugins/isoworldremote.cpp | 46 +++--- plugins/liquids.cpp | 3 +- plugins/misery.cpp | 19 ++- plugins/mousequery.cpp | 11 +- plugins/petcapRemover.cpp | 6 +- plugins/remotefortressreader.cpp | 10 +- plugins/search.cpp | 2 +- plugins/siege-engine.cpp | 5 +- plugins/steam-engine.cpp | 3 +- plugins/stockflow.cpp | 2 +- plugins/strangemood.cpp | 3 +- plugins/tiletypes.cpp | 4 +- plugins/treefarm.cpp | 5 +- plugins/tweak.cpp | 10 +- plugins/weather.cpp | 8 +- plugins/workNow.cpp | 14 +- plugins/zone.cpp | 55 ++++--- 42 files changed, 153 insertions(+), 1340 deletions(-) delete mode 100644 patches/v0.34.11 SDL/armorstand-capacity.dif delete mode 100644 patches/v0.34.11 SDL/custom-reagent-size.dif delete mode 100644 patches/v0.34.11 SDL/deconstruct-heapfall.dif delete mode 100644 patches/v0.34.11 SDL/deconstruct-teleport.dif delete mode 100644 patches/v0.34.11 SDL/hospital-overstocking.dif delete mode 100644 patches/v0.34.11 SDL/training-ammo.dif delete mode 100644 patches/v0.34.11 SDL/weaponrack-unassign.dif delete mode 100644 patches/v0.34.11 linux/armorstand-capacity.dif delete mode 100644 patches/v0.34.11 linux/custom-reagent-size.dif delete mode 100644 patches/v0.34.11 linux/deconstruct-heapfall.dif delete mode 100644 patches/v0.34.11 linux/deconstruct-teleport.dif delete mode 100644 patches/v0.34.11 linux/hospital-overstocking.dif delete mode 100644 patches/v0.34.11 linux/training-ammo.dif delete mode 100644 patches/v0.34.11 linux/weaponrack-unassign.dif delete mode 100644 patches/v0.34.11 osx/hospital-overstocking.dif diff --git a/library/xml b/library/xml index 76078fe30..8bad0805f 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit 76078fe30e6333a693bcdc392af150383967e7d1 +Subproject commit 8bad0805fdb3d2429a2c2f120d23b53ae0bad5ec diff --git a/patches/v0.34.11 SDL/armorstand-capacity.dif b/patches/v0.34.11 SDL/armorstand-capacity.dif deleted file mode 100644 index e7d69a8c2..000000000 --- a/patches/v0.34.11 SDL/armorstand-capacity.dif +++ /dev/null @@ -1,142 +0,0 @@ -http://www.bay12games.com/dwarves/mantisbt/view.php?id=1445 - -0x2ac6b -CC CC CC CC CC -66 39 E8 EB 53 - -.text:0042B86B loc_42B86B: -.text:0042B86B cmp ax, bp -.text:0042B86E jmp short loc_42B8C3 - -0x2ac7b -CC CC CC CC CC -E9 96 A2 00 00 - -.text:0042B87B loc_42B87B: -.text:0042B87B jmp loc_435B16 - -0x2acc3 -CC CC CC CC CC CC CC CC CC CC CC CC CC -75 0A 66 FF 4C 24 16 79 03 58 EB AC C3 - -.text:0042B8C3 loc_42B8C3: -.text:0042B8C3 jnz short locret_42B8CF -.text:0042B8C5 dec word ptr [esp+16h] ; 4+8+8+2 -.text:0042B8CA jns short locret_42B8CF -.text:0042B8CC pop eax -.text:0042B8CD jmp short loc_42B87B -.text:0042B8CF locret_42B8CF: -.text:0042B8CF retn - -0x2b2a1 -CC CC CC CC CC CC CC CC CC CC CC CC CC CC CC -66 C7 44 24 0E 01 00 8B 90 44 01 00 00 C3 CC - -.text:0042BEA1 loc_42BEA1: -.text:0042BEA1 mov word ptr [esp+0Eh], 1 ; 4+8+2 -.text:0042BEA8 mov edx, [eax+144h] -.text:0042BEAE retn - -0x34d91 -8B 90 44 01 00 00 -E8 0B 65 FF FF 90 - -<<<< -.text:00435991 mov edx, [eax+144h] -==== -.text:00435991 call loc_42BEA1 -.text:00435996 nop ->>>> - -0x34e53 -0F 84 BD 00 00 00 -E8 6B 5E FF FF 90 - -<<<< -.text:00435A53 jz loc_435B16 -==== -.text:00435A53 call loc_42B8C3 -.text:00435A58 nop ->>>> - -0x34ef3 -66 3B C5 74 1E -E8 73 5D FF FF - -<<<< -.text:00435AF3 cmp ax, bp -.text:00435AF6 jz short loc_435B16 -==== -.text:00435AF3 call loc_42B86B ->>>> - - -basically: - -+ int allowed_count = 1; // to mean 2 - ... -- if (type(item) == new_type) -+ if (type(item) == new_type && --allowed_count < 0) - return false; - -to allow up to two items of the same type at the same time - - ----8<--- -This difference file is created by The Interactive Disassembler - -Dwarf Fortress.exe -0002AC6B: CC 66 -0002AC6C: CC 39 -0002AC6D: CC E8 -0002AC6E: CC EB -0002AC6F: CC 53 -0002AC7B: CC E9 -0002AC7C: CC 96 -0002AC7D: CC A2 -0002AC7E: CC 00 -0002AC7F: CC 00 -0002ACC3: CC 75 -0002ACC4: CC 0A -0002ACC5: CC 66 -0002ACC6: CC FF -0002ACC7: CC 4C -0002ACC8: CC 24 -0002ACC9: CC 16 -0002ACCA: CC 79 -0002ACCB: CC 03 -0002ACCC: CC 58 -0002ACCD: CC EB -0002ACCE: CC AC -0002ACCF: CC C3 -0002B2A1: CC 66 -0002B2A2: CC C7 -0002B2A3: CC 44 -0002B2A4: CC 24 -0002B2A5: CC 0E -0002B2A6: CC 01 -0002B2A7: CC 00 -0002B2A8: CC 8B -0002B2A9: CC 90 -0002B2AA: CC 44 -0002B2AB: CC 01 -0002B2AC: CC 00 -0002B2AD: CC 00 -0002B2AE: CC C3 -00034D91: 8B E8 -00034D92: 90 0B -00034D93: 44 65 -00034D94: 01 FF -00034D95: 00 FF -00034D96: 00 90 -00034E53: 0F E8 -00034E54: 84 6B -00034E55: BD 5E -00034E56: 00 FF -00034E57: 00 FF -00034E58: 00 90 -00034EF3: 66 E8 -00034EF4: 3B 73 -00034EF5: C5 5D -00034EF6: 74 FF -00034EF7: 1E FF diff --git a/patches/v0.34.11 SDL/custom-reagent-size.dif b/patches/v0.34.11 SDL/custom-reagent-size.dif deleted file mode 100644 index 2227a48d0..000000000 --- a/patches/v0.34.11 SDL/custom-reagent-size.dif +++ /dev/null @@ -1,91 +0,0 @@ -http://www.bay12games.com/dwarves/mantisbt/view.php?id=808 - -Original code: - -.text:00916BCE mov edi, ebp -.text:00916BD0 call eax -.text:00916BD2 test eax, eax -.text:00916BD4 jnz short loc_916C1C - -.text:00916C0A mov edi, ebp - -.text:00916C14 mov edi, ebp - -Patch: - -0x2ac34: -CC CC CC CC CC CC CC CC CC CC CC CC -8B 7C 24 78 8B 3C B7 FF D0 EB 25 CC - -.text:0042B834 loc_42B834: -.text:0042B834 mov edi, [esp+78h] -.text:0042B838 mov edi, [edi+esi*4] -.text:0042B83B call eax -.text:0042B83D jmp short unk_42B864 - -0x2ac64 -CC CC CC CC CC CC CC CC CC CC CC CC -85 C0 E9 69 B3 4E 00 CC CC CC CC CC - -.text:0042B864 loc_42B864: -.text:0042B864 test eax, eax -.text:0042B866 jmp loc_916BD4 - -0x515fce -8B FD FF D0 85 C0 -E9 61 4C B1 FF 90 - -.text:00916BCE jmp loc_42B834 -.text:00916BD3 nop -.text:00916BD4 loc_916BD4: - -0x51600a -8B FD -90 90 - -.text:00916C0A nop -.text:00916C0B nop - -0x516014 -8B FD -90 90 - -.text:00916C14 nop -.text:00916C15 nop - - -You can use this script to apply the generated patch below: -http://stalkr.net/files/ida/idadif.py - -----8<---- -This difference file is created by The Interactive Disassembler - -Dwarf Fortress.exe -0002AC34: CC 8B -0002AC35: CC 7C -0002AC36: CC 24 -0002AC37: CC 78 -0002AC38: CC 8B -0002AC39: CC 3C -0002AC3A: CC B7 -0002AC3B: CC FF -0002AC3C: CC D0 -0002AC3D: CC EB -0002AC3E: CC 25 -0002AC64: CC 85 -0002AC65: CC C0 -0002AC66: CC E9 -0002AC67: CC 69 -0002AC68: CC B3 -0002AC69: CC 4E -0002AC6A: CC 00 -00515FCE: 8B E9 -00515FCF: FD 61 -00515FD0: FF 4C -00515FD1: D0 B1 -00515FD2: 85 FF -00515FD3: C0 90 -0051600A: 8B 90 -0051600B: FD 90 -00516014: 8B 90 -00516015: FD 90 diff --git a/patches/v0.34.11 SDL/deconstruct-heapfall.dif b/patches/v0.34.11 SDL/deconstruct-heapfall.dif deleted file mode 100644 index 05c0047d3..000000000 --- a/patches/v0.34.11 SDL/deconstruct-heapfall.dif +++ /dev/null @@ -1,61 +0,0 @@ -http://www.bay12games.com/dwarves/mantisbt/view.php?id=5994 - -Original code: - -.text:008629BD mov edi, [eax+38h] -.text:008629C0 mov eax, [eax+3Ch] -.text:008629C3 mov [esp+1Ch], eax -.text:008629C7 cmp edi, eax -.text:008629C9 jnb short loc_862A22 -.text:008629CB jmp short loc_8629D0 -.text:008629CD lea ecx, [ecx+0] -... -.text:00862A19 add edi, 4 -.text:00862A1C cmp edi, [esp+1Ch] -.text:00862A20 jb short loc_8629D0 - -Patch: - -0x461dbd -8B 78 38 8B 40 3C 89 44 24 1C 3B F8 -8B 78 3C 8B 40 38 89 44 24 1C 39 F8 - -.text:008629BD mov edi, [eax+3Ch] -.text:008629C0 mov eax, [eax+38h] -.text:008629C3 mov [esp+1Ch], eax -.text:008629C7 cmp eax, edi - -0x461dcb -EB 03 8D 49 00 -83 EF 04 90 90 - -.text:008629CB sub edi, 4 -.text:008629CE nop -.text:008629CF nop - -0x461e19 -83 C7 04 3B 7C 24 1C 72 AE -83 EF 04 3B 7C 24 1C 73 AE - -.text:00862A19 sub edi, 4 -.text:00862A1C cmp edi, [esp+1Ch] -.text:00862A20 jnb short loc_8629D0 - - -You can use this script to apply the generated patch below: -http://stalkr.net/files/ida/idadif.py - -----8<---- -This difference file is created by The Interactive Disassembler - -Dwarf_Fortress -00461DBF: 38 3C -00461DC2: 3C 38 -00461DC7: 3B 39 -00461DCB: EB 83 -00461DCC: 03 EF -00461DCD: 8D 04 -00461DCE: 49 90 -00461DCF: 00 90 -00461E1A: C7 EF -00461E20: 72 73 diff --git a/patches/v0.34.11 SDL/deconstruct-teleport.dif b/patches/v0.34.11 SDL/deconstruct-teleport.dif deleted file mode 100644 index c6037e2c6..000000000 --- a/patches/v0.34.11 SDL/deconstruct-teleport.dif +++ /dev/null @@ -1,104 +0,0 @@ -http://www.bay12games.com/dwarves/mantisbt/view.php?id=5994 - -0x461de2 -F6 46 0C 01 74 31 -E9 0A 8E BC FF 90 - -.text:008629E2 jmp near ptr loc_42B7F1 ; << CAVE -.text:008629E7 nop -.text:008629E8 loc_8629E8: - -0x2abf1 -CC CC CC CC CC CC CC CC CC CC CC CC CC CC CC -8B 4C 24 2C F6 46 0C 01 75 08 E9 19 72 43 00 - -.text:0042B7F1 loc_42B7F1: -.text:0042B7F1 mov ecx, [esp+2Ch] ; job -.text:0042B7F5 test byte ptr [esi+0Ch], 1 -.text:0042B7F9 jnz short near ptr loc_42B803 -.text:0042B7FB coord_test_jfail: -.text:0042B7FB jmp loc_862A19 - -0x2ac03 -CC CC CC CC CC CC CC CC CC CC CC CC CC -8B 41 10 3B 46 04 75 F0 EB 06 CC CC CC - -.text:0042B803 loc_42B803: -.text:0042B803 mov eax, [ecx+10h] ; job->pos.(x,y) -.text:0042B806 cmp eax, [esi+4] ; item->pos.(x,y) -.text:0042B809 jnz short coord_test_jfail -.text:0042B80B jmp short near ptr loc_42B813 - -0x2ac13 -CC CC CC CC CC CC CC CC CC CC CC CC CC -66 8B 41 14 66 3B 46 08 75 DE EB 06 CC - -text:0042B813 loc_42B813: -.text:0042B813 mov ax, [ecx+14h] ; job->pos.z -.text:0042B817 cmp ax, [esi+8] ; item->pos.z -.text:0042B81B jnz short coord_test_jfail -.text:0042B81D jmp short near ptr loc_42B825 - -0x2ac25 -CC CC CC CC CC CC CC CC CC CC CC -E9 BE 71 43 00 CC CC CC CC CC CC - -.text:0042B825 loc_42B825: -.text:0042B825 jmp loc_8629E8 - - -You can use this script to apply the generated patch below: -http://stalkr.net/files/ida/idadif.py - -----8<---- -This difference file is created by The Interactive Disassembler - -Dwarf Fortress.exe -0002ABF1: CC 8B -0002ABF2: CC 4C -0002ABF3: CC 24 -0002ABF4: CC 2C -0002ABF5: CC F6 -0002ABF6: CC 46 -0002ABF7: CC 0C -0002ABF8: CC 01 -0002ABF9: CC 75 -0002ABFA: CC 08 -0002ABFB: CC E9 -0002ABFC: CC 19 -0002ABFD: CC 72 -0002ABFE: CC 43 -0002ABFF: CC 00 -0002AC03: CC 8B -0002AC04: CC 41 -0002AC05: CC 10 -0002AC06: CC 3B -0002AC07: CC 46 -0002AC08: CC 04 -0002AC09: CC 75 -0002AC0A: CC F0 -0002AC0B: CC EB -0002AC0C: CC 06 -0002AC13: CC 66 -0002AC14: CC 8B -0002AC15: CC 41 -0002AC16: CC 14 -0002AC17: CC 66 -0002AC18: CC 3B -0002AC19: CC 46 -0002AC1A: CC 08 -0002AC1B: CC 75 -0002AC1C: CC DE -0002AC1D: CC EB -0002AC1E: CC 06 -0002AC25: CC E9 -0002AC26: CC BE -0002AC27: CC 71 -0002AC28: CC 43 -0002AC29: CC 00 -00461DE2: F6 E9 -00461DE3: 46 0A -00461DE4: 0C 8E -00461DE5: 01 BC -00461DE6: 74 FF -00461DE7: 31 90 diff --git a/patches/v0.34.11 SDL/hospital-overstocking.dif b/patches/v0.34.11 SDL/hospital-overstocking.dif deleted file mode 100644 index 2bc305e60..000000000 --- a/patches/v0.34.11 SDL/hospital-overstocking.dif +++ /dev/null @@ -1,62 +0,0 @@ -http://www.bay12games.com/dwarves/mantisbt/view.php?id=4406 - -1. Include store in hospital jobs when recomputing counters - -0x68a63 -0F 85 58 01 00 00 -90 90 90 90 90 90 - -<<<< -.text:00469663 jnz loc_4697C1 -==== -.text:00469663 nop -.text:00469664 nop -.text:00469665 nop -.text:00469666 nop -.text:00469667 nop -.text:00469668 nop ->>>> - -- if (job->getBuildingRef(BUILDING_DESTINATION) != this) continue; -+ // NOP - -This reference points to the containers, not the hospital civzone. -Since fixing this properly is too hard for a patch, just remove the -check. Most people have only one hospital anyway, and it is better -to err on the side of caution here. - - -2. Make the stockpiling code increment the right stock counters - -0x3dcbf9 -8B 0C 90 8B 81 80 00 00 00 -8B 3C 90 8B 87 80 00 00 00 - -<<<< -.text:007DD7F9 mov ecx, [eax+edx*4] -.text:007DD7FC mov eax, [ecx+80h] -==== -.text:007DD7F9 mov edi, [eax+edx*4] -.text:007DD7FC mov eax, [edi+80h] ->>>> - -- id = civzones[i]->children[child_idx[i]]->id -+ cur_civzone = civzones[i] // existing var from previous loop -+ id = cur_civzone->children[child_idx[i]]->id - -The reason being, later code uses that var (at this point containing -useless data) to increment counters and amounts in the hospital. - - ----8<--- -This difference file is created by The Interactive Disassembler - -Dwarf Fortress.exe -00068A63: 0F 90 -00068A64: 85 90 -00068A65: 58 90 -00068A66: 01 90 -00068A67: 00 90 -00068A68: 00 90 -003DCBFA: 0C 3C -003DCBFD: 81 87 diff --git a/patches/v0.34.11 SDL/training-ammo.dif b/patches/v0.34.11 SDL/training-ammo.dif deleted file mode 100644 index ea50d4221..000000000 --- a/patches/v0.34.11 SDL/training-ammo.dif +++ /dev/null @@ -1,83 +0,0 @@ -http://www.bay12games.com/dwarves/mantisbt/view.php?id=4530 - -0x2ac85 -CC CC CC CC CC CC CC CC CC CC CC -29 44 24 24 8B 9D 28 01 00 00 C3 - -.text:0042B885 loc_42B885: -.text:0042B885 sub [esp+24h], eax -.text:0042B889 mov ebx, [ebp+128h] -.text:0042B88F retn - -0x2ac94 -CC CC CC CC CC CC CC CC CC CC CC CC -89 C1 8B 00 FF 90 34 02 00 00 EB E5 - -.text:0042B894 loc_42B894: -.text:0042B894 mov ecx, eax -.text:0042B896 mov eax, [eax] -.text:0042B898 call dword ptr [eax+234h] -.text:0042B89E jmp short loc_42B885 - -0x6e28ff -29 44 24 20 -90 90 90 90 - -<<<< -.text:00AE34FF sub [esp+20h], eax -==== -.text:00AE34FF nop -.text:00AE3500 nop -.text:00AE3501 nop -.text:00AE3502 nop ->>>> - -0x6e2999 -8B 9D 28 01 00 00 -E8 F6 82 94 FF 90 - -<<<< -.text:00AE3599 mov ebx, [ebp+128h] -==== -.text:00AE3599 call loc_42B894 -.text:00AE359E nop ->>>> - ----8<--- -This difference file is created by The Interactive Disassembler - -Dwarf Fortress.exe -0002AC85: CC 29 -0002AC86: CC 44 -0002AC87: CC 24 -0002AC88: CC 24 -0002AC89: CC 8B -0002AC8A: CC 9D -0002AC8B: CC 28 -0002AC8C: CC 01 -0002AC8D: CC 00 -0002AC8E: CC 00 -0002AC8F: CC C3 -0002AC94: CC 89 -0002AC95: CC C1 -0002AC96: CC 8B -0002AC97: CC 00 -0002AC98: CC FF -0002AC99: CC 90 -0002AC9A: CC 34 -0002AC9B: CC 02 -0002AC9C: CC 00 -0002AC9D: CC 00 -0002AC9E: CC EB -0002AC9F: CC E5 -006E28FF: 29 90 -006E2900: 44 90 -006E2901: 24 90 -006E2902: 20 90 -006E2999: 8B E8 -006E299A: 9D F6 -006E299B: 28 82 -006E299C: 01 94 -006E299D: 00 FF -006E299E: 00 90 - diff --git a/patches/v0.34.11 SDL/weaponrack-unassign.dif b/patches/v0.34.11 SDL/weaponrack-unassign.dif deleted file mode 100644 index 7760048ba..000000000 --- a/patches/v0.34.11 SDL/weaponrack-unassign.dif +++ /dev/null @@ -1,61 +0,0 @@ -http://www.bay12games.com/dwarves/mantisbt/view.php?id=1445 - -0x4c05c4 -8B 8C 24 80 00 00 00 -89 C1 90 90 90 90 90 - -<<<< -.text:008C11C4 mov ecx, [esp+98h+var_18] -==== -.text:008C11C4 mov ecx, eax -.text:008C11C6 nop -.text:008C11C7 nop -.text:008C11C8 nop -.text:008C11C9 nop -.text:008C11CA nop ->>>> - -0x4c06a1 -8B 8C 24 80 00 00 00 -89 C1 90 90 90 90 90 - -<<<< -.text:008C12A1 mov ecx, [esp+98h+var_18] -==== -.text:008C12A1 mov ecx, eax -.text:008C12A3 nop -.text:008C12A4 nop -.text:008C12A5 nop -.text:008C12A6 nop -.text:008C12A7 nop ->>>> - - -basically: - - b_squad_id = building->getSpecificSquad(); -- if (b_squad_id != squad->id || !building->canUse(some_squad_id, 4)) -+ if (b_squad_id != squad->id || !building->canUse(b_squad_id, 4)) - unassign(building); - -the reason being, some_other_squad_id contains irrelevant garbage at this point - - ----8<--- -This difference file is created by The Interactive Disassembler - -Dwarf Fortress.exe -004C05C4: 8B 89 -004C05C5: 8C C1 -004C05C6: 24 90 -004C05C7: 80 90 -004C05C8: 00 90 -004C05C9: 00 90 -004C05CA: 00 90 -004C06A1: 8B 89 -004C06A2: 8C C1 -004C06A3: 24 90 -004C06A4: 80 90 -004C06A5: 00 90 -004C06A6: 00 90 -004C06A7: 00 90 diff --git a/patches/v0.34.11 linux/armorstand-capacity.dif b/patches/v0.34.11 linux/armorstand-capacity.dif deleted file mode 100644 index 36dbcf0a9..000000000 --- a/patches/v0.34.11 linux/armorstand-capacity.dif +++ /dev/null @@ -1,147 +0,0 @@ -http://www.bay12games.com/dwarves/mantisbt/view.php?id=1445 - -0x9461 -90 90 90 90 90 90 90 90 90 90 90 90 90 90 -C7 44 24 18 01 00 00 00 FF A0 44 01 00 00 - -.text:08051461 sub_8051461 proc near -.text:08051461 mov dword ptr [esp+18h], 1 -.text:08051469 jmp dword ptr [eax+144h] -.text:08051469 sub_8051461 endp - -0x9548 -90 90 90 90 90 90 90 90 -FF 4C 24 14 78 08 EB 0B - -.text:08051548 loc_8051548: -.text:08051548 dec dword ptr [esp+14h] -.text:0805154C js short loc_8051556 -.text:0805154E jmp short loc_805155B - -0x9556 -90 90 90 90 90 90 90 90 90 90 -E9 F6 8C 05 00 E9 D0 8D 05 00 - -.text:08051556 loc_8051556: -.text:08051556 jmp loc_80AA251 -.text:0805155B loc_805155B: -.text:0805155B jmp loc_80AA330 - -0x9568 -90 90 90 90 90 90 90 90 -FF 4C 24 14 78 E8 EB 06 - -.text:08051568 loc_8051568: -.text:08051568 dec [esp+14h] -.text:0805156C js short loc_8051556 -.text:0805156E jmp short loc_8051576 - -0x9576 -90 90 90 90 90 -E9 4D 8E 05 00 - -.text:08051576 loc_8051576: -.text:08051576 jmp loc_80AA3C8 - -0x62243 -FF 90 44 01 00 00 -E8 19 72 FA FF 90 - -<<<< -.text:080AA243 call dword ptr [eax+144h] -==== -.text:080AA243 call sub_8051461 -.text:080AA248 nop ->>>> - -0x62369 -E9 E3 FE FF FF -E9 DA 71 FA FF - -<<<< -.text:080AA369 jmp loc_80AA251 -==== -.text:080AA369 jmp loc_8051548 ->>>> - -0x623f6 -E9 56 FE FF FF -E9 6D 71 FA FF - -<<<< -.text:080AA3F6 jmp loc_80AA251 -==== -.text:080AA3F6 jmp loc_8051568 ->>>> - -basically: - -+ int allowed_count = 1; // to mean 2 - ... -- if (type(item) == new_type) -+ if (type(item) == new_type && --allowed_count < 0) - return false; - -to allow up to two items of the same type at the same time - ----8<--- -This difference file is created by The Interactive Disassembler - -Dwarf_Fortress -00009461: 90 C7 -00009462: 90 44 -00009463: 90 24 -00009464: 90 18 -00009465: 90 01 -00009466: 90 00 -00009467: 90 00 -00009468: 90 00 -00009469: 90 FF -0000946A: 90 A0 -0000946B: 90 44 -0000946C: 90 01 -0000946D: 90 00 -0000946E: 90 00 -00009548: 90 FF -00009549: 90 4C -0000954A: 90 24 -0000954B: 90 14 -0000954C: 90 78 -0000954D: 90 08 -0000954E: 90 EB -0000954F: 90 0B -00009556: 90 E9 -00009557: 90 F6 -00009558: 90 8C -00009559: 90 05 -0000955A: 90 00 -0000955B: 90 E9 -0000955C: 90 D0 -0000955D: 90 8D -0000955E: 90 05 -0000955F: 90 00 -00009568: 90 FF -00009569: 90 4C -0000956A: 90 24 -0000956B: 90 14 -0000956C: 90 78 -0000956D: 90 E8 -0000956E: 90 EB -0000956F: 90 06 -00009576: 90 E9 -00009577: 90 4D -00009578: 90 8E -00009579: 90 05 -0000957A: 90 00 -00062243: FF E8 -00062244: 90 19 -00062245: 44 72 -00062246: 01 FA -00062247: 00 FF -00062248: 00 90 -0006236A: E3 DA -0006236B: FE 71 -0006236C: FF FA -000623F7: 56 6D -000623F8: FE 71 -000623F9: FF FA diff --git a/patches/v0.34.11 linux/custom-reagent-size.dif b/patches/v0.34.11 linux/custom-reagent-size.dif deleted file mode 100644 index d99269db1..000000000 --- a/patches/v0.34.11 linux/custom-reagent-size.dif +++ /dev/null @@ -1,40 +0,0 @@ -http://www.bay12games.com/dwarves/mantisbt/view.php?id=808 - -for (i = 0; i < num_items; i++) -{ - ridx = reagent_idx[i]; - sz = reagent_quantity[ridx]; // used quantity - if (sz <= 0) continue; - reag = reagent[ridx]; - if (reag->flags.PRESERVE_REAGENT) continue; - rsz = items[i]->getTotalDimension(); -<<<<<<<< - if (reag->flags3.ANY_RAW_MATERIAL) - rsz *= BASE_SIZE(items[i]->getType()); - if (items[i]->subtractDimension(rsz)) -======== - /* Not in patch, but necessary for full correctness: - if (reag->flags3.ANY_RAW_MATERIAL) - rsz /= BASE_SIZE(items[i]->getType()); - */ - if (reag->flags3.ANY_RAW_MATERIAL) - sz *= BASE_SIZE(items[i]->getType()); - if (items[i]->subtractDimension(sz)) ->>>>>>>> - destroy_item(items[i]); - reagent_quantity[ridx] -= rsz - if (reagent_quantity[ridx] < 0) - reagent_quantity[ridx] = 0; -} - -You can use this script to apply the generated patch below: -http://stalkr.net/files/ida/idadif.py - -----8<---- -This difference file is created by The Interactive Disassembler - -Dwarf_Fortress -0087F7EF: F8 D8 -0087F86F: F8 D8 -0087F9AD: C7 C3 -0087F9ED: C7 C3 diff --git a/patches/v0.34.11 linux/deconstruct-heapfall.dif b/patches/v0.34.11 linux/deconstruct-heapfall.dif deleted file mode 100644 index 294118ac5..000000000 --- a/patches/v0.34.11 linux/deconstruct-heapfall.dif +++ /dev/null @@ -1,83 +0,0 @@ -http://www.bay12games.com/dwarves/mantisbt/view.php?id=5994 - -Original code: - -.text:087AC378 cmp edx, eax -.text:087AC37A mov [esp+4Ch], eax -.text:087AC37E jnb loc_87A7034 -.text:087AC384 mov [esp+48h], edx -.text:087AC388 mov [esp+54h], ebx -... -.text:087AC440 add dword ptr [esp+48h], 4 -.text:087AC445 mov ebp, [esp+48h] -.text:087AC449 cmp [esp+4Ch], ebp -.text:087AC44D ja loc_87AC38C - -Patch: - -0x76437a -89 44 24 4C -89 54 24 4C - -.text:087AC37A mov [esp+4Ch], edx - -0x764384 -89 54 24 48 89 5C 24 54 -E8 8A 51 8A FF 90 90 90 - -.text:087AC384 call sub_8051513 -.text:087AC389 nop -.text:087AC38A nop -.text:087AC38B nop - -0x764440 -83 44 24 48 04 8B 6C 24 48 39 6C 24 4C 0F 87 39 FF FF FF -83 6C 24 48 04 8B 6C 24 48 39 6C 24 4C 0F 86 39 FF FF FF - -.text:087AC440 sub dword ptr [esp+48h], 4 -.text:087AC445 mov ebp, [esp+48h] -.text:087AC449 cmp [esp+4Ch], ebp -.text:087AC44D jbe loc_87AC38C - -0x9513 -90 90 90 90 90 90 90 90 90 90 90 90 90 -83 E8 04 89 44 24 4C 89 5C 24 58 C3 90 - -.text:08051513 sub_8051513 proc near -.text:08051513 sub eax, 4 -.text:08051516 mov [esp+4Ch], eax ; 48h -.text:0805151A mov [esp+58h], ebx ; 54h -.text:0805151E retn -.text:0805151E sub_8051513 endp - - -You can use this script to apply the generated patch below: -http://stalkr.net/files/ida/idadif.py - -----8<---- -This difference file is created by The Interactive Disassembler - -Dwarf_Fortress -00009513: 90 83 -00009514: 90 E8 -00009515: 90 04 -00009516: 90 89 -00009517: 90 44 -00009518: 90 24 -00009519: 90 4C -0000951A: 90 89 -0000951B: 90 5C -0000951C: 90 24 -0000951D: 90 58 -0000951E: 90 C3 -0076437B: 44 54 -00764384: 89 E8 -00764385: 54 8A -00764386: 24 51 -00764387: 48 8A -00764388: 89 FF -00764389: 5C 90 -0076438A: 24 90 -0076438B: 54 90 -00764441: 44 6C -0076444E: 87 86 diff --git a/patches/v0.34.11 linux/deconstruct-teleport.dif b/patches/v0.34.11 linux/deconstruct-teleport.dif deleted file mode 100644 index 3b3212109..000000000 --- a/patches/v0.34.11 linux/deconstruct-teleport.dif +++ /dev/null @@ -1,139 +0,0 @@ -http://www.bay12games.com/dwarves/mantisbt/view.php?id=5994 - -0x7643f8 -F6 46 0C 01 74 42 -E9 B6 50 8A FF 90 - -.text:087AC3F8 jmp loc_80514B3 ; << CAVE -.text:087AC3FD nop -.text:087AC3FE loc_87AC3FE: - -0x94b3 -90 90 90 90 90 90 90 90 90 90 90 90 90 -F6 46 0C 01 75 0A E9 82 AF 75 00 90 90 - -.text:080514B3 loc_80514B3: -.text:080514B3 test byte ptr [esi+0Ch], 1 -.text:080514B7 jnz short loc_80514C3 -.text:080514B9 coord_test_jfail: -.text:080514B9 jmp loc_87AC440 - -0x94c3 -90 90 90 90 90 90 90 90 90 90 90 90 90 -8D 9C 24 60 03 00 00 0F BF 03 EB 07 90 - -.text:080514C3 loc_80514C3: -.text:080514C3 lea ebx, [esp+360h] -.text:080514CA movsx eax, word ptr [ebx] ; job_z -.text:080514CD jmp short loc_80514D6 - -0x94d6 -90 90 90 90 90 90 90 90 90 90 -66 3B 46 08 75 DD EB 05 90 90 - -.text:080514D6 loc_80514D6: -.text:080514D6 cmp ax, [esi+8] ; item->pos.z -.text:080514DA jnz short coord_test_jfail -.text:080514DC jmp short loc_80514E3 - -0x94e3 -90 90 90 90 90 90 90 90 90 90 90 90 90 -0F BF 43 10 66 3B 46 04 75 CC EB 04 90 - -.text:080514E3 loc_80514E3: -.text:080514E3 movsx eax, word ptr [ebx+10h] ; job_x -.text:080514E7 cmp ax, [esi+4] ; item->pos.x -.text:080514EB jnz short coord_test_jfail -.text:080514ED jmp short loc_80514F3 - -0x94f3 -90 90 90 90 90 90 90 90 90 90 90 90 90 -0F BF 43 20 66 3B 46 06 75 BC EB 04 90 - -.text:080514F3 loc_80514F3: -.text:080514F3 movsx eax, word ptr [ebx+20h] ; job_y -.text:080514F7 cmp ax, [esi+6] ; item->pos.y -.text:080514FB jnz short coord_test_jfail -.text:080514FD jmp short loc_8051503 - -0x9503 -90 90 90 90 90 90 90 90 90 90 90 90 90 -E9 F6 AE 75 00 90 90 90 90 90 90 90 90 - -.text:08051503 loc_8051503: -.text:08051503 jmp loc_87AC3FE - - -You can use this script to apply the generated patch below: -http://stalkr.net/files/ida/idadif.py - -----8<---- -This difference file is created by The Interactive Disassembler - -Dwarf_Fortress -000094B3: 90 F6 -000094B4: 90 46 -000094B5: 90 0C -000094B6: 90 01 -000094B7: 90 75 -000094B8: 90 0A -000094B9: 90 E9 -000094BA: 90 82 -000094BB: 90 AF -000094BC: 90 75 -000094BD: 90 00 -000094C3: 90 8D -000094C4: 90 9C -000094C5: 90 24 -000094C6: 90 60 -000094C7: 90 03 -000094C8: 90 00 -000094C9: 90 00 -000094CA: 90 0F -000094CB: 90 BF -000094CC: 90 03 -000094CD: 90 EB -000094CE: 90 07 -000094D6: 90 66 -000094D7: 90 3B -000094D8: 90 46 -000094D9: 90 08 -000094DA: 90 75 -000094DB: 90 DD -000094DC: 90 EB -000094DD: 90 05 -000094E3: 90 0F -000094E4: 90 BF -000094E5: 90 43 -000094E6: 90 10 -000094E7: 90 66 -000094E8: 90 3B -000094E9: 90 46 -000094EA: 90 04 -000094EB: 90 75 -000094EC: 90 CC -000094ED: 90 EB -000094EE: 90 04 -000094F3: 90 0F -000094F4: 90 BF -000094F5: 90 43 -000094F6: 90 20 -000094F7: 90 66 -000094F8: 90 3B -000094F9: 90 46 -000094FA: 90 06 -000094FB: 90 75 -000094FC: 90 BC -000094FD: 90 EB -000094FE: 90 04 -00009503: 90 E9 -00009504: 90 F6 -00009505: 90 AE -00009506: 90 75 -00009507: 90 00 -007643F8: F6 E9 -007643F9: 46 B6 -007643FA: 0C 50 -007643FB: 01 8A -007643FC: 74 FF -007643FD: 42 90 diff --git a/patches/v0.34.11 linux/hospital-overstocking.dif b/patches/v0.34.11 linux/hospital-overstocking.dif deleted file mode 100644 index 73e5d2fac..000000000 --- a/patches/v0.34.11 linux/hospital-overstocking.dif +++ /dev/null @@ -1,60 +0,0 @@ -http://www.bay12games.com/dwarves/mantisbt/view.php?id=4406 - -1. Include store in hospital jobs when recomputing counters - -0x746d7 -75 D7 -90 90 - -<<<< -.text:080BC6D7 jnz short loc_80BC6B0 -==== -.text:080BC6D7 nop -.text:080BC6D8 nop ->>>> - -- if (job->getBuildingRef(BUILDING_DESTINATION) != this) continue; -+ // NOP - -This reference points to the containers, not the hospital civzone. -Since fixing this properly is too hard for a patch, just remove the -check. Most people have only one hospital anyway, and it is better -to err on the side of caution here. - - -2. Make the stockpiling code increment the right stock counters - -0x67cb0e -0B 04 90 -8B 1C 90 - -0x67cb18 -8B 40 74 -8B 43 74 - -<<<< -.text:086C4B0E mov eax, [eax+edx*4] -.text:086C4B11 mov edx, [esp+ecx*4+39Ch+var_2B4] -.text:086C4B18 mov eax, [eax+74h] -==== -.text:086C4B0E mov ebx, [eax+edx*4] -.text:086C4B11 mov edx, [esp+ecx*4+39Ch+var_2B4] -.text:086C4B18 mov eax, [ebx+74h] ->>>> - -- id = civzones[i]->children[child_idx[i]]->id -+ cur_civzone = civzones[i] // existing var from previous loop -+ id = cur_civzone->children[child_idx[i]]->id - -The reason being, later code uses that var (at this point containing -useless data) to increment counters and amounts in the hospital. - - ----8<--- -This difference file is created by The Interactive Disassembler - -Dwarf_Fortress -000746D7: 75 90 -000746D8: D7 90 -0067CB0F: 04 1C -0067CB19: 40 43 diff --git a/patches/v0.34.11 linux/training-ammo.dif b/patches/v0.34.11 linux/training-ammo.dif deleted file mode 100644 index 9fbcabe78..000000000 --- a/patches/v0.34.11 linux/training-ammo.dif +++ /dev/null @@ -1,85 +0,0 @@ -http://www.bay12games.com/dwarves/mantisbt/view.php?id=4530 - -0x9508 - -90 90 90 90 90 90 90 90 -E9 13 76 9C 00 90 90 90 - -.text:08051508 loc_8051508: -.text:08051508 jmp sub_8A18B20 - -0x9523 - -90 90 90 90 90 90 90 90 90 90 90 90 90 -50 8B 03 53 FF 90 34 02 00 00 EB 09 90 - -.text:08051523 sub_8051523: -.text:08051523 push eax -.text:08051524 mov eax, [ebx] -.text:08051526 push ebx -.text:08051527 call dword ptr [eax+234h] -.text:0805152D jmp short loc_8051538 - -0x9538 - -90 90 90 90 90 90 90 90 -29 44 24 64 5B 58 EB C8 - -.text:08051538 loc_8051538: -.text:08051538 sub [esp+64h], eax -.text:0805153C pop ebx -.text:0805153D pop eax -.text:0805153E jmp short loc_8051508 - -0xa5cdd0 - -29 44 24 58 -90 90 90 90 - -.text:08AA4DD0 nop -.text:08AA4DD1 nop -.text:08AA4DD2 nop -.text:08AA4DD3 nop - -0xa5e2c3 - -E8 58 28 F7 FF -E8 5B B2 5A FF - -.text:08AA62C3 call sub_8051523 - ----8<--- -This difference file is created by The Interactive Disassembler - -Dwarf_Fortress -00009508: 90 E9 -00009509: 90 13 -0000950A: 90 76 -0000950B: 90 9C -0000950C: 90 00 -00009523: 90 50 -00009524: 90 8B -00009525: 90 03 -00009526: 90 53 -00009527: 90 FF -00009529: 90 34 -0000952A: 90 02 -0000952B: 90 00 -0000952C: 90 00 -0000952D: 90 EB -0000952E: 90 09 -00009538: 90 29 -00009539: 90 44 -0000953A: 90 24 -0000953B: 90 64 -0000953C: 90 5B -0000953D: 90 58 -0000953E: 90 EB -0000953F: 90 C8 -00A5CDD0: 29 90 -00A5CDD1: 44 90 -00A5CDD2: 24 90 -00A5CDD3: 58 90 -00A5E2C4: 58 5B -00A5E2C5: 28 B2 -00A5E2C6: F7 5A diff --git a/patches/v0.34.11 linux/weaponrack-unassign.dif b/patches/v0.34.11 linux/weaponrack-unassign.dif deleted file mode 100644 index 721f235e8..000000000 --- a/patches/v0.34.11 linux/weaponrack-unassign.dif +++ /dev/null @@ -1,45 +0,0 @@ -http://www.bay12games.com/dwarves/mantisbt/view.php?id=1445 - -Fix use of uninitialized variables to stop auto-unassigning racks: - -0x7ee948 -8B 7C 24 3C -89 C7 90 90 - -.text:08836948 mov edi, eax -.text:0883694A nop -.text:0883694B nop - - -0x7eea2f -8B 7C 24 3C -89 C7 90 90 - -.text:08836A2F mov edi, eax -.text:08836A31 nop -.text:08836A32 nop - - -basically: - - b_squad_id = building->getSpecificSquad(); -- if (b_squad_id != squad->id || !building->canUse(some_squad_id, 4)) -+ if (b_squad_id != squad->id || !building->canUse(b_squad_id, 4)) - unassign(building); - -the reason being, some_other_squad_id contains irrelevant garbage at this point - - ----8<--- -This difference file is created by The Interactive Disassembler - -Dwarf_Fortress -007EE948: 8B 89 -007EE949: 7C C7 -007EE94A: 24 90 -007EE94B: 3C 90 -007EEA2F: 8B 89 -007EEA30: 7C C7 -007EEA31: 24 90 -007EEA32: 3C 90 - diff --git a/patches/v0.34.11 osx/hospital-overstocking.dif b/patches/v0.34.11 osx/hospital-overstocking.dif deleted file mode 100644 index 85aade42b..000000000 --- a/patches/v0.34.11 osx/hospital-overstocking.dif +++ /dev/null @@ -1,20 +0,0 @@ -see linux patch for info - -- .text:00111776 jnz loc_111750 -+ .text:00111776 nop -+ .text:00111777 nop - -sub_660360 -osx stores pointer in edi instead of ebx -- .text:006612C3 mov eax, [eax+edx*4] -+ .text:006612C3 mov edi, [eax+edx*4] -- .text:006612CD mov eax, [eax+74h] -+ .text:006612CD mov eax, [edi+74h] - ----8<--- - -Dwarf_Fortress -00110776: 75 90 -00110777: D8 90 -006602C4: 04 3C -006602CE: 40 47 diff --git a/plugins/building-hacks.cpp b/plugins/building-hacks.cpp index b9c9ea3c9..07beade74 100644 --- a/plugins/building-hacks.cpp +++ b/plugins/building-hacks.cpp @@ -180,7 +180,6 @@ struct work_hook : df::building_workshopst{ { if(def->skip_updates!=0 && is_fully_built()) { - df::world* world = df::global::world; if(world->frame_counter % def->skip_updates == 0) { CoreSuspendClaimer suspend; @@ -203,7 +202,6 @@ struct work_hook : df::building_workshopst{ if(!def->machine_timing) { int frame_mod=def->frames.size()* def->frame_skip; - df::world* world = df::global::world; frame=(world->frame_counter % frame_mod)/def->frame_skip; } else diff --git a/plugins/burrows.cpp b/plugins/burrows.cpp index 32a76ba0c..214fb0582 100644 --- a/plugins/burrows.cpp +++ b/plugins/burrows.cpp @@ -39,6 +39,7 @@ using namespace dfproto; using df::global::ui; using df::global::world; +using df::global::gamemode; /* * Initialization. @@ -101,8 +102,8 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan switch (event) { case SC_MAP_LOADED: deinit_map(out); - if (df::global::gamemode && - *df::global::gamemode == game_mode::DWARF) + if (gamemode && + *gamemode == game_mode::DWARF) init_map(out); break; case SC_MAP_UNLOADED: diff --git a/plugins/catsplosion.cpp b/plugins/catsplosion.cpp index c0702df2c..1c323de22 100644 --- a/plugins/catsplosion.cpp +++ b/plugins/catsplosion.cpp @@ -25,6 +25,7 @@ using namespace std; #include using namespace DFHack; +using df::global::world; command_result catsplosion (color_ostream &out, std::vector & parameters); @@ -79,7 +80,7 @@ command_result catsplosion (color_ostream &out, std::vector & para for(uint32_t i =0;i < numCreatures;i++) { df::unit * creature = Units::GetCreature(i); - df::creature_raw *raw = df::global::world->raws.creatures.all[creature->race]; + df::creature_raw *raw = world->raws.creatures.all[creature->race]; if(creature->sex == 0) // female { female_counts[raw->creature_id].push_back(creature); diff --git a/plugins/command-prompt.cpp b/plugins/command-prompt.cpp index 30be625b7..36df35cd6 100644 --- a/plugins/command-prompt.cpp +++ b/plugins/command-prompt.cpp @@ -53,8 +53,8 @@ public: std::string getFocusString() { return "commandprompt"; } viewscreen_commandpromptst(std::string entry):is_response(false) { - show_fps=df::global::gps->display_frames; - df::global::gps->display_frames=0; + show_fps=gps->display_frames; + gps->display_frames=0; cursor_pos = 0; frame = 0; history_idx = command_history.size(); @@ -70,7 +70,7 @@ public: } ~viewscreen_commandpromptst() { - df::global::gps->display_frames=show_fps; + gps->display_frames=show_fps; } void add_response(color_value v, std::string s) @@ -138,7 +138,7 @@ void prompt_ostream::flush_proxy() void viewscreen_commandpromptst::render() { ++frame; - if (frame >= df::global::enabler->gfps) + if (frame >= enabler->gfps) frame = 0; if (Screen::isDismissed(this)) return; @@ -162,7 +162,7 @@ void viewscreen_commandpromptst::render() std::string entry = get_entry(); Screen::fillRect(Screen::Pen(' ', 7, 0),0,0,dim.x,0); Screen::paintString(Screen::Pen(' ', 7, 0), 0, 0,"[DFHack]#"); - std::string cursor = (frame < df::global::enabler->gfps / 2) ? "_" : " "; + std::string cursor = (frame < enabler->gfps / 2) ? "_" : " "; if(cursor_pos < (dim.x - 10)) { Screen::paintString(Screen::Pen(' ', 7, 0), 10,0 , entry); @@ -328,4 +328,4 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector & parameters); DFHACK_PLUGIN("digFlood"); @@ -88,7 +92,7 @@ void onDig(color_ostream& out, void* ptr) { return; set jobLocations; - for ( df::job_list_link* link = &df::global::world->job_list; link != NULL; link = link->next ) { + for ( df::job_list_link* link = &world->job_list; link != NULL; link = link->next ) { if ( link->item == NULL ) continue; @@ -146,7 +150,7 @@ void maybeExplore(color_ostream& out, MapExtras::MapCache& cache, df::coord pt, if ( mat == -1 ) return; if ( !digAll ) { - df::inorganic_raw* inorganic = df::global::world->raws.inorganics[mat]; + df::inorganic_raw* inorganic = world->raws.inorganics[mat]; if ( autodigMaterials.find(inorganic->id) == autodigMaterials.end() ) { return; } @@ -154,8 +158,8 @@ void maybeExplore(color_ostream& out, MapExtras::MapCache& cache, df::coord pt, block->designation[pt.x&0xF][pt.y&0xF].bits.dig = df::enums::tile_dig_designation::Default; block->flags.bits.designated = true; -// *df::global::process_dig = true; -// *df::global::process_jobs = true; +// *process_dig = true; +// *process_jobs = true; } command_result digFlood (color_ostream &out, std::vector & parameters) @@ -186,8 +190,8 @@ command_result digFlood (color_ostream &out, std::vector & paramet continue; } - for ( size_t b = 0; b < df::global::world->raws.inorganics.size(); b++ ) { - df::inorganic_raw* inorganic = df::global::world->raws.inorganics[b]; + for ( size_t b = 0; b < world->raws.inorganics.size(); b++ ) { + df::inorganic_raw* inorganic = world->raws.inorganics[b]; if ( parameters[a] == inorganic->id ) { if ( adding ) toAdd.insert(parameters[a]); diff --git a/plugins/dwarfmonitor.cpp b/plugins/dwarfmonitor.cpp index 4f23e5199..e443f9f0e 100644 --- a/plugins/dwarfmonitor.cpp +++ b/plugins/dwarfmonitor.cpp @@ -1040,7 +1040,7 @@ struct preference_map string getItemLabel() { - df::world_raws::T_itemdefs &defs = df::global::world->raws.itemdefs; + df::world_raws::T_itemdefs &defs = world->raws.itemdefs; label = ENUM_ATTR_STR(item_type, caption, pref.item_type); switch (pref.item_type) { diff --git a/plugins/fix-armory.cpp b/plugins/fix-armory.cpp index a217c1a04..e2c917f7e 100644 --- a/plugins/fix-armory.cpp +++ b/plugins/fix-armory.cpp @@ -201,7 +201,7 @@ static bool can_store_ammo_rec(df::item *item, df::building *holder, int squad_i // Ugh, archery targets don't actually have a squad use vector else if (holder->getType() == building_type::ArcheryTarget) { - auto &squads = df::global::world->squads.all; + auto &squads = world->squads.all; for (size_t si = 0; si < squads.size(); si++) { @@ -710,7 +710,7 @@ DFhackCExport command_result plugin_onupdate(color_ostream &out, state_change_ev return CR_OK; // Loop over squads - auto &squads = df::global::world->squads.all; + auto &squads = world->squads.all; for (size_t si = 0; si < squads.size(); si++) { diff --git a/plugins/follow.cpp b/plugins/follow.cpp index 56a7cf3b2..de3428300 100644 --- a/plugins/follow.cpp +++ b/plugins/follow.cpp @@ -16,6 +16,7 @@ using namespace DFHack; using namespace df::enums; +using df::global::world; command_result follow (color_ostream &out, std::vector & parameters); @@ -151,7 +152,7 @@ command_result follow (color_ostream &out, std::vector & parameter { is_enabled = true; std::ostringstream ss; - ss << "Unpause to begin following " << df::global::world->raws.creatures.all[followedUnit->race]->name[0]; + ss << "Unpause to begin following " << world->raws.creatures.all[followedUnit->race]->name[0]; if (followedUnit->name.has_name) ss << " " << followedUnit->name.first_name; ss << ". Simply manually move the view to break the following.\n"; out.print(ss.str().c_str()); diff --git a/plugins/infiniteSky.cpp b/plugins/infiniteSky.cpp index 7dc986fca..774ac4d51 100644 --- a/plugins/infiniteSky.cpp +++ b/plugins/infiniteSky.cpp @@ -23,6 +23,8 @@ using namespace std; using namespace DFHack; using namespace df::enums; +using df::global::world; + command_result infiniteSky (color_ostream &out, std::vector & parameters); DFHACK_PLUGIN("infiniteSky"); @@ -88,24 +90,23 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out ) return CR_OK; } - if ( df::global::world->constructions.size() == constructionSize ) + if ( world->constructions.size() == constructionSize ) return CR_OK; - int32_t zNow = df::global::world->map.z_count_block; - for ( size_t a = constructionSize; a < df::global::world->constructions.size(); a++ ) { - df::construction* construct = df::global::world->constructions[a]; + int32_t zNow = world->map.z_count_block; + for ( size_t a = constructionSize; a < world->constructions.size(); a++ ) { + df::construction* construct = world->constructions[a]; if ( construct->pos.z+2 < zNow ) continue; doInfiniteSky(out, 1); - zNow = df::global::world->map.z_count_block; + zNow = world->map.z_count_block; ///break; } - constructionSize = df::global::world->constructions.size(); + constructionSize = world->constructions.size(); return CR_OK; } void doInfiniteSky(color_ostream& out, int32_t howMany) { - df::world* world = df::global::world; CoreSuspender suspend; int32_t x_count_block = world->map.x_count_block; int32_t y_count_block = world->map.y_count_block; diff --git a/plugins/isoworldremote.cpp b/plugins/isoworldremote.cpp index 8a3bacfd5..78baad1e1 100644 --- a/plugins/isoworldremote.cpp +++ b/plugins/isoworldremote.cpp @@ -31,6 +31,10 @@ using namespace DFHack; using namespace df::enums; using namespace isoworldremote; +using df::global::gamemode; +using df::global::world; +using df::global::cur_year; +using df::global::cur_season; // Here go all the command declarations... // mostly to allow having the mandatory stuff on top of the file and commands on the bottom @@ -185,11 +189,11 @@ static command_result GetEmbarkInfo(color_ostream &stream, const MapRequest *in, out->set_available(false); return CR_OK; } - if(!df::global::gamemode) { + if(!gamemode) { out->set_available(false); return CR_OK; } - if((*df::global::gamemode != game_mode::ADVENTURE) && (*df::global::gamemode != game_mode::DWARF)) { + if((*gamemode != game_mode::ADVENTURE) && (*gamemode != game_mode::DWARF)) { out->set_available(false); return CR_OK; } @@ -198,18 +202,18 @@ static command_result GetEmbarkInfo(color_ostream &stream, const MapRequest *in, return CR_OK; } if (in->has_save_folder()) { //If no save folder is given, it means we don't care. - if (!(in->save_folder() == df::global::world->cur_savegame.save_dir || in->save_folder() == "ANY")) { //isoworld has a different map loaded, don't bother trying to load tiles for it, we don't have them. + if (!(in->save_folder() == world->cur_savegame.save_dir || in->save_folder() == "ANY")) { //isoworld has a different map loaded, don't bother trying to load tiles for it, we don't have them. out->set_available(false); return CR_OK; } } out->set_available(true); - out->set_current_year(*df::global::cur_year); - out->set_current_season(*df::global::cur_season); - out->set_region_x(df::global::world->map.region_x); - out->set_region_y(df::global::world->map.region_y); - out->set_region_size_x(df::global::world->map.x_count_block / 3); - out->set_region_size_y(df::global::world->map.y_count_block / 3); + out->set_current_year(*cur_year); + out->set_current_season(*cur_season); + out->set_region_x(world->map.region_x); + out->set_region_y(world->map.region_y); + out->set_region_size_x(world->map.x_count_block / 3); + out->set_region_size_y(world->map.y_count_block / 3); return CR_OK; } @@ -219,11 +223,11 @@ int coord_to_index_48(int x, int y) { bool gather_embark_tile(int EmbX, int EmbY, EmbarkTile * tile, MapExtras::MapCache * MP) { tile->set_is_valid(false); - tile->set_world_x(df::global::world->map.region_x + (EmbX/3)); - tile->set_world_y(df::global::world->map.region_y + (EmbY/3)); - tile->set_world_z(df::global::world->map.region_z + 1); //adding one because floors get shifted one downwards. - tile->set_current_year(*df::global::cur_year); - tile->set_current_season(*df::global::cur_season); + tile->set_world_x(world->map.region_x + (EmbX/3)); + tile->set_world_y(world->map.region_y + (EmbY/3)); + tile->set_world_z(world->map.region_z + 1); //adding one because floors get shifted one downwards. + tile->set_current_year(*cur_year); + tile->set_current_season(*cur_season); int num_valid_layers = 0; for(int z = 0; z < MP->maxZ(); z++) { @@ -332,11 +336,11 @@ static command_result GetRawNames(color_ostream &stream, const MapRequest *in, R out->set_available(false); return CR_OK; } - if(!df::global::gamemode) { + if(!gamemode) { out->set_available(false); return CR_OK; } - if((*df::global::gamemode != game_mode::ADVENTURE) && (*df::global::gamemode != game_mode::DWARF)) { + if((*gamemode != game_mode::ADVENTURE) && (*gamemode != game_mode::DWARF)) { out->set_available(false); return CR_OK; } @@ -345,18 +349,18 @@ static command_result GetRawNames(color_ostream &stream, const MapRequest *in, R return CR_OK; } if (in->has_save_folder()) { //If no save folder is given, it means we don't care. - if (!(in->save_folder() == df::global::world->cur_savegame.save_dir || in->save_folder() == "ANY")) { //isoworld has a different map loaded, don't bother trying to load tiles for it, we don't have them. + if (!(in->save_folder() == world->cur_savegame.save_dir || in->save_folder() == "ANY")) { //isoworld has a different map loaded, don't bother trying to load tiles for it, we don't have them. out->set_available(false); return CR_OK; } } out->set_available(true); - for(int i = 0; i < df::global::world->raws.inorganics.size(); i++){ - out->add_inorganic(df::global::world->raws.inorganics[i]->id); + for(int i = 0; i < world->raws.inorganics.size(); i++){ + out->add_inorganic(world->raws.inorganics[i]->id); } - for(int i = 0; i < df::global::world->raws.plants.all.size(); i++){ - out->add_organic(df::global::world->raws.plants.all[i]->id); + for(int i = 0; i < world->raws.plants.all.size(); i++){ + out->add_organic(world->raws.plants.all[i]->id); } return CR_OK; } diff --git a/plugins/liquids.cpp b/plugins/liquids.cpp index 712955b86..5ec25de34 100644 --- a/plugins/liquids.cpp +++ b/plugins/liquids.cpp @@ -46,6 +46,7 @@ using std::set; using namespace MapExtras; using namespace DFHack; using namespace df::enums; +using df::global::world; CommandHistory liquids_hist; @@ -440,7 +441,7 @@ command_result df_liquids_execute(color_ostream &out, OperationMode &cur_mode, d coord_vec all_tiles = brush->points(mcache,cursor); // Force the game to recompute its walkability cache - df::global::world->reindex_pathfinding = true; + world->reindex_pathfinding = true; switch (cur_mode.paint) { diff --git a/plugins/misery.cpp b/plugins/misery.cpp index cc69115db..bc617b906 100644 --- a/plugins/misery.cpp +++ b/plugins/misery.cpp @@ -11,10 +11,13 @@ #include #include #include -using namespace std; +using namespace std; using namespace DFHack; +using df::global::world; +using df::global::ui; + DFHACK_PLUGIN_IS_ENABLED(is_enabled); static int factor = 1; @@ -36,7 +39,7 @@ DFhackCExport command_result plugin_shutdown(color_ostream& out) { DFhackCExport command_result plugin_onupdate(color_ostream& out) { static bool wasLoaded = false; - if ( factor == 1 || !df::global::world || !df::global::world->map.block_index ) { + if ( factor == 1 || !world || !world->map.block_index ) { if ( wasLoaded ) { //we just unloaded the game: clear all data factor = 1; @@ -58,10 +61,10 @@ DFhackCExport command_result plugin_onupdate(color_ostream& out) { } count = 0; - int32_t race_id = df::global::ui->race_id; - int32_t civ_id = df::global::ui->civ_id; - for ( size_t a = 0; a < df::global::world->units.all.size(); a++ ) { - df::unit* unit = df::global::world->units.all[a]; //TODO: consider units.active + int32_t race_id = ui->race_id; + int32_t civ_id = ui->civ_id; + for ( size_t a = 0; a < world->units.all.size(); a++ ) { + df::unit* unit = world->units.all[a]; //TODO: consider units.active //living, native units only if ( unit->race != race_id || unit->civ_id != civ_id ) continue; @@ -153,7 +156,7 @@ DFhackCExport command_result plugin_enable(color_ostream &out, bool enable) } command_result misery(color_ostream &out, vector& parameters) { - if ( !df::global::world || !df::global::world->map.block_index ) { + if ( !world || !world->map.block_index ) { out.printerr("misery can only be enabled in fortress mode with a fully-loaded game.\n"); return CR_FAILURE; } @@ -184,7 +187,7 @@ command_result misery(color_ostream &out, vector& parameters) { for ( size_t a = 0; a < fakeThoughts.size(); a++ ) { int dorfIndex = fakeThoughts[a].first; int thoughtIndex = fakeThoughts[a].second; - df::global::world->units.all[dorfIndex]->status.recent_events[thoughtIndex]->age = 1000000; + world->units.all[dorfIndex]->status.recent_events[thoughtIndex]->age = 1000000; } fakeThoughts.clear(); } else { diff --git a/plugins/mousequery.cpp b/plugins/mousequery.cpp index 0fe337017..95ba0a6cb 100644 --- a/plugins/mousequery.cpp +++ b/plugins/mousequery.cpp @@ -23,6 +23,7 @@ using df::global::world; using df::global::ui; +using df::global::ui_build_selector; using namespace df::enums::ui_sidebar_mode; @@ -330,9 +331,9 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest break; case Build: - if (df::global::ui_build_selector) + if (ui_build_selector) { - if (df::global::ui_build_selector->stage < 2) + if (ui_build_selector->stage < 2) { designationMode = true; key = df::interface_key::SELECT; @@ -502,9 +503,9 @@ struct mousequery_hook : public df::viewscreen_dwarfmodest bool inBuildPlacement() { - return df::global::ui_build_selector && - df::global::ui_build_selector->building_type != -1 && - df::global::ui_build_selector->stage == 1; + return ui_build_selector && + ui_build_selector->building_type != -1 && + ui_build_selector->stage == 1; } bool shouldTrack() diff --git a/plugins/petcapRemover.cpp b/plugins/petcapRemover.cpp index f0116131e..44870eb76 100644 --- a/plugins/petcapRemover.cpp +++ b/plugins/petcapRemover.cpp @@ -20,6 +20,8 @@ using namespace DFHack; using namespace std; +using df::global::world; + static int32_t howOften = 10000; static int32_t popcap = 100; static int32_t pregtime = 200000; @@ -58,7 +60,7 @@ void impregnateMany() { map > males; map > females; map popcount; - auto units = df::global::world->units.all; + auto units = world->units.all; for ( size_t a = 0; a < units.size(); a++ ) { df::unit* unit = units[a]; if ( unit->flags1.bits.dead || unit->flags1.bits.active_invader || unit->flags2.bits.underworld || unit->flags2.bits.visitor_uninvited || unit->flags2.bits.visitor ) @@ -74,7 +76,7 @@ void impregnateMany() { continue; int32_t race = unit->race; int16_t caste = unit->caste; - df::creature_raw* creatureRaw = df::global::world->raws.creatures.all[race]; + df::creature_raw* creatureRaw = world->raws.creatures.all[race]; df::caste_raw* casteRaw = creatureRaw->caste[caste]; //must have PET or PET_EXOTIC if ( !(casteRaw->flags.is_set(df::enums::caste_raw_flags::PET) || casteRaw->flags.is_set(df::enums::caste_raw_flags::PET_EXOTIC) ) ) diff --git a/plugins/remotefortressreader.cpp b/plugins/remotefortressreader.cpp index 411b0b646..6254a9ad8 100644 --- a/plugins/remotefortressreader.cpp +++ b/plugins/remotefortressreader.cpp @@ -49,6 +49,8 @@ using namespace df::enums; using namespace RemoteFortressReader; using namespace std; +using df::global::world; + // Here go all the command declarations... // mostly to allow having the mandatory stuff on top of the file and commands on the bottom @@ -120,9 +122,9 @@ uint16_t fletcher16(uint8_t const *data, size_t bytes) static command_result CheckHashes(color_ostream &stream, const EmptyMessage *in) { clock_t start = clock(); - for (int i = 0; i < df::global::world->map.map_blocks.size(); i++) + for (int i = 0; i < world->map.map_blocks.size(); i++) { - df::map_block * block = df::global::world->map.map_blocks[i]; + df::map_block * block = world->map.map_blocks[i]; fletcher16((uint8_t*)(block->tiletype), 16 * 16 * sizeof(df::enums::tiletype::tiletype)); } clock_t end = clock(); @@ -150,7 +152,7 @@ static command_result GetMaterialList(color_ostream &stream, const EmptyMessage - df::world_raws *raws = &df::global::world->raws; + df::world_raws *raws = &world->raws; MaterialInfo mat; for (int i = 0; i < raws->inorganics.size(); i++) { @@ -248,4 +250,4 @@ static command_result GetBlockList(color_ostream &stream, const BlockRequest *in } } return CR_OK; -} \ No newline at end of file +} diff --git a/plugins/search.cpp b/plugins/search.cpp index 848c65eaf..b4d5d6cc0 100644 --- a/plugins/search.cpp +++ b/plugins/search.cpp @@ -39,6 +39,7 @@ using namespace df::enums; using df::global::gps; using df::global::gview; +using df::global::ui; /* Search Plugin @@ -1575,7 +1576,6 @@ IMPLEMENT_HOOKS(df::viewscreen_joblistst, joblist_search); // // START: Burrow assignment search // -using df::global::ui; typedef search_twocolumn_modifiable burrow_search_base; class burrow_search : public burrow_search_base diff --git a/plugins/siege-engine.cpp b/plugins/siege-engine.cpp index 9a4ee2054..b3e5a208d 100644 --- a/plugins/siege-engine.cpp +++ b/plugins/siege-engine.cpp @@ -70,6 +70,7 @@ using df::global::gps; using df::global::world; using df::global::ui; using df::global::ui_build_selector; +using df::global::process_jobs; using Screen::Pen; @@ -1505,8 +1506,8 @@ static void releaseTiredWorker(EngineInfo *engine, df::job *job, df::unit *worke color_ostream_proxy out(Core::getInstance().getConsole()); out.print("Released tired operator %d from siege engine.\n", worker->id); - if (df::global::process_jobs) - *df::global::process_jobs = true; + if (process_jobs) + *process_jobs = true; } return; diff --git a/plugins/steam-engine.cpp b/plugins/steam-engine.cpp index f8aed6704..138de3916 100644 --- a/plugins/steam-engine.cpp +++ b/plugins/steam-engine.cpp @@ -121,6 +121,7 @@ using df::global::gps; using df::global::world; using df::global::ui; using df::global::ui_build_selector; +using df::global::cursor; DFHACK_PLUGIN("steam-engine"); @@ -833,8 +834,6 @@ struct dwarfmode_hook : df::viewscreen_dwarfmodest void check_hanging_tiles(steam_engine_workshop *engine) { - using df::global::cursor; - if (!engine) return; bool error = false; diff --git a/plugins/stockflow.cpp b/plugins/stockflow.cpp index adff25a04..1e937a719 100644 --- a/plugins/stockflow.cpp +++ b/plugins/stockflow.cpp @@ -59,7 +59,7 @@ class LuaHelper { public: void cycle(color_ostream &out) { bool found = false; - for (df::job_list_link* link = &df::global::world->job_list; link != NULL; link = link->next) { + for (df::job_list_link* link = &world->job_list; link != NULL; link = link->next) { if (link->item == NULL) continue; if (link->item->job_type == job_type::UpdateStockpileRecords) { found = true; diff --git a/plugins/strangemood.cpp b/plugins/strangemood.cpp index 81840b67b..e1cedbfe3 100644 --- a/plugins/strangemood.cpp +++ b/plugins/strangemood.cpp @@ -40,6 +40,7 @@ using df::global::created_item_type; using df::global::created_item_subtype; using df::global::created_item_mattype; using df::global::created_item_matindex; +using df::global::debug_nomoods; Random::MersenneRNG rng; @@ -473,7 +474,7 @@ command_result df_strangemood (color_ostream &out, vector & parameters) out.printerr("ARTIFACTS are not enabled!\n"); return CR_FAILURE; } - if (*df::global::debug_nomoods) + if (*debug_nomoods) { out.printerr("Strange moods disabled via debug flag!\n"); return CR_FAILURE; diff --git a/plugins/tiletypes.cpp b/plugins/tiletypes.cpp index 103a2dcfb..b624b944f 100644 --- a/plugins/tiletypes.cpp +++ b/plugins/tiletypes.cpp @@ -44,6 +44,8 @@ using namespace MapExtras; using namespace DFHack; using namespace df::enums; +using df::global::world; + CommandHistory tiletypes_hist; command_result df_tiletypes (color_ostream &out, vector & parameters); @@ -738,7 +740,7 @@ command_result executePaintJob(color_ostream &out) out.print("working...\n"); // Force the game to recompute its walkability cache - df::global::world->reindex_pathfinding = true; + world->reindex_pathfinding = true; int failures = 0; diff --git a/plugins/treefarm.cpp b/plugins/treefarm.cpp index 7f619dbdc..6660b07f8 100644 --- a/plugins/treefarm.cpp +++ b/plugins/treefarm.cpp @@ -21,6 +21,9 @@ using namespace DFHack; +using df::global::world; +using df::global::ui; + void checkFarms(color_ostream& out, void* ptr); command_result treefarm (color_ostream &out, std::vector & parameters); @@ -66,8 +69,6 @@ void checkFarms(color_ostream& out, void* ptr) { EventManager::registerTick(handler, frequency, plugin_self); CoreSuspender suspend; - df::world* world = df::global::world; - df::ui* ui = df::global::ui; int32_t xOffset = world->map.region_x*3; int32_t yOffset = world->map.region_y*3; int32_t zOffset = world->map.region_z; diff --git a/plugins/tweak.cpp b/plugins/tweak.cpp index f6ecee913..477738a9c 100644 --- a/plugins/tweak.cpp +++ b/plugins/tweak.cpp @@ -1247,7 +1247,7 @@ static command_result tweak(color_ostream &out, vector ¶meters) if (!unit) return CR_FAILURE; - if(unit->race != df::global::ui->race_id) + if(unit->race != ui->race_id) { out << "Selected unit does not belong to your race!" << endl; return CR_FAILURE; @@ -1267,8 +1267,8 @@ static command_result tweak(color_ostream &out, vector ¶meters) // so it should not be triggered in most cases // if it happens that the player has 'foreign' units of the same race // (vanilla df: dwarves not from mountainhome) on his map, just grab them - if(unit->civ_id != df::global::ui->civ_id) - unit->civ_id = df::global::ui->civ_id; + if(unit->civ_id != ui->civ_id) + unit->civ_id = ui->civ_id; return fix_clothing_ownership(out, unit); } @@ -1286,8 +1286,8 @@ static command_result tweak(color_ostream &out, vector ¶meters) unit->flags1.bits.merchant = 0; if(unit->flags1.bits.forest) unit->flags1.bits.forest = 0; - if(unit->civ_id != df::global::ui->civ_id) - unit->civ_id = df::global::ui->civ_id; + if(unit->civ_id != ui->civ_id) + unit->civ_id = ui->civ_id; if(unit->profession == df::profession::MERCHANT) unit->profession = df::profession::TRADER; if(unit->profession2 == df::profession::MERCHANT) diff --git a/plugins/weather.cpp b/plugins/weather.cpp index 98476ef2c..e94f56dab 100644 --- a/plugins/weather.cpp +++ b/plugins/weather.cpp @@ -13,6 +13,8 @@ using std::string; using namespace DFHack; using namespace df::enums; +using df::global::current_weather; + bool locked = false; unsigned char locked_data[25]; @@ -84,7 +86,7 @@ command_result weather (color_ostream &con, vector & parameters) CoreSuspender suspend; - if(!df::global::current_weather) + if(!current_weather) { con << "Weather support seems broken :(" << std::endl; return CR_FAILURE; @@ -97,7 +99,7 @@ command_result weather (color_ostream &con, vector & parameters) { for(int x = 0; x<5;x++) { - switch((*df::global::current_weather)[x][y]) + switch((*current_weather)[x][y]) { case weather_type::None: con << "C "; @@ -109,7 +111,7 @@ command_result weather (color_ostream &con, vector & parameters) con << "S "; break; default: - con << (int) (*df::global::current_weather)[x][y] << " "; + con << (int) (*current_weather)[x][y] << " "; break; } } diff --git a/plugins/workNow.cpp b/plugins/workNow.cpp index 7c549f7f1..e8f34939a 100644 --- a/plugins/workNow.cpp +++ b/plugins/workNow.cpp @@ -14,6 +14,9 @@ using namespace std; using namespace DFHack; +using df::global::process_jobs; +using df::global::process_dig; + DFHACK_PLUGIN("workNow"); static int mode = 0; @@ -24,6 +27,9 @@ void jobCompletedHandler(color_ostream& out, void* ptr); EventManager::EventHandler handler(jobCompletedHandler,1); DFhackCExport command_result plugin_init(color_ostream& out, std::vector &commands) { + if (!process_jobs || !process_dig) + return CR_FAILURE; + commands.push_back(PluginCommand("workNow", "makes dwarves look for jobs whever they finish one, or every time you pause", workNow, false, "When workNow is active, every time the game pauses, DF will make dwarves perform any appropriate available jobs. This includes when you one step through the game using the pause menu. When workNow is in mode 2, it will make dwarves look for jobs every time a job completes.\n" "workNow\n" " print workNow status\n" @@ -53,8 +59,8 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan if ( e != DFHack::SC_PAUSED ) return CR_OK; - *df::global::process_jobs = true; - *df::global::process_dig = true; + *process_jobs = true; + *process_dig = true; return CR_OK; } @@ -88,6 +94,6 @@ void jobCompletedHandler(color_ostream& out, void* ptr) { if ( mode < 2 ) return; - *df::global::process_jobs = true; - *df::global::process_dig = true; + *process_jobs = true; + *process_dig = true; } diff --git a/plugins/zone.cpp b/plugins/zone.cpp index e631021d0..c88e82154 100644 --- a/plugins/zone.cpp +++ b/plugins/zone.cpp @@ -79,6 +79,18 @@ using df::global::cursor; using df::global::ui; using df::global::ui_build_selector; using df::global::gps; +using df::global::cur_year; +using df::global::cur_year_tick; + +using df::global::ui_building_item_cursor; +using df::global::ui_building_assign_type; +using df::global::ui_building_assign_is_marked; +using df::global::ui_building_assign_units; +using df::global::ui_building_assign_items; +using df::global::ui_building_in_assign; + +using df::global::ui_menu_width; +using df::global::ui_area_map_width; using namespace DFHack::Gui; @@ -360,8 +372,8 @@ int32_t getUnitAge(df::unit* unit) { // If the birthday this year has not yet passed, subtract one year. // ASSUMPTION: birth_time is on the same scale as cur_year_tick - int32_t yearDifference = *df::global::cur_year - unit->relations.birth_year; - if (unit->relations.birth_time >= *df::global::cur_year_tick) + int32_t yearDifference = *cur_year - unit->relations.birth_year; + if (unit->relations.birth_time >= *cur_year_tick) yearDifference--; return yearDifference; } @@ -529,12 +541,12 @@ bool isOwnRace(df::unit* unit) // todo: rename these two functions to "getRaceToken" since the output is more of a token string getRaceName(int32_t id) { - df::creature_raw *raw = df::global::world->raws.creatures.all[id]; + df::creature_raw *raw = world->raws.creatures.all[id]; return raw->creature_id; } string getRaceName(df::unit* unit) { - df::creature_raw *raw = df::global::world->raws.creatures.all[unit->race]; + df::creature_raw *raw = world->raws.creatures.all[unit->race]; return raw->creature_id; } @@ -542,18 +554,18 @@ string getRaceName(df::unit* unit) string getRaceNamePlural(int32_t id) { //WatchedRace * w = watched_races[idx]; - df::creature_raw *raw = df::global::world->raws.creatures.all[id]; + df::creature_raw *raw = world->raws.creatures.all[id]; return raw->name[1]; // second field is plural of race name } string getRaceBabyName(df::unit* unit) { - df::creature_raw *raw = df::global::world->raws.creatures.all[unit->race]; + df::creature_raw *raw = world->raws.creatures.all[unit->race]; return raw->general_baby_name[0]; } string getRaceChildName(df::unit* unit) { - df::creature_raw *raw = df::global::world->raws.creatures.all[unit->race]; + df::creature_raw *raw = world->raws.creatures.all[unit->race]; return raw->general_child_name[0]; } @@ -574,7 +586,7 @@ bool isAdult(df::unit* unit) bool isEggLayer(df::unit* unit) { - df::creature_raw *raw = df::global::world->raws.creatures.all[unit->race]; + df::creature_raw *raw = world->raws.creatures.all[unit->race]; size_t sizecas = raw->caste.size(); for (size_t j = 0; j < sizecas;j++) { @@ -588,7 +600,7 @@ bool isEggLayer(df::unit* unit) bool isGrazer(df::unit* unit) { - df::creature_raw *raw = df::global::world->raws.creatures.all[unit->race]; + df::creature_raw *raw = world->raws.creatures.all[unit->race]; size_t sizecas = raw->caste.size(); for (size_t j = 0; j < sizecas;j++) { @@ -601,7 +613,7 @@ bool isGrazer(df::unit* unit) bool isMilkable(df::unit* unit) { - df::creature_raw *raw = df::global::world->raws.creatures.all[unit->race]; + df::creature_raw *raw = world->raws.creatures.all[unit->race]; size_t sizecas = raw->caste.size(); for (size_t j = 0; j < sizecas;j++) { @@ -614,7 +626,7 @@ bool isMilkable(df::unit* unit) bool isTrainableWar(df::unit* unit) { - df::creature_raw *raw = df::global::world->raws.creatures.all[unit->race]; + df::creature_raw *raw = world->raws.creatures.all[unit->race]; size_t sizecas = raw->caste.size(); for (size_t j = 0; j < sizecas;j++) { @@ -627,7 +639,7 @@ bool isTrainableWar(df::unit* unit) bool isTrainableHunting(df::unit* unit) { - df::creature_raw *raw = df::global::world->raws.creatures.all[unit->race]; + df::creature_raw *raw = world->raws.creatures.all[unit->race]; size_t sizecas = raw->caste.size(); for (size_t j = 0; j < sizecas;j++) { @@ -640,7 +652,7 @@ bool isTrainableHunting(df::unit* unit) bool isTamable(df::unit* unit) { - df::creature_raw *raw = df::global::world->raws.creatures.all[unit->race]; + df::creature_raw *raw = world->raws.creatures.all[unit->race]; size_t sizecas = raw->caste.size(); for (size_t j = 0; j < sizecas;j++) { @@ -3162,7 +3174,7 @@ command_result df_autobutcher(color_ostream &out, vector & parameters) for(size_t i=0; iraws.creatures.all[w->raceId]; + df::creature_raw * raw = world->raws.creatures.all[w->raceId]; string name = raw->creature_id; if(w->isWatched) out << "watched: "; @@ -3204,7 +3216,7 @@ command_result df_autobutcher(color_ostream &out, vector & parameters) for(size_t i=0; iraws.creatures.all[w->raceId]; + df::creature_raw * raw = world->raws.creatures.all[w->raceId]; string name = raw->creature_id; out << run << "target" @@ -3300,7 +3312,7 @@ command_result df_autobutcher(color_ostream &out, vector & parameters) else { // map race names from parameter list to ids - size_t num_races = df::global::world->raws.creatures.all.size(); + size_t num_races = world->raws.creatures.all.size(); while(target_racenames.size()) { bool found_race = false; @@ -4079,13 +4091,6 @@ DFHACK_PLUGIN_LUA_COMMANDS { //START zone filters -using df::global::ui_building_item_cursor; -using df::global::ui_building_assign_type; -using df::global::ui_building_assign_is_marked; -using df::global::ui_building_assign_units; -using df::global::ui_building_assign_items; - -using df::global::ui_building_in_assign; void OutputString(int8_t color, int &x, int y, const std::string &text) { @@ -4318,8 +4323,8 @@ public: return; int left_margin = gps->dimx - 30; - int8_t a = *df::global::ui_menu_width; - int8_t b = *df::global::ui_area_map_width; + int8_t a = *ui_menu_width; + int8_t b = *ui_area_map_width; if ((a == 1 && b > 1) || (a == 2 && b == 2)) left_margin -= 24;