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

Cleanup art.h 

See #42
This commit is contained in:
Alexander Batalov 2022-06-19 09:02:26 +03:00
parent d57efd0037
commit ff0fa95862
2 changed files with 41 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/art.cc
View File

@ -13,20 +13,41 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
typedef struct ArtListDescription {
int flags;
char name[16];
char* fileNames; // dynamic array of null terminated strings 13 bytes long each
void* field_18;
int fileNamesLength; // number of entries in list
} ArtListDescription;
typedef struct HeadDescription {
int goodFidgetCount;
int neutralFidgetCount;
int badFidgetCount;
} HeadDescription;
static int artReadList(const char* path, char** out_arr, int* out_count);
static int artCacheGetFileSizeImpl(int a1, int* out_size);
static int artCacheReadDataImpl(int a1, int* a2, unsigned char* data);
static void artCacheFreeImpl(void* ptr);
static int artReadFrameData(unsigned char* data, File* stream, int count);
static int artReadHeader(Art* art, File* stream);
// 0x5002D8 // 0x5002D8
char gDefaultJumpsuitMaleFileName[] = "hmjmps"; static char gDefaultJumpsuitMaleFileName[] = "hmjmps";
// 0x05002E0 // 0x05002E0
char gDefaultJumpsuitFemaleFileName[] = "hfjmps"; static char gDefaultJumpsuitFemaleFileName[] = "hfjmps";
// 0x5002E8 // 0x5002E8
char gDefaultTribalMaleFileName[] = "hmwarr"; static char gDefaultTribalMaleFileName[] = "hmwarr";
// 0x5002F0 // 0x5002F0
char gDefaultTribalFemaleFileName[] = "hfprim"; static char gDefaultTribalFemaleFileName[] = "hfprim";
// 0x510738 // 0x510738
ArtListDescription gArtListDescriptions[OBJ_TYPE_COUNT] = { static ArtListDescription gArtListDescriptions[OBJ_TYPE_COUNT] = {
{ 0, "items", 0, 0, 0 }, { 0, "items", 0, 0, 0 },
{ 0, "critters", 0, 0, 0 }, { 0, "critters", 0, 0, 0 },
{ 0, "scenery", 0, 0, 0 }, { 0, "scenery", 0, 0, 0 },
@ -44,13 +65,13 @@ ArtListDescription gArtListDescriptions[OBJ_TYPE_COUNT] = {
// together with [gArtLanguage]. // together with [gArtLanguage].
// //
// 0x510898 // 0x510898
bool gArtLanguageInitialized = false; static bool gArtLanguageInitialized = false;
// 0x51089C // 0x51089C
const char* _head1 = "gggnnnbbbgnb"; static const char* _head1 = "gggnnnbbbgnb";
// 0x5108A0 // 0x5108A0
const char* _head2 = "vfngfbnfvppp"; static const char* _head2 = "vfngfbnfvppp";
// Current native look base fid. // Current native look base fid.
// //
@ -74,32 +95,32 @@ int _art_vault_person_nums[DUDE_NATIVE_LOOK_COUNT][GENDER_COUNT];
// Index of "grid001.frm" in tiles.lst. // Index of "grid001.frm" in tiles.lst.
// //
// 0x5108B8 // 0x5108B8
int _art_mapper_blank_tile = 1; static int _art_mapper_blank_tile = 1;
// Non-english language name. // Non-english language name.
// //
// This value is used as a directory name to display localized arts. // This value is used as a directory name to display localized arts.
// //
// 0x56C970 // 0x56C970
char gArtLanguage[32]; static char gArtLanguage[32];
// 0x56C990 // 0x56C990
Cache gArtCache; Cache gArtCache;
// 0x56C9E4 // 0x56C9E4
char _art_name[COMPAT_MAX_PATH]; static char _art_name[COMPAT_MAX_PATH];
// head_info // head_info
// 0x56CAE8 // 0x56CAE8
HeadDescription* gHeadDescriptions; static HeadDescription* gHeadDescriptions;
// anon_alias // anon_alias
// 0x56CAEC // 0x56CAEC
int* _anon_alias; static int* _anon_alias;
// artCritterFidShouldRunData // artCritterFidShouldRunData
// 0x56CAF0 // 0x56CAF0
int* gArtCritterFidShoudRunData; static int* gArtCritterFidShoudRunData;
// 0x418840 // 0x418840
int artInit() int artInit()
@ -648,7 +669,7 @@ char* artBuildFilePath(int fid)
// art_read_lst // art_read_lst
// 0x419664 // 0x419664
int artReadList(const char* path, char** out_arr, int* out_count) static int artReadList(const char* path, char** out_arr, int* out_count)
{ {
File* stream; File* stream;
char str[200]; char str[200];
@ -928,7 +949,7 @@ int _art_alias_fid(int fid)
} }
// 0x419A78 // 0x419A78
int artCacheGetFileSizeImpl(int fid, int* sizePtr) static int artCacheGetFileSizeImpl(int fid, int* sizePtr)
{ {
int v4; int v4;
char* str; char* str;
@ -986,7 +1007,7 @@ int artCacheGetFileSizeImpl(int fid, int* sizePtr)
} }
// 0x419B78 // 0x419B78
int artCacheReadDataImpl(int fid, int* sizePtr, unsigned char* data) static int artCacheReadDataImpl(int fid, int* sizePtr, unsigned char* data)
{ {
int v4; int v4;
char* str; char* str;
@ -1044,7 +1065,7 @@ int artCacheReadDataImpl(int fid, int* sizePtr, unsigned char* data)
} }
// 0x419C80 // 0x419C80
void artCacheFreeImpl(void* ptr) static void artCacheFreeImpl(void* ptr)
{ {
internal_free(ptr); internal_free(ptr);
} }
@ -1091,7 +1112,7 @@ out:
} }
// 0x419D60 // 0x419D60
int artReadFrameData(unsigned char* data, File* stream, int count) static int artReadFrameData(unsigned char* data, File* stream, int count)
{ {
unsigned char* ptr = data; unsigned char* ptr = data;
for (int index = 0; index < count; index++) { for (int index = 0; index < count; index++) {
@ -1111,7 +1132,7 @@ int artReadFrameData(unsigned char* data, File* stream, int count)
} }
// 0x419E1C // 0x419E1C
int artReadHeader(Art* art, File* stream) static int artReadHeader(Art* art, File* stream)
{ {
if (fileReadInt32(stream, &(art->field_0)) == -1) return -1; if (fileReadInt32(stream, &(art->field_0)) == -1) return -1;
if (fileReadInt16(stream, &(art->framesPerSecond)) == -1) return -1; if (fileReadInt16(stream, &(art->framesPerSecond)) == -1) return -1;

35
src/art.h
View File

@ -86,20 +86,6 @@ typedef struct ArtFrame {
short y; short y;
} ArtFrame; } ArtFrame;
typedef struct ArtListDescription {
int flags;
char name[16];
char* fileNames; // dynamic array of null terminated strings 13 bytes long each
void* field_18;
int fileNamesLength; // number of entries in list
} ArtListDescription;
typedef struct HeadDescription {
int goodFidgetCount;
int neutralFidgetCount;
int badFidgetCount;
} HeadDescription;
typedef enum WeaponAnimation { typedef enum WeaponAnimation {
WEAPON_ANIMATION_NONE, WEAPON_ANIMATION_NONE,
WEAPON_ANIMATION_KNIFE, // d WEAPON_ANIMATION_KNIFE, // d
@ -124,25 +110,10 @@ typedef enum DudeNativeLook {
DUDE_NATIVE_LOOK_COUNT, DUDE_NATIVE_LOOK_COUNT,
} DudeNativeLook; } DudeNativeLook;
extern char gDefaultJumpsuitMaleFileName[];
extern char gDefaultJumpsuitFemaleFileName[];
extern char gDefaultTribalMaleFileName[];
extern char gDefaultTribalFemaleFileName[];
extern ArtListDescription gArtListDescriptions[OBJ_TYPE_COUNT];
extern bool gArtLanguageInitialized;
extern const char* _head1;
extern const char* _head2;
extern int _art_vault_guy_num; extern int _art_vault_guy_num;
extern int _art_vault_person_nums[DUDE_NATIVE_LOOK_COUNT][GENDER_COUNT]; extern int _art_vault_person_nums[DUDE_NATIVE_LOOK_COUNT][GENDER_COUNT];
extern int _art_mapper_blank_tile;
extern char gArtLanguage[32];
extern Cache gArtCache; extern Cache gArtCache;
extern char _art_name[COMPAT_MAX_PATH];
extern HeadDescription* gHeadDescriptions;
extern int* _anon_alias;
extern int* gArtCritterFidShoudRunData;
int artInit(); int artInit();
void artReset(); void artReset();
@ -159,7 +130,6 @@ int artCacheFlush();
int artCopyFileName(int a1, int a2, char* a3); int artCopyFileName(int a1, int a2, char* a3);
int _art_get_code(int a1, int a2, char* a3, char* a4); int _art_get_code(int a1, int a2, char* a3, char* a4);
char* artBuildFilePath(int a1); char* artBuildFilePath(int a1);
int artReadList(const char* path, char** out_arr, int* out_count);
int artGetFramesPerSecond(Art* art); int artGetFramesPerSecond(Art* art);
int artGetActionFrame(Art* art); int artGetActionFrame(Art* art);
int artGetFrameCount(Art* art); int artGetFrameCount(Art* art);
@ -175,12 +145,7 @@ bool _art_fid_valid(int fid);
int _art_alias_num(int a1); int _art_alias_num(int a1);
int artCritterFidShouldRun(int a1); int artCritterFidShouldRun(int a1);
int _art_alias_fid(int a1); int _art_alias_fid(int a1);
int artCacheGetFileSizeImpl(int a1, int* out_size);
int artCacheReadDataImpl(int a1, int* a2, unsigned char* data);
void artCacheFreeImpl(void* ptr);
int buildFid(int a1, int a2, int a3, int a4, int a5); int buildFid(int a1, int a2, int a3, int a4, int a5);
int artReadFrameData(unsigned char* data, File* stream, int count);
int artReadHeader(Art* art, File* stream);
int artRead(const char* path, unsigned char* data); int artRead(const char* path, unsigned char* data);
#endif #endif