fallout2sfall/sfall
0
0
Fork 0
mirror of https://github.com/sfall-team/sfall.git synced 2026-07-27 16:52:34 -07:00
Code Issues Packages Projects Releases Wiki Activity
610 Commits 4 Branches 131 Tags
28dc256f61602e11850e6d50264e74246f96626e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
NovaRain 28dc256f61 Fixed the timing of setting DIALOG game mode flag 
Renamed win_* related functions in FalloutEngine.

Minor code edits to Inventory & Worldmap following develop branch.
 2020-01-05 10:05:39 +08:00
NovaRain 18e1e06d28 Merged message struct defines in Inventory.cpp & Message.cpp 
Changed GetMessageStr() and MsgSearch() to take proper MSGList struct.

Edited some code to reflect the changes above.
 2020-01-04 01:21:48 +08:00
NovaRain 6871e6f673 Minor edits to Worldmap.cpp & Interface.cpp (from 4.x) 2020-01-02 00:43:13 +08:00
NovaRain 9ef670161d Reverted the change on x offset in previous commit 2019-12-29 08:42:08 +08:00
NovaRain c26cd45b5b Increased the width of the total weight display in the inventory 
(moved from the CritterInvSizeLimitMode option)

Minor format edits to README.md.
 2019-12-29 01:58:02 +08:00
NovaRain 0b5c61cb72 Backported AutoQuickSave and AutoQuickSavePage options from 4.x 
Updated version number and year.
 2019-12-28 09:27:45 +08:00
NovaRain 11261ca9be Merged db_* engine function defines in HeroAppearance and Tiles 
Edited both source files according to new defines.
 2019-12-28 09:14:12 +08:00
NovaRain 4d435ca143 Backported WRAP_WATCOM_CALL macros from 4.x for engine function defines 2019-12-28 09:03:27 +08:00
NovaRain 35d9b9439c Included Define.h in FalloutEngine.h 
* it removes the need to include Define.h separately across the code.
(similar to Fallout2.h in 4.x code)

Added StrNormalizePath() to Utils.cpp.
 2019-12-25 09:25:36 +08:00
NovaRain a1968f7f86 Minor edits to the built-in item highlighting function 
Removed the redundant struct define in Tiles.cpp.

Added a comment to ScriptUtils.hpp.
 2019-12-24 20:58:03 +08:00
NovaRain 85a5ee2a52 Some edits to hookscripts.txt & function notes.txt 2019-12-24 00:57:16 +08:00
NovaRain 310c392759 Added lootable corpses to the built-in item highlighting 2019-12-23 21:22:15 +08:00
NovaRain 3a24d0bdfd Replaced _stricmp in previous commit with strcmp. 
Minor edits to Inventory.cpp.
 2019-12-16 15:46:09 +08:00
NovaRain a9ad1a62eb Tweaked the path to load global shaders in the previous commit 
* although 3.8 doesn't have the path issue as 4.x due to the lack of
loading custom .dat, it's better to unify the path in this case.

Refactored the code for DataLoadOrderPatch in the same way as 4.x.
 2019-12-15 10:31:50 +08:00
NovaRain d73859fa5f Applied proper ptr_patches to some code 2019-12-14 11:41:43 +08:00
NovaRain 04043989c6 Restored loading global shaders at game start from pre-3.0 
Added GlobalShaderFile option to ddraw.ini.
Added an example global shader file to modderspack.
Minor edits to HeroAppearance.cpp.
 2019-12-14 11:05:12 +08:00
NovaRain 3b82232b46 Edited the description of the functions in the previous commit 
Rewrote ASM code for tile_under_cursor script function.
 2019-12-14 00:35:05 +08:00
NovaRain 5e704d206f Added "objects_in_radius" and "tile_by_position" script functions 2019-12-13 10:56:15 +08:00
NovaRain 5e65510797 Rewrote the code of some hook in 4.x style 
* TOHIT, AFTERHITROLL, REMOVEINVENOBJ
 2019-12-11 15:55:29 +08:00
NovaRain b4dac84ddd Rewrote some script functions in ObjectsOps in C++ 
* remove_script, set/get_script, set_critter_burst_disable.

Changed the return value of get_script to 0 for unscripted objects.
 2019-12-09 11:07:40 +08:00
NovaRain cbc822c9e0 Minor edits to code 2019-12-07 09:56:43 +08:00
NovaRain 6cc68ed3de Re-fixed the previous commit 
Replaced calling full substring with a simplified one for get_array.
 2019-12-05 09:49:07 +08:00
NovaRain 6d4aea216b Fix for printing game messages to debug log 2019-12-04 13:07:04 +08:00
NovaRain 569790acb2 Code refactoring for ASM code in opcodes 2019-12-04 11:37:44 +08:00
NovaRain 7016690f99 Added "string_format" script function 
Rewrote ASM code of opcode handlers in MemoryOp.hpp.
 2019-12-03 10:52:56 +08:00
NovaRain eeb97a4299 Some code refactoring 2019-12-01 12:10:33 +08:00
NovaRain 66c237d297 Refactored the code for "substr" script function 
* fixed the crashing bug and added a new behavior.

Changed the error message due to missing critter frame (again):
* replaced the interruption with printing the error message to in-game
message window.
 2019-11-29 12:13:36 +08:00
NovaRain 3629c90fa9 Simplified _RET_VAL_INT2 in AsmMacros.h (from dev) 
Changed related ASM code in various script functions.

Minor refactoring on some script functions.
 2019-11-29 12:10:08 +08:00
NovaRain 1f99855500 Changed the error msg due to missing critter frame 
* now the game only "crashes" when both Enable and DebugMode are
enabled in [Debugging] in ddraw.ini.
 2019-11-28 14:43:00 +08:00
NovaRain cdf0bdf23e Refactored script function handlers 
Changed error return values of list_begin/next to the same as dev.
 2019-11-28 14:42:07 +08:00
NovaRain 2c67058016 Code refactoring for opcodes/metarules 
* added proper arg validation for some opcodes using WRAP_OPCODE macro.
* changed return values of some opcodes/metarules to be the same as dev.
 2019-11-28 10:24:40 +08:00
NovaRain 29f0affd72 Re-fixed commit e62b5c0 (correct variant) 2019-11-26 07:49:31 +08:00
NovaRain e01569637d Backported additional check in DialogHook from 4.x 
Renamed inLoop/saveInCombatFix variables in LoadGameHook.cpp.
 2019-11-25 09:58:12 +08:00
NovaRain 78f0ac473d Restored calling original engine functions from HRP hacks. 2019-11-25 07:29:29 +08:00
NovaRain bbe9a2d26d Added "get_text_width" and "string_compare" script functions 
Rewrote set_dm/df_model, set_movie_path functions with WRAP_OPCODE.
 2019-11-23 20:32:57 +08:00
NovaRain 7bcb76e70c Restored and fixed RemoveWindowRounding option 
Reorganized ddraw.ini a bit.
 2019-11-21 00:58:41 +08:00
NovaRain 3348d8b716 Backported "draw_image" and "draw_image_scaled" functions from 4.1 2019-11-19 20:51:22 +08:00
NovaRain 4767ad2753 Fixed a crash bug in CorpseLineOfFireFix (from commit d9a440f) 
Minor edits to HookScripts/FalloutEngine.
 2019-11-19 14:27:19 +08:00
NovaRain 04ebbaa182 Added three new script window functions: 
"show_window", "hide_window", "set_window_flag"

Updated documents.
 2019-11-17 08:40:18 +08:00
NovaRain 3c5dc6853a Added "get_sfall_arg_at" script function 
Improved the functionality of "inventory_redraw" function.
 2019-11-16 22:54:09 +08:00
NovaRain a70a776e46 Tweaked/fixed reg_anim_callback function 2019-11-15 10:01:39 +08:00
NovaRain 83c3d6b1a8 Added "reg_anim_callback" script function(opcode) 
Updated documents.
 2019-11-14 13:02:10 +08:00
NovaRain 6a566087ca Implemented executing timed_event_p_proc in sfall global scripts 
Added "add_g_timer_event" and "remove_timer_event" script functions
for timed_event_p_proc in global scripts.

Fixed the check on the 'hidden' flag for previous commit.
 2019-11-11 10:01:38 +08:00
NovaRain e62b5c03db Added a fix for scripted interface windows 
* prevents player's movement when clicking on the window.

* the mouse cursor will not be toggled when the cursor hovers over
a hidden window.

Updated version number.
 2019-11-10 18:24:43 +08:00
NovaRain 29da6d7071 Minor edits to FalloutStructs.h 
Removed unnecessary AfterAttackCleanup on reset in LoadGameHook.cpp.
Fixed Debug build configuration in project file.
 2019-11-05 09:27:41 +08:00
NovaRain ec4a58e19e Updated define_extra.h 
Added define of OBJ_DATA_SCRIPT_INDEX to define_extra.h.
Moved Stats related reset code from ScriptExtender.cpp to Stats.cpp.
 2019-11-04 21:28:06 +08:00
NovaRain b023999c5e Updated script mods. 2019-11-03 10:10:11 +08:00
NovaRain ee711d8f81 Added "get_inven_ap_cost" script function 2019-11-02 10:26:28 +08:00
NovaRain d26a06872a Backported the advanced BarBoxes features from 4.x: 
* Added BoxBarCount option.
* Added "set_iface_tag_text" and "add_iface_tag" script functions.
* Now number of simultaneously displayed boxes depends on game res.
* Updated documents.
 2019-11-01 21:14:03 +08:00
NovaRain c4f8912490 Added support for displaying item AP cost up to 19 
* Requires an extended MVENUM.frm in the art\intrface\ directory to
display properly (will be included in modderspack).
 2019-10-31 12:47:57 +08:00
NovaRain d9a440f667 Fixed PM's weapon being misplaced after level up 
Moved some codes from Worldmap.cpp to new Interface.cpp (same as 4.x).

Moved some option codes from main.cpp to other modules.

Removed CorpseLineOfFireFix from ddraw.ini (always enabled).
 2019-10-31 11:42:20 +08:00
NovaRain 49bc2d3241 Some code fixes/edits. 2019-10-29 10:45:46 +08:00
NovaRain d07603f1b0 Renamed AnimationsAtOnceLimit.cpp/h to Animations 
Renamed SuperSave.cpp/h to ExtraSaveSlots (same as 4.x)
 2019-10-28 09:51:20 +08:00
NovaRain 76346c24b3 Added a debug message about missing art file for critters 2019-10-25 10:24:40 +08:00
NovaRain dee3e2f596 Minor code edit to previous commit 2019-10-23 09:37:10 +08:00
NovaRain 648eb9b2f1 Engine now uses 'English' as the fallback language for all msg files 2019-10-22 15:56:04 +08:00
NovaRain fcbf4d3972 Cleanup in vcxproj file 2019-10-22 10:27:59 +08:00
NovaRain 3ef6056a77 Added "add_trait" script function 
Replaced some C-style casting with pre-defined ptr_* variables.
 2019-10-20 19:31:08 +08:00
NovaRain ac10bce231 Moved code from main.cpp to new LoadOrder/Karma.cpp 
Slightly refactored list_* functions with 4.x codebase.

Changed the initialization order in main.cpp to 4.x's.
 2019-10-18 11:15:10 +08:00
NovaRain 6780a21b07 Fixed amount argument for critter_add/rm_trait functions 2019-10-17 10:27:28 +08:00
NovaRain 25fabde434 Replaced GetPrivateProfileInt/String with wrapper functions 
Fixed crash when a name in PremadePaths exceeds 11 characters.
 2019-10-16 14:29:04 +08:00
NovaRain da7cd2a060 Implemented new ini reading funcs (part 2) 
Refactored Premade.cpp, Reputations.cpp, KarmaFRMs in main.cpp, and
XPTable in Stats.cpp using 4.x implementation.
 2019-10-15 21:57:49 +08:00
NovaRain 8924257aee Added a new flag to MainMenuFontColour option 
* set bit 1 of the first byte to only change the color of version text
(old behavior)
 2019-10-15 11:58:49 +08:00
NovaRain 90ef9e273d Implemented new ini reading funcs in various codes 2019-10-14 23:55:54 +08:00
NovaRain b447e8e9b8 Rewrote set_xp_mod function with WRAP_OPCODE. 
Cleanup in ASM scripting handlers code.

Code edits to Perks.cpp and Stats.cpp.
 2019-10-14 21:36:25 +08:00
NovaRain 3744c0b165 Added optional options to the perks ini file 
* to toggle modification sections for perks and traits.

Backported ini reading functions from 4.x to main.cpp, and edited
related code in Perks.cpp (need to implement to other source later)

Added error/warning icons to message boxes.
 2019-10-14 15:30:46 +08:00
NovaRain c98af496b3 Added command_lite.h header file to modderspack 2019-10-11 00:53:22 +08:00
NovaRain c7eaff7ff5 Fixed art_change_fid_num when the hero appearance mod is enabled 
* before it set player's FID incorrectly if PC is in other appearance.

Prevented the player from equipping a weapon when player's current
appearance doesn't have the animation for it.

Fixed the player name while controlling other critters.

Edited texts for some error message boxes.
 2019-10-10 12:00:30 +08:00
NovaRain 37acec7115 Added "unwield_slot" script function 
Re-fixed obj_art_fid for player's FID (commit 36523d8)
 2019-10-08 10:56:49 +08:00
NovaRain f6ec543f40 Fixed inven_unwield script function 
* now it updates the interface slot for the player properly.

Fixed some code in PartyControl.cpp.
 2019-10-07 13:34:35 +08:00
NovaRain 5cfd5f99e3 Moved object unique id code from ScriptExtender to new Objects.cpp/h 
Backported set_unjam_locks_time function from 4.0.
 2019-10-07 09:36:46 +08:00
NovaRain dafee58c77 Fixed arg1 of HOOK_INVENWIELD when calling move_obj_inven_to_obj 
Moved get/set_proto_data functions from MiscOps.hpp to ObjectsOps.hpp.
 2019-10-05 07:53:50 +08:00
NovaRain 4cf0c6688f Improved the implementation of HOOK_INVENWIELD 
* it now runs for the player and NPCs when removing equipped items.
* added an additional argument.

Fixed drop_obj script function not removing the equipped armor properly
for the player and party members.
 2019-10-04 22:04:05 +08:00
NovaRain 27ec2d24fe Fixed move_obj_inven_to_obj script function 
* it didn't remove the equipped armor properly for the player and party
members, resulting in broken armor stats.

Added a check for valid objects to get/set_object_data functions.

Some code edits to HeroAppearance.cpp.
 2019-09-30 07:51:43 +08:00
NovaRain e3a3ff2540 Improved file searching for hero appearance mod (#251) 
* now it will search files in .dat files and folders simultaneously.

* files in folders have higher priority than .dat files.
 2019-09-28 10:52:48 +08:00
NovaRain e6a51f965f Removed NPCStage6Fix from ddraw.ini (always enabled) 
Moved the code of NPCStage6Fix to BugFixes.cpp.
(to its original relative location, right above MultiHexPathingFix)

Reorganized some code in BugFixes.cpp.

Tweaked the error printing for ResizeArray in Arrays.cpp.
 2019-09-27 20:51:34 +08:00
NovaRain 552a2a185e Refactored code in Arrays.cpp and fixed save_array() script function. 2019-09-24 16:50:50 +08:00
NovaRain 04d47d10ad Some minor changes: 
* Improved the display of the car fuel gauge on the world map interface.

* Expanded set_critter_stat function to allow changing STAT_unused and
STAT_dmg_* stats for the player, and STAT_unused for other critters.

* Changed AllowUnsafeScripting to not require sfall debugging mode.

* Changed NPCStage6Fix to be enabled by default.

* Added a new value to AIBestWeaponFix to change the priority multiplier
for having weapon perk to 3x.

Updated version number.
 2019-09-24 16:01:39 +08:00
NovaRain 749e248c8b Changed CorpseLineOfFireFix to be enabled by default 2019-09-15 07:18:13 +08:00
NovaRain 52290b09d2 Removed duplicate code from intface_redraw_ engine function 
Minor edits to code/documents.
 2019-09-14 08:56:05 +08:00
NovaRain a6a8e2e42f Backported HEROWIN, DIALOGVIEW, COUNTERWIN game mode flags from 4.x 
Updated UI hotkeys example mod.
 2019-09-13 08:09:07 +08:00
NovaRain 9693c0d439 Added "register_hook_proc_spec" script function 
Updated documents to address the new function.
 2019-09-12 22:23:02 +08:00
NovaRain aa22575ec9 Backported optimization for global/hook scripts execution from 4.x 2019-09-11 13:18:20 +08:00
NovaRain 8f4fd1dec8 Fixed AllowLargeTiles option (broken in 3.8.18) 
(due to commit f7fa62a)
 2019-09-10 10:09:15 +08:00
NovaRain d26097e9ae Fixed some code in AnimationsAtOnceLimit.cpp 
Renamed F1EngineBehavior option to Fallout1Behavior.
 2019-09-10 06:53:48 +08:00
NovaRain 4bb9828f3e Added F1EngineBehavior option to change some of F2 engine funcs to F1 
* disables playing the final movie/credits after the endgame slideshow.
* disables halving the weight for power armor items.

Moved FastShotFix and Ray's combat_p_proc fix from main.cpp to other
files.
 2019-09-09 15:19:37 +08:00
NovaRain 2d2f539826 Added a call to load f2_res.dll library from sfall code 
Fixed code that depends on HRP addresses in Tiles.cpp.
 2019-09-08 10:46:53 +08:00
NovaRain 97bd2cee18 Changed CriticalOverrides.ini to be parsed only once at game start 
* before the ini was always reparsed after each game load/reset. This
should improve the performance.
 2019-09-07 21:24:19 +08:00
NovaRain 62f890d287 Removed the dependency of Body_Torso from Body_Uncalled hit modifier 
Re-added BodyHit_Torso to ddraw.ini.
Reverted set_bodypart_hit_modifier function to pre-3.7.4 behavior.
 2019-09-07 20:16:50 +08:00
NovaRain 4b28829983 Renamed Knockback.cpp/h to Combat.cpp/h and reorganized some code: 
* Moved PickpocketMod to skills.cpp.
* Moved CheckWeaponAmmoCost to Combat.cpp.
 2019-09-07 12:13:31 +08:00
NovaRain cbb739bd7c Added options for tweaking some engine perks to the perks ini file 
Minor code edits to main.cpp and ObjectsOps.hpp.
 2019-09-06 13:13:40 +08:00
NovaRain e00d02f1f0 Added a compute damage example script. 
Updated compiled scripts due to main.h changes.
 2019-09-01 11:38:34 +08:00
NovaRain c9e0feeb32 Increased the width of the car fuel gauge to 2px 2019-09-01 09:03:09 +08:00
NovaRain 272e58d873 Tweaked reordering the execution of functions before exiting the map 
Added event clearing for active explosives before exiting the map.

Minor code edit to BARTERPRICE hook.
 2019-08-31 20:01:51 +08:00
NovaRain 20cb24b385 Fixed some args in HOOK_BARTERPRICE hook when trading with PM 
And added a new argument to indicate trading with a party member.

Refactored register_hook/register_hook_proc with _WRAP_OPCODE.
 2019-08-27 22:31:10 +08:00
NovaRain 071581effc Replaced 'Take All' hotkey mod with UI hotkeys mod 
Minor edits to code/documents.
 2019-08-26 21:53:11 +08:00
NovaRain 155c14f4e7 Fixed player stuck at "climbing" frame after ladder climbing animation 
Removed the previous fix about player's direction.

Minor code refactoring in AnimationsAtOnceLimit.cpp (from 4.x)
 2019-08-25 10:25:30 +08:00
NovaRain c6d612f4a7 Added MainMenuBigFontColour option to change button text color 
Changed the fix for player's direction after climbing ladder (61aa11)
 2019-08-23 10:35:17 +08:00
NovaRain 61aa1104a1 Fixed player's position if entrance tile is blocked when entering a map 
Fixed player's direction after leaving a map via ladder/stairs.

Fixed MainMenuFontColour not changing the font color for the copyright
text on the main menu (#261)

Code correction in main.cpp.
 2019-08-22 13:32:18 +08:00
NovaRain 2bd8a6223d Added OverrideCriticalFile option for specifying alternative crit file 
Added code for preparing clearing map_update_event in queue.

Fixed a crash bug in message_str_game function when passing a negative
fileId value.

Corrected/edited some code.
 2019-08-20 16:47:37 +08:00