Skip to content

Commit

Permalink
Merge pull request #4 from 8street/fix_tile_view
Browse files Browse the repository at this point in the history 
Fix tile view
  • Loading branch information
@8street
8street authored Feb 17, 2021
2 parents 15c298d + da5fc9a commit 3a6e914
Show file tree
Hide file tree
Showing 14 changed files with 673 additions and 51 deletions.
6 changes: 6 additions & 0 deletions msvc/BedlamTools.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,9 @@
<ItemGroup>
<ClCompile Include="..\src\bedlamtools.cpp" />
<ClCompile Include="..\src\Bedlam_func.cpp" />
<ClCompile Include="..\src\bin_file.cpp" />
<ClCompile Include="..\src\file.cpp" />
<ClCompile Include="..\src\helper.cpp" />
<ClCompile Include="..\src\main.cpp" />
<ClCompile Include="..\src\openfile.cpp" />
<ClCompile Include="..\src\stdafx.cpp">
Expand All @@ -167,6 +170,9 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\bin_file.h" />
<ClInclude Include="..\src\file.h" />
<ClInclude Include="..\src\helper.h" />
<ClInclude Include="..\src\stdafx.h" />
<ClInclude Include="..\src\ui_bedlamtools.h" />
<ClInclude Include="..\src\ui_openfile.h" />
Expand Down
18 changes: 18 additions & 0 deletions msvc/BedlamTools.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,15 @@
<ClCompile Include="..\src\Bedlam_func.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\bin_file.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\file.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\helper.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\Bedlam_func.h">
Expand All @@ -66,6 +75,15 @@
<ClInclude Include="..\src\ui_openfile.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\bin_file.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\file.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\helper.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<QtMoc Include="..\src\bedlamtools.h">
Expand Down
4 changes: 2 additions & 2 deletions qt/bedlamtools.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<item>
<widget class="QSpinBox" name="spinBox_img">
<property name="minimum">
<number>1</number>
<number>0</number>
</property>
<property name="maximum">
<number>9999</number>
Expand All @@ -97,7 +97,7 @@
<number>1</number>
</property>
<property name="value">
<number>1</number>
<number>0</number>
</property>
</widget>
</item>
Expand Down
304 changes: 300 additions & 4 deletions src/Bedlam_func.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

#include <cstring>
#include "Bedlam_func.h"
#include "helper.h"

//00401E39
void draw_IMG_in_buffer(int32_t image_number, int16_t transparent, int32_t x_pos, int32_t y_pos, uint8_t* buffer, uint8_t* bin_ptr)
Expand Down Expand Up @@ -186,8 +187,303 @@ void draw_IMG_in_buffer(int32_t image_number, int16_t transparent, int32_t x_pos
}
}

//no present
bool bittest(int32_t value, int32_t bit)
//00401471
void draw_tile(int32_t img_num, int32_t ofst, uint8_t* palette, uint8_t* screen_pos, const uint8_t* bin_ptr)
{
return value & (1 << bit);
}
const uint8_t* img_adr; // esi
const uint8_t* img_ptr; // esi
const uint8_t* v7; // esi
int v8; // edx
int v9; // edx
const uint8_t* v11; // esi
uint8_t* v12; // edi
const uint8_t* v13; // esi
int v14; // ebx
int j; // edx
int v16; // ecx
unsigned int v17; // ecx
char v18; // cf
unsigned int v19; // ecx
unsigned int v20; // ecx
const uint8_t* line_ofst_ptr; // esi
int line_ofst; // edx
int img_ofst; // edx
const uint8_t* v24; // esi
uint8_t* screen_pos_1; // edi
const uint8_t* v26; // esi
int v27; // ebx
int i; // edx
unsigned int v29; // ecx
unsigned int v30; // ecx
unsigned int v31; // ecx
int v32; // eax
const uint8_t* v36; // esi
int v37; // ecx
int v38; // edx
int v39; // ecx
int v40; // ecx
int v44; // [esp-Ch] [ebp-Ch]
int v45; // [esp-8h] [ebp-8h]
int v46; // [esp-8h] [ebp-8h]
uint8_t* v47; // [esp-4h] [ebp-4h]
uint8_t* v48; // [esp-4h] [ebp-4h]
uint8_t* palette_ptr = palette;

const int const1_1 = 1;

uint16_t unkn1;
uint32_t unkn2;
uint16_t unkn3;
uint32_t unkn4;
uint32_t unkn6;

img_adr = &bin_ptr[4 * img_num + 2];
img_ptr = &img_adr[*(uint32_t*)img_adr];
if (*(unsigned __int16*)img_ptr >= 4u)
{
line_ofst_ptr = img_ptr + 2;
line_ofst = 640 * *(unsigned __int16*)line_ofst_ptr;
line_ofst_ptr += 2;
img_ofst = *(unsigned __int16*)line_ofst_ptr + line_ofst;
line_ofst_ptr += 2;
line_ofst = *(uint16_t*)line_ofst_ptr;
v24 = line_ofst_ptr + 2;
if (line_ofst)
{
screen_pos_1 = &screen_pos[img_ofst];
unkn1 = *(unsigned __int16*)v24;
v26 = v24 + 2;
v27 = unkn1;
if (unkn1)
{
if (palette_ptr && const1_1)
{
LABEL_37:
while (2)
{
v47 = screen_pos_1;
while (1)
{
while (1)
{
ofst &= 0xFFFFFF00;
ofst |= *v26++;
v44 = ofst;
if (bittest(v44, 7u))
break;
ofst = (ofst & 0x3F) + 1;
v45 = v27;
do
{
*screen_pos_1 = palette_ptr[*v26];
++v26;
++screen_pos_1;
--ofst;
} while (ofst);
v27 = v45;
if (bittest(v44, 6u))
{
screen_pos_1 = v47 + 640;
v27 = v45 - 1;
if (v45 != 1)
goto LABEL_37;
return;
}
}
if (bittest(ofst, 6u))
break;
screen_pos_1 += (ofst & 0x3F) + 1;
}
screen_pos_1 = v47 + 640;
if (--v27)
continue;
break;
}
}
else
{
LABEL_24:
while (2)
{
for (i = 640; ; i -= v32)
{
while (1)
{
ofst &= 0xFFFFFF00;
ofst |= *v26++;
unkn2 = ofst;
if (bittest(unkn2, 7u))
break;
v29 = (ofst & 0x3F) + 1;
i -= v29;
v18 = v29 & 1;
v30 = v29 >> 1;
if (v18)
*screen_pos_1++ = *v26++;
v18 = v30 & 1;
v31 = v30 >> 1;
if (v18)
{
*(uint16_t*)screen_pos_1 = *(uint16_t*)v26;
v26 += 2;
screen_pos_1 += 2;
}
memcpy(screen_pos_1, v26, 4 * v31);
v26 += 4 * v31;
screen_pos_1 += 4 * v31;
ofst = 0;
if (bittest(unkn2, 6u))
{
screen_pos_1 += i;
if (--v27)
goto LABEL_24;
return;
}
}
if (bittest(ofst, 6u))
break;
v32 = (ofst & 0x3F) + 1;
screen_pos_1 += v32;
}
screen_pos_1 += i;
if (--v27)
continue;
break;
}
}
}
}
}
else if (*(uint16_t*)img_ptr)
{
v7 = img_ptr + 2;
v8 = 640 * *(unsigned __int16*)v7;
v7 += 2;
v9 = *(unsigned __int16*)v7 + v8;
v7 += 2;
unkn3 = *(unsigned __int16*)v7;
v11 = v7 + 2;
if (unkn3)
{
v12 = &screen_pos[v9];
unkn3 = *(unsigned __int16*)v11;
v13 = v11 + 2;
v14 = unkn3;
if (unkn3)
{
if (palette_ptr && const1_1)
{
LABEL_55:
while (2)
{
v48 = v12;
while (1)
{
while (1)
{
v39 = *(unsigned __int16*)v13;
v13 += 2;
unkn4 = v39;
if (bittest(unkn4, 0xFu))
break;
v40 = v39 & 0xFFF;
v46 = v14;
do
{
*v12 = palette_ptr[*v13];
++v13;
++v12;
--v40;
} while (v40);
v14 = v46;
if (bittest(unkn4, 0xEu))
{
v12 = v48 + 640;
v14 = v46 - 1;
if (v46 != 1)
goto LABEL_55;
return;
}
}
if (bittest(v39, 0xEu))
break;
v12 += v39 & 0xFFF;
}
v12 = v48 + 640;
if (--v14)
continue;
break;
}
}
else
{
LABEL_7:
while (2)
{
for (j = 640; ; j -= v16 & 0xFFF)
{
while (1)
{
v16 = *(unsigned __int16*)v13;
v13 += 2;
unkn6 = v16;
if (bittest(unkn6, 0xFu))
break;
v17 = v16 & 0xFFF;
j -= v17;
v18 = v17 & 1;
v19 = v17 >> 1;
if (v18)
*v12++ = *v13++;
v18 = v19 & 1;
v20 = v19 >> 1;
if (v18)
{
*(uint16_t*)v12 = *(uint16_t*)v13;
v13 += 2;
v12 += 2;
}
memcpy(v12, v13, 4 * v20);
v13 += 4 * v20;
v12 += 4 * v20;
if (bittest(unkn6, 0xEu))
{
v12 += j;
if (--v14)
goto LABEL_7;
return;
}
}
if (bittest(v16, 0xEu))
break;
v12 += v16 & 0xFFF;
}
v12 += j;
if (--v14)
continue;
break;
}
}
}
}
}
else
{
v36 = img_ptr + 6;
v37 = 64;
do
{
v38 = 64;
do
{
if (*v36)
*screen_pos = *v36;
++v36;
++screen_pos;
--v38;
} while (v38);
screen_pos += 576;
--v37;
} while (v37);
}
}
2 changes: 1 addition & 1 deletion src/Bedlam_func.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
#include "stdafx.h"

void draw_IMG_in_buffer(int32_t image_number, int16_t transparent, int32_t x_pos, int32_t y_pos, uint8_t* buffer, uint8_t* bin_ptr);
bool bittest(int32_t value, int32_t bit);
void draw_tile(int32_t img_num, int32_t ofst, uint8_t* palette, uint8_t* screen_pos, const uint8_t* bin_ptr);
Loading

0 comments on commit 3a6e914

Please sign in to comment.