Skip to content

04704 for win, linux, osx #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thurin wants to merge 5 commits into
base: master
Choose a base branch
from
Open

04704 for win, linux, osx #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9b9faf2
combine nshcat and indivisible 04702 and 04703 patches with new 04703…
thurin Feb 20, 2020
d97cc59
04704 osx WIP
thurin Mar 1, 2020
1e94a0d
04704 linux WIP
thurin Mar 1, 2020
38cae37
04704 windows WIP
thurin Mar 1, 2020
1463d16
update for new dfhack item and building enums
thurin Aug 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions legacy/renderer_legacy.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ static void write_tile_arrays_legacy(df::renderer *r, int x, int y, GLfloat *fg,
{
override_group &og = *it;

auto ilist = world->items.other[og.other_id];
auto ilist = world->items.other[(df::enums::items_other_id::items_other_id) og.other_id];
for (auto it2 = ilist.begin(); it2 != ilist.end(); it2++)
{
df::item *item = *it2;
Expand Down Expand Up @@ -286,7 +286,7 @@ static void write_tile_arrays_legacy(df::renderer *r, int x, int y, GLfloat *fg,
{
override_group &og = *it;

auto ilist = world->buildings.other[og.other_id];
auto ilist = world->buildings.other[(df::enums::buildings_other_id::buildings_other_id) og.other_id];
for (auto it2 = ilist.begin(); it2 != ilist.end(); it2++)
{
df::building *bld = *it2;
Expand Down
129 changes: 129 additions & 0 deletions patches.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1311,6 +1311,135 @@ static void apply_patch(MemoryPatcher *mp, patchdef &p)
0x10a2f30, 5, true, { 0x41, 0xc6, 0x00, 0x00, 0xc3 }
};
#endif
#elif defined(DF_04702)
#ifdef WIN32
#define A_LOAD_MULTI_PDIM 0x140c1e5d0
#define A_RENDER_MAP 0x1409d72d0
#define A_RENDER_UPDOWN 0x1406ef250

static patchdef p_display = { 0x140478aab, 5 };

static patchdef p_dwarfmode_render = { 0x14042c88a, 5 };

static patchdef p_advmode_render[] = {
{ 0x14037180a, 5+7+5 }, { 0x140371871, 5+7+5 }, { 0x1403718d7, 5+7+5 }, { 0x140371e02, 5+7+5 }
};

static patchdef p_render_lower_levels = {
0x140d72de0, 9, true, { 0x48, 0x8b, 0x44, 0x24, 0x28, 0xc6, 0x00, 0x00, 0xc3 }
};
#elif defined(__APPLE__)
#error Mac OSX not currently supported for 0.47.02
#else
#define A_RENDER_MAP 0xec8270
#define A_RENDER_UPDOWN 0xc87720
#define NO_DISPLAY_PATCH

static patchdef p_dwarfmode_render = { 0x774035, 5 };

static patchdef p_advmode_render[] = {
{ 0x740142, 5+5+5 }, { 0x74076a, 5+5+5 }, { 0x7407a9, 5+5+5 }, { 0x740802, 5+5+5 }
};

static patchdef p_render_lower_levels = {
0x1154050, 5, true, { 0x41, 0xc6, 0x00, 0x00, 0xc3 }
};
#endif
#elif defined(DF_04703)
#ifdef WIN32
#define A_LOAD_MULTI_PDIM 0x140c1f2c0
#define A_RENDER_MAP 0x1409d7fa0
#define A_RENDER_UPDOWN 0x1406efeb0

static patchdef p_display = { 0x1404796ab, 5 };

static patchdef p_dwarfmode_render = { 0x14042d48a, 5 };

static patchdef p_advmode_render[] = {
{ 0x1403723fa, 5+7+5 }, { 0x140372461, 5+7+5 }, { 0x1403724c7, 5+7+5 }, { 0x1403729f2, 5+7+5 }
};

static patchdef p_render_lower_levels = {
0x140d74290, 9, true, { 0x48, 0x8b, 0x44, 0x24, 0x28, 0xc6, 0x00, 0x00, 0xc3 }
};
#elif defined(__APPLE__)
#define A_LOAD_MULTI_PDIM 0x101371660
#define A_RENDER_MAP 0x100c1c890
#define A_RENDER_UPDOWN 0x100973f90

static patchdef p_display = { 0x101303bdb, 5 };

static patchdef p_dwarfmode_render = { 0x10054036a, 5 };

static patchdef p_advmode_render[] = {
{ 0x1004db7bf, 5+3+5 }, { 0x1004db860, 5+7+5 }, { 0x1004dbdda, 5+3+5 }, { 0x1004dc0ea, 5+3+5 }
};

static patchdef p_render_lower_levels = {
0x100ec6c70, 5, true, { 0x41, 0xc6, 0x00, 0x00, 0xc3 }
};
#else
#define A_RENDER_MAP 0xec8f40
#define A_RENDER_UPDOWN 0xc88f90
#define NO_DISPLAY_PATCH

static patchdef p_dwarfmode_render = { 0x774755, 5 };

static patchdef p_advmode_render[] = {
{ 0x740882, 5+5+5 }, { 0x740eaa, 5+5+5 }, { 0x740ee9, 5+5+5 }, { 0x740f42, 5+5+5 }
};

static patchdef p_render_lower_levels = {
0x1155720, 5, true, { 0x41, 0xc6, 0x00, 0x00, 0xc3 }
};
#endif
#elif defined(DF_04704)
#ifdef WIN32
#define A_LOAD_MULTI_PDIM 0x140c1f670
#define A_RENDER_MAP 0x1409d8200
#define A_RENDER_UPDOWN 0x1406f0090

static patchdef p_display = { 0x140479beb, 5 };

static patchdef p_dwarfmode_render = { 0x14042d93a, 5 };

static patchdef p_advmode_render[] = {
{ 0x14037283a, 5+7+5 }, { 0x1403728a1, 5+7+5 }, { 0x140372907, 5+7+5 }, { 0x140372e32, 5+7+5 }
};

static patchdef p_render_lower_levels = {
0x140d747c0, 9, true, { 0x48, 0x8b, 0x44, 0x24, 0x28, 0xc6, 0x00, 0x00, 0xc3 }
};
#elif defined(__APPLE__)
#define A_LOAD_MULTI_PDIM 0x101373670
#define A_RENDER_MAP 0x100c1e120
#define A_RENDER_UPDOWN 0x100975820

static patchdef p_display = { 0x101305beb, 5 };

static patchdef p_dwarfmode_render = { 0x10054180a, 5 };

static patchdef p_advmode_render[] = {
{ 0x1004dcb2f, 5+3+5 }, { 0x1004dcbd0, 5+7+5 }, { 0x1004dd14a, 5+3+5 }, { 0x1004dd45a, 5+3+5 }
};

static patchdef p_render_lower_levels = {
0x100ec89c0, 5, true, { 0x41, 0xc6, 0x00, 0x00, 0xc3 }
};
#else
#define A_RENDER_MAP 0xec9420
#define A_RENDER_UPDOWN 0xc895f0
#define NO_DISPLAY_PATCH

static patchdef p_dwarfmode_render = { 0x774cf5, 5 };
static patchdef p_advmode_render[] = {
{ 0x740fb2, 5+5+5 }, { 0x7415da, 5+5+5 }, { 0x741619, 5+5+5 }, { 0x741672, 5+5+5 }
};

static patchdef p_render_lower_levels = {
0x1156420, 5, true, { 0x41, 0xc6, 0x00, 0x00, 0xc3 }
};
#endif

#else
#error Unsupported DF version
Expand Down
4 changes: 2 additions & 2 deletions tileupdate_map.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ static void write_tile_arrays_map(renderer_cool *r, int x, int y, GLfloat *fg, G
{
override_group &og = *it;

auto &ilist = world->items.other[og.other_id];
auto &ilist = world->items.other[(df::enums::items_other_id::items_other_id) og.other_id];
for (auto it2 = ilist.begin(); it2 != ilist.end(); it2++)
{
df::item *item = *it2;
Expand Down Expand Up @@ -202,7 +202,7 @@ static void write_tile_arrays_map(renderer_cool *r, int x, int y, GLfloat *fg, G
{
override_group &og = *it;

auto &ilist = world->buildings.other[og.other_id];
auto &ilist = world->buildings.other[(df::enums::buildings_other_id::buildings_other_id) og.other_id];
for (auto it2 = ilist.begin(); it2 != ilist.end(); it2++)
{
df::building *bld = *it2;
Expand Down