eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into replace-filelength

This commit is contained in:
Jan Šimek 2022-05-28 22:43:07 +02:00
parent 7a58904aa4 442e0a17ab
commit 100bf07f44
11 changed files with 132 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core.cc
View File

@ -8,6 +8,7 @@
#include "memory.h"
#include "mmx.h"
#include "text_font.h"
#include "win32.h"
#include "window_manager.h"
#include "window_manager_private.h"

1
src/core.h
View File

@ -465,7 +465,6 @@ extern InputEvent gInputEventQueue[40];
extern STRUCT_6ABF50 _GNW95_key_time_stamps[SDL_NUM_SCANCODES];
extern int _input_mx;
extern int _input_my;
extern HHOOK _GNW95_keyboardHandle;
extern bool gPaused;
extern int gScreenshotKeyCode;
extern int _using_msec_timer;

8
src/db.cc
View File

@ -635,10 +635,10 @@ int fileNameListInit(const char* pattern, char*** fileNameListPtr, int a3, int a
for (int index = 0; index < fileNamesLength; index += 1) {
const char* name = xlist->fileNames[index];
char dir[_MAX_DIR];
char fileName[_MAX_FNAME];
char extension[_MAX_EXT];
_splitpath(name, NULL, dir, fileName, extension);
char dir[COMPAT_MAX_DIR];
char fileName[COMPAT_MAX_FNAME];
char extension[COMPAT_MAX_EXT];
compat_splitpath(name, NULL, dir, fileName, extension);
bool v2 = false;
if (v1) {

2
src/dinput.h
View File

@ -1,8 +1,6 @@
#ifndef DINPUT_H
#define DINPUT_H
#include "win32.h"
typedef struct MouseData {
int x;
int y;

51
src/font_manager.cc
View File

@ -94,32 +94,32 @@ int interfaceFontLoad(int font_index)
int sig;
if (fileRead(&sig, 4, 1, stream) != 1) goto err;
sig = _byteswap_ulong(sig);
interfaceFontByteSwapInt32(&sig);
if (sig != 0x41414646) goto err;
if (fileRead(&(fontDescriptor->field_0), 2, 1, stream) != 1) goto err;
fontDescriptor->field_0 = _byteswap_ushort(fontDescriptor->field_0);
interfaceFontByteSwapInt16(&(fontDescriptor->field_0));
if (fileRead(&(fontDescriptor->letterSpacing), 2, 1, stream) != 1) goto err;
fontDescriptor->letterSpacing = _byteswap_ushort(fontDescriptor->letterSpacing);
interfaceFontByteSwapInt16(&(fontDescriptor->letterSpacing));
if (fileRead(&(fontDescriptor->wordSpacing), 2, 1, stream) != 1) goto err;
fontDescriptor->wordSpacing = _byteswap_ushort(fontDescriptor->wordSpacing);
interfaceFontByteSwapInt16(&(fontDescriptor->wordSpacing));
if (fileRead(&(fontDescriptor->field_6), 2, 1, stream) != 1) goto err;
fontDescriptor->field_6 = _byteswap_ushort(fontDescriptor->field_6);
interfaceFontByteSwapInt16(&(fontDescriptor->field_6));
for (int index = 0; index < 256; index++) {
InterfaceFontGlyph* glyph = &(fontDescriptor->glyphs[index]);
if (fileRead(&(glyph->width), 2, 1, stream) != 1) goto err;
glyph->width = _byteswap_ushort(glyph->width);
interfaceFontByteSwapInt16(&(glyph->width));
if (fileRead(&(glyph->field_2), 2, 1, stream) != 1) goto err;
glyph->field_2 = _byteswap_ushort(glyph->field_2);
interfaceFontByteSwapInt16(&(glyph->field_2));
if (fileRead(&(glyph->field_4), 4, 1, stream) != 1) goto err;
glyph->field_4 = _byteswap_ulong(glyph->field_4);
interfaceFontByteSwapInt32(&(glyph->field_4));
}
fileSize -= sizeof(InterfaceFontDescriptor);
@ -335,3 +335,38 @@ void interfaceFontDrawImpl(unsigned char* buf, const char* string, int length, i
_freeColorBlendTable(color & 0xFF);
}
// NOTE: Inlined.
//
// 0x442520
void interfaceFontByteSwapUInt32(unsigned int* value)
{
unsigned int swapped = *value;
unsigned short high = swapped >> 16;
// NOTE: Uninline.
interfaceFontByteSwapUInt16(&high);
unsigned short low = swapped & 0xFFFF;
// NOTE: Uninline.
interfaceFontByteSwapUInt16(&low);
*value = (low << 16) | high;
}
// NOTE: 0x442520 with different signature.
void interfaceFontByteSwapInt32(int* value)
{
interfaceFontByteSwapUInt32((unsigned int*)value);
}
// 0x442568
void interfaceFontByteSwapUInt16(unsigned short* value)
{
unsigned short swapped = *value;
swapped = (swapped >> 8) | (swapped << 8);
*value = swapped;
}
// NOTE: 0x442568 with different signature.
void interfaceFontByteSwapInt16(short* value)
{
interfaceFontByteSwapUInt16((unsigned short*)value);
}

4
src/font_manager.h
View File

@ -43,5 +43,9 @@ int interfaceFontGetLetterSpacingImpl();
int interfaceFontGetBufferSizeImpl(const char* string);
int interfaceFontGetMonospacedCharacterWidthImpl();
void interfaceFontDrawImpl(unsigned char* buf, const char* string, int length, int pitch, int color);
void interfaceFontByteSwapUInt32(unsigned int* value);
void interfaceFontByteSwapInt32(int* value);
void interfaceFontByteSwapUInt16(unsigned short* value);
void interfaceFontByteSwapInt16(short* value);
#endif /* FONT_MANAGER_H */

55
src/platform_compat.cc
View File

@ -1,6 +1,9 @@
#include "platform_compat.h"
#include <SDL.h>
#include <string.h>
#include <filesystem>
int compat_stricmp(const char* string1, const char* string2)
{
@ -26,3 +29,55 @@ char* compat_itoa(int value, char* buffer, int radix)
{
return SDL_itoa(value, buffer, radix);
}
void compat_splitpath(const char* path, char* drive, char* dir, char* fname, char* ext)
{
#if defined(_WIN32)
_splitpath(path, drive, dir, fname, ext);
#else
std::filesystem::path p(path);
if (drive != NULL) {
strcpy(drive, p.root_name().string().substr(0, COMPAT_MAX_DRIVE - 1).c_str());
}
if (dir != NULL) {
strcpy(dir, p.parent_path().string().substr(0, COMPAT_MAX_DIR - 1).c_str());
}
if (fname != NULL) {
strcpy(fname, p.stem().string().substr(0, COMPAT_MAX_FNAME - 1).c_str());
}
if (ext != NULL) {
strcpy(ext, p.extension().string().substr(0, COMPAT_MAX_EXT - 1).c_str());
}
#endif
}
void compat_makepath(char* path, const char* drive, const char* dir, const char* fname, const char* ext)
{
#if defined(_WIN32)
_makepath(path, drive, dir, fname, ext);
#else
std::filesystem::path p;
if (drive != NULL) {
p.append(drive);
}
if (dir != NULL) {
p.append(dir);
}
if (fname != NULL) {
p.append(fname);
}
if (ext != NULL) {
p.replace_extension(ext);
}
strcpy(path, p.string().substr(0, COMPAT_MAX_PATH - 1).c_str());
#endif
}

7
src/platform_compat.h
View File

@ -12,10 +12,17 @@
// represent paths across the codebase.
#define COMPAT_MAX_PATH 260
#define COMPAT_MAX_DRIVE 3
#define COMPAT_MAX_DIR 256
#define COMPAT_MAX_FNAME 256
#define COMPAT_MAX_EXT 256
int compat_stricmp(const char* string1, const char* string2);
int compat_strnicmp(const char* string1, const char* string2, size_t size);
char* compat_strupr(char* string);
char* compat_strlwr(char* string);
char* compat_itoa(int value, char* buffer, int radix);
void compat_splitpath(const char* path, char* drive, char* dir, char* fname, char* ext);
void compat_makepath(char* path, const char* drive, const char* dir, const char* fname, const char* ext);
#endif /* PLATFORM_COMPAT_H */

2
src/text_object.cc
View File

@ -10,6 +10,8 @@
#include "tile.h"
#include "word_wrap.h"
#include <string.h>
// 0x51D944
int gTextObjectsCount = 0;

1
src/window_manager.cc
View File

@ -8,6 +8,7 @@
#include "memory.h"
#include "palette.h"
#include "text_font.h"
#include "win32.h"
#include "window_manager_private.h"
#include <SDL.h>

30
src/xfile.cc
View File

@ -55,9 +55,9 @@ XFile* xfileOpen(const char* filePath, const char* mode)
memset(stream, 0, sizeof(*stream));
// NOTE: Compiled code uses different lengths.
char drive[_MAX_DRIVE];
char dir[_MAX_DIR];
_splitpath(filePath, drive, dir, NULL, NULL);
char drive[COMPAT_MAX_DRIVE];
char dir[COMPAT_MAX_DIR];
compat_splitpath(filePath, drive, dir, NULL, NULL);
char path[COMPAT_MAX_PATH];
if (drive[0] != '\0' || dir[0] == '\\' || dir[0] == '/' || dir[0] == '.') {
@ -543,11 +543,11 @@ bool xlistEnumerate(const char* pattern, XListEnumerationHandler* handler, XList
context.xlist = xlist;
char drive[_MAX_DRIVE];
char dir[_MAX_DIR];
char fileName[_MAX_FNAME];
char extension[_MAX_EXT];
_splitpath(pattern, drive, dir, fileName, extension);
char drive[COMPAT_MAX_DRIVE];
char dir[COMPAT_MAX_DIR];
char fileName[COMPAT_MAX_FNAME];
char extension[COMPAT_MAX_EXT];
compat_splitpath(pattern, drive, dir, fileName, extension);
if (drive[0] != '\0' || dir[0] == '\\' || dir[0] == '/' || dir[0] == '.') {
if (fileFindFirst(pattern, &directoryFileFindData)) {
do {
@ -564,7 +564,7 @@ bool xlistEnumerate(const char* pattern, XListEnumerationHandler* handler, XList
context.type = XFILE_ENUMERATION_ENTRY_TYPE_FILE;
}
_makepath(context.name, drive, dir, entryName, NULL);
compat_makepath(context.name, drive, dir, entryName, NULL);
if (!handler(&context)) {
break;
@ -609,7 +609,7 @@ bool xlistEnumerate(const char* pattern, XListEnumerationHandler* handler, XList
context.type = XFILE_ENUMERATION_ENTRY_TYPE_FILE;
}
_makepath(context.name, drive, dir, entryName, NULL);
compat_makepath(context.name, drive, dir, entryName, NULL);
if (!handler(&context)) {
break;
@ -621,7 +621,7 @@ bool xlistEnumerate(const char* pattern, XListEnumerationHandler* handler, XList
xbase = xbase->next;
}
_splitpath(pattern, drive, dir, fileName, extension);
compat_splitpath(pattern, drive, dir, fileName, extension);
if (fileFindFirst(pattern, &directoryFileFindData)) {
do {
bool isDirectory = fileFindIsDirectory(&directoryFileFindData);
@ -637,7 +637,7 @@ bool xlistEnumerate(const char* pattern, XListEnumerationHandler* handler, XList
context.type = XFILE_ENUMERATION_ENTRY_TYPE_FILE;
}
_makepath(context.name, drive, dir, entryName, NULL);
compat_makepath(context.name, drive, dir, entryName, NULL);
if (!handler(&context)) {
break;
@ -680,9 +680,9 @@ int xbaseMakeDirectory(const char* filePath)
return -1;
}
char drive[_MAX_DRIVE];
char dir[_MAX_DIR];
_splitpath(filePath, drive, dir, NULL, NULL);
char drive[COMPAT_MAX_DRIVE];
char dir[COMPAT_MAX_DIR];
compat_splitpath(filePath, drive, dir, NULL, NULL);
char path[COMPAT_MAX_PATH];
if (drive[0] != '\0' || dir[0] == '\\' || dir[0] == '/' || dir[0] == '.') {