ref: d3e18d795d59fb2f380dd1df1faf2d95dece8ef4
parent: 4e936d4f45dea500a1d20a1b7c3eceadf078cbb0
parent: 620a25d75c2a9a307543b5abf2612c2ea38d5967
author: Clownacy <Clownacy@users.noreply.github.com>
date: Thu Sep 17 18:10:24 EDT 2020
Merge branch 'accurate' into portable
--- a/src/Back.cpp
+++ b/src/Back.cpp
@@ -18,12 +18,15 @@
// TODO - Another function that has an incorrect stack frame
BOOL InitBack(const char *fName, int type)
{
+ std::string path;
+ FILE *fp;
+
color_black = GetCortBoxColor(RGB(0, 0, 0x10)); // Unused. This may have once been used by background type 4 (the solid black background)
// We're not actually loading the bitmap here - we're just reading its width/height and making sure it's really a BMP file
- std::string path = gDataPath + '/' + fName + ".pbm";
+ path = gDataPath + '/' + fName + ".pbm";
- FILE *fp = fopen(path.c_str(), "rb");
+ fp = fopen(path.c_str(), "rb");
if (fp == NULL)
return FALSE;
--- a/src/Draw.cpp
+++ b/src/Draw.cpp
@@ -582,23 +582,24 @@
// Dummied-out log function
// According to the Mac port, its name really is just "out".
-BOOL out(int unknown)
+BOOL out(char surface_identifier)
{
- char unknown2[0x100];
- int unknown3;
- int unknown4;
- int unknown5;
+ // The actual name (and type) of these two variables are unknown
+ std::string path;
+ FILE *fp;
- (void)unknown;
- (void)unknown2;
- (void)unknown3;
- (void)unknown4;
- (void)unknown5;
+ (void)surface_identifier;
+ (void)path;
+ (void)fp;
+ // There may have been some kind of 'OutputDebugStringA' call here,
+ // like the one in 'EnumDevices_Callback' in 'Input.cpp'.
+ // Pixel may have kept them wrapped in '#ifdef DEBUG' blocks.
+
return TRUE;
}
-// TODO - Probably not the original variable name (this is an educated guess)
+// TODO - Probably not the original function name (this is an educated guess)
int RestoreSurfaces(void)
{
int s;
--- a/src/GenericLoad.cpp
+++ b/src/GenericLoad.cpp
@@ -292,8 +292,12 @@
pt_size += MakePixToneObject(&gPtpTable[138], 1, 7);
// Commented-out, since ints *technically* have an undefined length
- // char str[0x40];
- // sprintf(str, "PixTone = %d byte", pt_size);
- // There must have been some kind of console print function here or something
+/*
+ char str[0x40];
+ sprintf(str, "PixTone = %d byte", pt_size);
+ // There must have once been a 'OutputDebugStringA' call here or something.
+ // See 'EnumDevices_Callback' in 'Input.cpp' for an example of this.
+*/
+
return TRUE;
}