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

Cleanup message.h 

See #42
This commit is contained in:
Alexander Batalov 2022-06-18 15:31:46 +03:00
parent ee3528037b
commit f566649479
2 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/message.cc
View File

@ -11,30 +11,37 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#define BADWORD_LENGTH_MAX 80
static bool _message_find(MessageList* msg, int num, int* out_index);
static bool _message_add(MessageList* msg, MessageListItem* new_entry);
static bool _message_parse_number(int* out_num, const char* str);
static int _message_load_field(File* file, char* str);
// 0x50B79C // 0x50B79C
char _Error_1[] = "Error"; static char _Error_1[] = "Error";
// 0x50B960 // 0x50B960
const char* gBadwordsReplacements = "!@#$%&*@#*!&$%#&%#*%!$&%@*$@&"; static const char* gBadwordsReplacements = "!@#$%&*@#*!&$%#&%#*%!$&%@*$@&";
// 0x519598 // 0x519598
char** gBadwords = NULL; static char** gBadwords = NULL;
// 0x51959C // 0x51959C
int gBadwordsCount = 0; static int gBadwordsCount = 0;
// 0x5195A0 // 0x5195A0
int* gBadwordsLengths = NULL; static int* gBadwordsLengths = NULL;
// Default text for getmsg when no entry is found. // Default text for getmsg when no entry is found.
// //
// 0x5195A4 // 0x5195A4
char* _message_error_str = _Error_1; static char* _message_error_str = _Error_1;
// Temporary message list item text used during filtering badwords. // Temporary message list item text used during filtering badwords.
// //
// 0x63207C // 0x63207C
char _bad_copy[MESSAGE_LIST_ITEM_FIELD_MAX_SIZE]; static char _bad_copy[MESSAGE_LIST_ITEM_FIELD_MAX_SIZE];
// 0x484770 // 0x484770
int badwordsInit() int badwordsInit()
@ -298,7 +305,7 @@ bool _message_make_path(char* dest, const char* path)
} }
// 0x484D10 // 0x484D10
bool _message_find(MessageList* msg, int num, int* out_index) static bool _message_find(MessageList* msg, int num, int* out_index)
{ {
int r, l, mid; int r, l, mid;
int cmp; int cmp;
@ -336,7 +343,7 @@ bool _message_find(MessageList* msg, int num, int* out_index)
} }
// 0x484D68 // 0x484D68
bool _message_add(MessageList* msg, MessageListItem* new_entry) static bool _message_add(MessageList* msg, MessageListItem* new_entry)
{ {
int index; int index;
MessageListItem* entries; MessageListItem* entries;
@ -397,7 +404,7 @@ bool _message_add(MessageList* msg, MessageListItem* new_entry)
} }
// 0x484F60 // 0x484F60
bool _message_parse_number(int* out_num, const char* str) static bool _message_parse_number(int* out_num, const char* str)
{ {
const char* ch; const char* ch;
bool success; bool success;
@ -434,7 +441,7 @@ bool _message_parse_number(int* out_num, const char* str)
// 4 - limit exceeded (> 1024) // 4 - limit exceeded (> 1024)
// //
// 0x484FB4 // 0x484FB4
int _message_load_field(File* file, char* str) static int _message_load_field(File* file, char* str)
{ {
int ch; int ch;
int len; int len;

18
src/message.h
View File

@ -1,10 +1,6 @@
#ifndef MESSAGE_H #ifndef MESSAGE_H
#define MESSAGE_H #define MESSAGE_H
#include "db.h"
#define BADWORD_LENGTH_MAX 80
#define MESSAGE_LIST_ITEM_TEXT_FILTERED 0x01 #define MESSAGE_LIST_ITEM_TEXT_FILTERED 0x01
#define MESSAGE_LIST_ITEM_FIELD_MAX_SIZE 1024 #define MESSAGE_LIST_ITEM_FIELD_MAX_SIZE 1024
@ -21,16 +17,6 @@ typedef struct MessageList {
MessageListItem* entries; MessageListItem* entries;
} MessageList; } MessageList;
extern char _Error_1[];
extern const char* gBadwordsReplacements;
extern char** gBadwords;
extern int gBadwordsCount;
extern int* gBadwordsLengths;
extern char* _message_error_str;
extern char _bad_copy[MESSAGE_LIST_ITEM_FIELD_MAX_SIZE];
int badwordsInit(); int badwordsInit();
void badwordsExit(); void badwordsExit();
bool messageListInit(MessageList* msg); bool messageListInit(MessageList* msg);
@ -38,10 +24,6 @@ bool messageListFree(MessageList* msg);
bool messageListLoad(MessageList* msg, const char* path); bool messageListLoad(MessageList* msg, const char* path);
bool messageListGetItem(MessageList* msg, MessageListItem* entry); bool messageListGetItem(MessageList* msg, MessageListItem* entry);
bool _message_make_path(char* dest, const char* path); bool _message_make_path(char* dest, const char* path);
bool _message_find(MessageList* msg, int num, int* out_index);
bool _message_add(MessageList* msg, MessageListItem* new_entry);
bool _message_parse_number(int* out_num, const char* str);
int _message_load_field(File* file, char* str);
char* getmsg(MessageList* msg, MessageListItem* entry, int num); char* getmsg(MessageList* msg, MessageListItem* entry, int num);
bool messageListFilterBadwords(MessageList* messageList); bool messageListFilterBadwords(MessageList* messageList);