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

Rename editor symbols

This commit is contained in:
Alexander Batalov 2022-06-11 00:32:57 +03:00
parent e3c27a3def
commit e17e30e13f
7 changed files with 1637 additions and 1632 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2983
src/character_editor.cc
View File

File diff suppressed because it is too large Load Diff

266
src/character_editor.h
View File

@ -126,10 +126,12 @@ typedef struct TownReputationEntry {
int city;
} TownReputationEntry;
typedef struct STRUCT_56FCB0 {
int field_0;
char* field_4;
} STRUCT_56FCB0;
typedef struct PerkDialogOption {
// Depending on the current mode this value is the id of either
// perk, trait (handling Mutate perk), or skill (handling Tag perk).
int value;
char* name;
} PerkDialogOption;
// TODO: Field order is probably wrong.
typedef struct KillInfo {
@ -138,11 +140,11 @@ typedef struct KillInfo {
int kills;
} KillInfo;
extern int _grph_id[50];
extern const unsigned char _copyflag[EDITOR_GRAPHIC_COUNT];
extern const int word_431D3A[EDITOR_DERIVED_STAT_COUNT];
extern const int _StatYpos[7];
extern const int word_431D6C[EDITOR_DERIVED_STAT_COUNT];
extern int gCharacterEditorFrmIds[50];
extern const unsigned char gCharacterEditorFrmShouldCopy[EDITOR_GRAPHIC_COUNT];
extern const int gCharacterEditorDerivedStatFrmIds[EDITOR_DERIVED_STAT_COUNT];
extern const int gCharacterEditorPrimaryStatY[7];
extern const int gCharacterEditorDerivedStatsMap[EDITOR_DERIVED_STAT_COUNT];
extern char byte_431D93[64];
extern const int dword_431DD4[7];
@ -151,10 +153,10 @@ extern const double dbl_501713;
extern const double dbl_5018F0;
extern const double dbl_5019BE;
extern bool _bk_enable_0;
extern int _skill_cursor;
extern int _slider_y;
extern int characterEditorRemainingCharacterPoints;
extern bool gCharacterEditorIsoWasEnabled;
extern int gCharacterEditorCurrentSkill;
extern int gCharacterEditorSkillValueAdjustmentSliderY;
extern int gCharacterEditorRemainingCharacterPoints;
extern KarmaEntry* gKarmaEntries;
extern int gKarmaEntriesLength;
extern GenericReputationEntry* gGenericReputationEntries;
@ -162,148 +164,148 @@ extern int gGenericReputationEntriesLength;
extern const TownReputationEntry gTownReputationEntries[TOWN_REPUTATION_COUNT];
extern const int gAddictionReputationVars[ADDICTION_REPUTATION_COUNT];
extern const int gAddictionReputationFrmIds[ADDICTION_REPUTATION_COUNT];
extern int _folder_up_button;
extern int _folder_down_button;
extern int gCharacterEditorFolderViewScrollUpBtn;
extern int gCharacterEditorFolderViewScrollDownBtn;
extern char _folder_card_string[256];
extern int _skillsav[SKILL_COUNT];
extern MessageList editorMessageList;
extern STRUCT_56FCB0 _name_sort_list[DIALOG_PICKER_NUM_OPTIONS];
extern int _trait_bids[TRAIT_COUNT];
extern MessageListItem editorMessageListItem;
extern char _old_str1[48];
extern char _old_str2[48];
extern int _tag_bids[SKILL_COUNT];
extern char _name_save[32];
extern Size _GInfo[EDITOR_GRAPHIC_COUNT];
extern CacheEntry* _grph_key[EDITOR_GRAPHIC_COUNT];
extern unsigned char* _grphcpy[EDITOR_GRAPHIC_COUNT];
extern unsigned char* _grphbmp[EDITOR_GRAPHIC_COUNT];
extern int _folder_max_lines;
extern int _folder_line;
extern int _folder_card_fid;
extern int _folder_top_line;
extern char* _folder_card_title;
extern char* _folder_card_title2;
extern int _folder_yoffset;
extern int _folder_karma_top_line;
extern int _folder_highlight_line;
extern char* _folder_card_desc;
extern int _folder_ypos;
extern int _folder_kills_top_line;
extern int _folder_perk_top_line;
extern unsigned char* gEditorPerkBackgroundBuffer;
extern int gEditorPerkWindow;
extern int _SliderPlusID;
extern int _SliderNegID;
extern int _stat_bids_minus[7];
extern unsigned char* characterEditorWindowBuf;
extern int characterEditorWindowHandle;
extern int _stat_bids_plus[7];
extern unsigned char* gEditorPerkWindowBuffer;
extern CritterProtoData _dude_data;
extern unsigned char* characterEditorWindowBackgroundBuf;
extern int _cline;
extern int _oldsline;
extern int _upsent_points_back;
extern int _last_level;
extern int characterEditorWindowOldFont;
extern int _kills_count;
extern CacheEntry* _bck_key;
extern int _hp_back;
extern int _mouse_ypos;
extern int _mouse_xpos;
extern char gCharacterEditorFolderCardString[256];
extern int gCharacterEditorSkillsBackup[SKILL_COUNT];
extern MessageList gCharacterEditorMessageList;
extern PerkDialogOption gPerkDialogOptionList[DIALOG_PICKER_NUM_OPTIONS];
extern int gCharacterEditorOptionalTraitBtns[TRAIT_COUNT];
extern MessageListItem gCharacterEditorMessageListItem;
extern char gCharacterEditorCardTitle[48];
extern char gPerkDialogCardTitle[48];
extern int gCharacterEditorTagSkillBtns[SKILL_COUNT];
extern char gCharacterEditorNameBackup[32];
extern Size gCharacterEditorFrmSize[EDITOR_GRAPHIC_COUNT];
extern CacheEntry* gCharacterEditorFrmHandle[EDITOR_GRAPHIC_COUNT];
extern unsigned char* gCharacterEditorFrmCopy[EDITOR_GRAPHIC_COUNT];
extern unsigned char* gCharacterEditorFrmData[EDITOR_GRAPHIC_COUNT];
extern int gCharacterEditorFolderViewMaxLines;
extern int gCharacterEditorFolderViewCurrentLine;
extern int gCharacterEditorFolderCardFrmId;
extern int gCharacterEditorFolderViewTopLine;
extern char* gCharacterEditorFolderCardTitle;
extern char* gCharacterEditorFolderCardSubtitle;
extern int gCharacterEditorFolderViewOffsetY;
extern int gCharacterEditorKarmaFolderTopLine;
extern int gCharacterEditorFolderViewHighlightedLine;
extern char* gCharacterEditorFolderCardDescription;
extern int gCharacterEditorFolderViewNextY;
extern int gCharacterEditorKillsFolderTopLine;
extern int gCharacterEditorPerkFolderTopLine;
extern unsigned char* gPerkDialogBackgroundBuffer;
extern int gPerkDialogWindow;
extern int gCharacterEditorSliderPlusBtn;
extern int gCharacterEditorSliderMinusBtn;
extern int gCharacterEditorPrimaryStatMinusBtns[7];
extern unsigned char* gCharacterEditorWindowBuffer;
extern int gCharacterEditorWindow;
extern int gCharacterEditorPrimaryStatPlusBtns[7];
extern unsigned char* gPerkDialogWindowBuffer;
extern CritterProtoData gCharacterEditorDudeDataBackup;
extern unsigned char* gCharacterEditorWindowBackgroundBuffer;
extern int gPerkDialogCurrentLine;
extern int gPerkDialogPreviousCurrentLine;
extern int gCharacterEditorUnspentSkillPointsBackup;
extern int gCharacterEditorLastLevel;
extern int gCharacterEditorOldFont;
extern int gCharacterEditorKillsCount;
extern CacheEntry* gCharacterEditorWindowBackgroundHandle;
extern int gCharacterEditorHitPointsBackup;
extern int gCharacterEditorMouseY;
extern int gCharacterEditorMouseX;
extern int characterEditorSelectedItem;
extern int characterEditorWindowSelectedFolder;
extern int _frstc_draw1;
extern int _crow;
extern int _frstc_draw2;
extern int _perk_back[PERK_COUNT];
extern bool gCharacterEditorCardDrawn;
extern int gPerkDialogTopLine;
extern bool gPerkDialogCardDrawn;
extern int gCharacterEditorPerksBackup[PERK_COUNT];
extern unsigned int _repFtime;
extern unsigned int _frame_time;
extern int _old_tags;
extern int _last_level_back;
extern int gCharacterEditorOldTaggedSkillCount;
extern int gCharacterEditorLastLevelBackup;
extern bool gCharacterEditorIsCreationMode;
extern int _tag_skill_back[NUM_TAGGED_SKILLS];
extern int _card_old_fid2;
extern int _card_old_fid1;
extern int _trait_back[3];
extern int _trait_count;
extern int _optrt_count;
extern int _temp_trait[3];
extern int _tagskill_count;
extern int _temp_tag_skill[NUM_TAGGED_SKILLS];
extern char _free_perk_back;
extern unsigned char _free_perk;
extern unsigned char _first_skill_list;
extern int gCharacterEditorTaggedSkillsBackup[NUM_TAGGED_SKILLS];
extern int gPerkDialogCardFrmId;
extern int gCharacterEditorCardFrmId;
extern int gCharacterEditorOptionalTraitsBackup[3];
extern int gCharacterEditorTempTraitCount;
extern int gPerkDialogOptionCount;
extern int gCharacterEditorTempTraits[3];
extern int gCharacterEditorTaggedSkillCount;
extern int gCharacterEditorTempTaggedSkills[NUM_TAGGED_SKILLS];
extern char gCharacterEditorHasFreePerkBackup;
extern unsigned char gCharacterEditorHasFreePerk;
extern unsigned char gCharacterEditorIsSkillsFirstDraw;
int _editor_design(bool isCreationMode);
int characterEditorShow(bool isCreationMode);
int characterEditorWindowInit();
void characterEditorWindowFree();
void _CharEditInit();
void characterEditorInit();
int _get_input_str(int win, int cancelKeyCode, char* text, int maxLength, int x, int y, int textColor, int backgroundColor, int flags);
bool _isdoschar(int ch);
char* _strmfe(char* dest, const char* name, const char* ext);
void editorRenderFolders();
void editorRenderPerks();
int _kills_list_comp(const KillInfo* a, const KillInfo* b);
int editorRenderKills();
void characterEditorRenderBigNumber(int x, int y, int flags, int value, int previousValue, int windowHandle);
void editorRenderPcStats();
void editorRenderPrimaryStat(int stat, bool animate, int previousValue);
void editorRenderGender();
void editorRenderAge();
void editorRenderName();
void editorRenderSecondaryStats();
void editorRenderSkills(int a1);
void editorRenderDetails();
void characterEditorDrawFolders();
void characterEditorDrawPerksFolder();
int characterEditorKillsCompare(const void* a1, const void* a2);
int characterEditorDrawKillsFolder();
void characterEditorDrawBigNumber(int x, int y, int flags, int value, int previousValue, int windowHandle);
void characterEditorDrawPcStats();
void characterEditorDrawPrimaryStat(int stat, bool animate, int previousValue);
void characterEditorDrawGender();
void characterEditorDrawAge();
void characterEditorDrawName();
void characterEditorDrawDerivedStats();
void characterEditorDrawSkills(int a1);
void characterEditorDrawCard();
int characterEditorEditName();
void _PrintName(unsigned char* buf, int a2);
int characterEditorRunEditAgeDialog();
void _PrintName(unsigned char* buf, int pitch);
int characterEditorEditAge();
void characterEditorEditGender();
void characterEditorHandleIncDecPrimaryStat(int eventCode);
int _OptionWindow();
void characterEditorAdjustPrimaryStat(int eventCode);
int characterEditorShowOptions();
bool characterFileExists(const char* fname);
int characterPrintToFile(const char* fileName);
char* _AddSpaces(char* string, int length);
char* _AddDots(char* string, int length);
void _ResetScreen();
void _RegInfoAreas();
void _SavePlayer();
void _RestorePlayer();
void characterEditorResetScreen();
void characterEditorRegisterInfoAreas();
void characterEditorSavePlayer();
void characterEditorRestorePlayer();
char* _itostndn(int value, char* dest);
int _DrawCard(int graphicId, const char* name, const char* attributes, char* description);
void _FldrButton();
void _InfoButton(int eventCode);
void editorAdjustSkill(int a1);
int characterEditorDrawCardWithOptions(int graphicId, const char* name, const char* attributes, char* description);
void characterEditorHandleFolderButtonPressed();
void characterEditorHandleInfoButtonPressed(int eventCode);
void characterEditorHandleAdjustSkillButtonPressed(int a1);
void characterEditorToggleTaggedSkill(int skill);
void characterEditorWindowRenderTraits();
void characterEditorDrawOptionalTraits();
void characterEditorToggleOptionalTrait(int trait);
void editorRenderKarma();
int _editor_save(File* stream);
int _editor_load(File* stream);
void _editor_reset();
int _UpdateLevel();
void _RedrwDPrks();
int editorSelectPerk();
int _InputPDLoop(int count, void (*refreshProc)());
int _ListDPerks();
void _RedrwDMPrk();
bool editorHandleMutate();
void _RedrwDMTagSkl();
bool editorHandleTag();
void _ListNewTagSkills();
int _ListMyTraits(int a1);
int _name_sort_comp(const void* a1, const void* a2);
int _DrawCard2(int frmId, const char* name, const char* rank, char* description);
void characterEditorDrawKarmaFolder();
int characterEditorSave(File* stream);
int characterEditorLoad(File* stream);
void characterEditorReset();
int characterEditorUpdateLevel();
void perkDialogRefreshPerks();
int perkDialogShow();
int perkDialogHandleInput(int count, void (*refreshProc)());
int perkDialogDrawPerks();
void perkDialogRefreshTraits();
bool perkDialogHandleMutatePerk();
void perkDialogRefreshSkills();
bool perkDialogHandleTagPerk();
void perkDialogDrawSkills();
int perkDialogDrawTraits(int a1);
int perkDialogOptionCompare(const void* a1, const void* a2);
int perkDialogDrawCard(int frmId, const char* name, const char* rank, char* description);
void _pop_perks();
int _is_supper_bonus();
int _folder_init();
void _folder_scroll(int direction);
void _folder_clear();
int _folder_print_seperator(const char* string);
bool _folder_print_line(const char* string);
bool editorDrawKillsEntry(const char* name, int kills);
int characterEditorFolderViewInit();
void characterEditorFolderViewScroll(int direction);
void characterEditorFolderViewClear();
int characterEditorFolderViewDrawHeading(const char* string);
bool characterEditorFolderViewDrawString(const char* string);
bool characterEditorFolderViewDrawKillsEntry(const char* name, int kills);
int karmaInit();
void karmaFree();
int karmaEntryCompare(const void* a1, const void* a2);

4
src/character_selector.cc
View File

@ -179,7 +179,7 @@ int characterSelectorOpen()
case KEY_UPPERCASE_C:
case KEY_LOWERCASE_C:
_ResetPlayer();
if (_editor_design(1) == 0) {
if (characterEditorShow(1) == 0) {
rc = 2;
done = true;
}
@ -187,7 +187,7 @@ int characterSelectorOpen()
break;
case KEY_UPPERCASE_M:
case KEY_LOWERCASE_M:
if (!_editor_design(1)) {
if (!characterEditorShow(1)) {
rc = 2;
done = true;
}

4
src/critter.cc
View File

@ -976,7 +976,7 @@ int gcdLoad(const char* path)
return -1;
}
if (fileReadInt32(stream, &characterEditorRemainingCharacterPoints) == -1) {
if (fileReadInt32(stream, &gCharacterEditorRemainingCharacterPoints) == -1) {
fileClose(stream);
return -1;
}
@ -1048,7 +1048,7 @@ int gcdSave(const char* path)
return -1;
}
if (fileWriteInt32(stream, characterEditorRemainingCharacterPoints) == -1) {
if (fileWriteInt32(stream, gCharacterEditorRemainingCharacterPoints) == -1) {
fileClose(stream);
return -1;
}

6
src/game.cc
View File

@ -267,7 +267,7 @@ int gameInitWithOptions(const char* windowTitle, bool isMapper, int font, int a4
debugPrint(">wmWorldMap_init\t");
_CharEditInit();
characterEditorInit();
debugPrint(">CharEditInit\t");
pipboyInit();
@ -367,7 +367,7 @@ void gameReset()
scriptsReset();
worldmapReset();
partyMembersReset();
_CharEditInit();
characterEditorInit();
pipboyReset();
_ResetLoadSave();
gameDialogReset();
@ -516,7 +516,7 @@ int gameHandleKey(int eventCode, bool isInCombatMode)
if (interfaceBarEnabled()) {
soundPlayFile("ib1p1xx1");
bool isoWasEnabled = isoDisable();
_editor_design(false);
characterEditorShow(false);
if (isoWasEnabled) {
isoEnable();
}

4
src/loadsave.cc
View File

@ -111,7 +111,7 @@ SaveGameHandler* _master_save_list[LOAD_SAVE_HANDLER_COUNT] = {
traitsSave,
automapSave,
preferencesSave,
_editor_save,
characterEditorSave,
worldmapSave,
pipboySave,
gameMoviesSave,
@ -142,7 +142,7 @@ LoadGameHandler* _master_load_list[LOAD_SAVE_HANDLER_COUNT] = {
traitsLoad,
automapLoad,
preferencesLoad,
_editor_load,
characterEditorLoad,
worldmapLoad,
pipboyLoad,
gameMoviesLoad,

2
src/proto.cc
View File

@ -1854,7 +1854,7 @@ int _ResetPlayer()
pcStatsReset();
protoCritterDataResetStats(&(proto->critter.data));
critterReset();
_editor_reset();
characterEditorReset();
protoCritterDataResetSkills(&(proto->critter.data));
skillsReset();
perksReset();