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
169 Commits 4 Branches 131 Tags
16be32d2845f1b7ee86c011dfdf7f7212b762e98
Commit Graph
98 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
NovaRain 16be32d284 Replaced some address hacks with simplified ones (e.g. using jumps instead of multiple NOPs) 
Changed code style in main.cpp with Astyle.
 2017-02-13 14:02:28 +08:00
NovaRain 16f19824d1 Replaced hex addresses with proper engine defines for ViewXPos and ViewYPos, and replaced two instances of SafeWrite32 with HookCall. 2017-02-12 22:28:37 +08:00
NovaRain 535b7edc55 Limited the range of values for StartYear/Month/Day to prevent errors when setting them to negative values, and added a clarification in ddraw.ini. 2017-02-12 00:11:21 +08:00
NovaRain 573e5324f4 Updated ddraw.ini for the change in previous commit. 
Updated version number.
 2017-02-07 15:59:59 +08:00
NovaRain e17b722f16 Changed BodyHit_Torso to BodyHit_Torso_Uncalled because it sets both body_torso and body_uncalled hit modifiers. 2017-02-04 21:20:33 +08:00
NovaRain 7a6e15bae1 Fixed OverrideMusicDir not using the correct path string. 
Updated the year showed in the credits and file properties.
 2017-01-31 13:03:09 +08:00
NovaRain df34f6c994 Fixed broken call_offset_* functions. 2017-01-24 22:24:53 +08:00
NovaRain 26874a709e Edited the format of LoadGameHook.cpp to be more in line with the one in 4.0 branch, and replaced a hex address with proper engine function. 2017-01-20 00:28:09 +08:00
NovaRain 45724aa6b3 Moved sfall additional save game file reading from LoadGame2_After to LoadGame2_Before to make saved arrays available in start functions of ssl scripts. 
(cherry picked from commit 6bd7d4f05c)
 2017-01-19 23:59:05 +08:00
NovaRain b477a43bd0 Added more details to the description of WorldMapEncounterFix/Rate, and changed the default value of WorldMapEncounterRate to its internal default. 2017-01-12 00:08:10 +08:00
NovaRain ca86b5f930 Fixed display issues when calling gdialog_mod_barter with critters with no "Barter" flag set (from Crafty) 2017-01-09 16:35:03 +08:00
NovaRain f05ec714e7 Made WorldMapEncounterFix/Rate independent from WorldMapFPSPatch. (#62, with the simplified code from Crafty) 2016-12-27 14:19:54 +08:00
NovaRain ad1f08378b Fixed issue #57. 
Updated version number.
 2016-11-14 09:40:01 +08:00
NovaRain 11dfb3e94a Added MainMenuOffsetX/Y and MainMenuCreditsOffsetX/Y settings back to ddraw.ini. 
Corrected document file name in README.txt.
 2016-11-08 10:25:41 +08:00
NovaRain 3668a1c94f Improved the functionality of ProcessorIdle (from Crafty) 2016-11-07 15:04:55 +08:00
NovaRain 5cb3ca2a59 Removed queue9x and vector9x. 
Disabled ComputeSprayMod by default.
Updated version number.
 2016-11-07 10:16:57 +08:00
NovaRain d276da3d68 Added VS2008 compatibility (vsnprintf_s uses 4 args by C11 standard, which is supported in VS2010 but not VS2008) 2016-11-03 14:56:32 +08:00
NovaRain e3739ba7aa Initialized scriptDialog pointer properly and deleted it on game exit. 2016-11-02 08:59:02 +08:00
NovaRain e78e76e35d Edited a couple of log entries. 
Simplified the memory address edits of MultiPatches.
 2016-10-31 15:56:19 +08:00
NovaRain 47783c802e Added a C++11 emulator for compiling with VS2008. 2016-10-26 11:38:57 +08:00
NovaRain dbdf414cd9 Tweaked the style of global/hook script log entries a bit. 2016-10-18 11:45:00 +08:00
NovaRain 3e2a22fad8 Fixed bugs in set*_stat_min functions that set max values instead of min. 
Unified the style of global/hook script log entries.
Updated the code of "reading global/hook scripts from DAT files" with Crafty's newer code base.
 2016-10-18 10:59:10 +08:00
NovaRain 13ee06dee2 Improved the 'print to file' fix and added the ability to use long filenames in dat files (from Crafty) 2016-10-17 11:58:22 +08:00
NovaRain 2d3031e583 sfall can now load global/hook scripts from dat files (from Crafty's mod) 2016-10-14 13:57:20 +08:00
NovaRain de5c12484d Added DataLoadOrderPatch option to use a modified data load order for the engine to find game data (from Crafty's mod) 
Updated version number.
 2016-10-11 11:58:17 +08:00
NovaRain c880ae93a9 Removed unused code in ScriptExtender.cpp and rename obj_outline_all_items_* functions slightly to prevent using the same names as game engine functions. 
Minor edits on main.cpp and Bugs.cpp.
 2016-10-07 10:31:46 +08:00
NovaRain 295a5d1437 Replaced NumberPatchLoop with a simple toggleable MultiPatches. Reason: While NumberPatchLoop allows even larger patch numbers, the built-in valid range of patch numbers of 000 ~ 999 is more than enough already. 2016-10-05 16:09:22 +08:00
NovaRain e726ee54ba Tweaked set_bodypart_hit_modifier function to follow the removal of BodyHit_Uncalled from ddraw.ini, e.g. setting modifier for torso (3) will also set for uncalled (8), and vice versa. 2016-10-04 10:23:17 +08:00
NovaRain 712eafc241 Now sfall loads global/hook scripts, shaders, 32-bit talking heads images, and avi movies according to the paths variables in the cfg file, instead of from the fixed "Data\". 
Removed GainStatPerkFix from ddraw.ini.
Removed BodyHit_Uncalled from ddraw.ini. Now "uncalled" shares the same modifier with "torso", because separating them would result in some illogical setups.
 2016-10-03 14:46:51 +08:00
NovaRain d1bf22ec8d Expanded DisableHorrigan to also skip the forced encounter check, to compatible with old saves that are not started with DisableHorrigan=1. 
Changed the description of PipBoyAvailableAtGameStart=2 to be more precise.
Simplified the skipping code in PerkSetup(), because it's redundant to change two bytes that the same effect can be done with changing the conditional jump next to them.
 2016-09-29 13:37:58 +08:00
NovaRain 21d496f392 Added a new setting to PipBoyAvailableAtGameStart to skip the vault suit movie check and make the PipBoy always available. 
Improved the functionality of PipBoyAvailableAtGameStart (from Crafty's mod)
 2016-09-26 16:05:18 +08:00
NovaRain 07948206fb Removed CarryWeightLimit option, because it can be scripted with set_stat_max function. 2016-09-21 09:33:11 +08:00
NovaRain 6a71bf086d Added a partial fix for incorrect positioning after exiting small locations (e.g. Ghost Farm) (from Crafty's mod) 2016-09-19 13:15:57 +08:00
NovaRain ec585529c8 Changed BodypartHitMod# to BodyHit_(part names) in ddraw.ini, to make them easier for users to understand. 2016-08-31 10:27:03 +08:00
NovaRain e6aad27e44 Moved ImportedProcedureFix to Bugs.cpp and added comments to it. 
Added more descriptions to options in ddraw.ini, especially DebugMode,  to make things clearer and save the trouble to look up debug patch readme.
 2016-08-30 13:11:06 +08:00
NovaRain f0528740a4 Removed the redundant loop in the unlimited ammo exploit fix. 2016-08-22 09:42:01 +08:00
NovaRain bfd8b38547 Merge branch 'develop', preparing for 3.7.3 release. 2016-08-15 14:54:40 +08:00
NovaRain e6086f984e Merge branch 'Vennor-feature/extra_msg' 
Feature tested/verified.
 2016-08-15 14:38:53 +08:00
NovaRain 2e766cd3c9 Merge branch 'feature/extra_msg' of https://github.com/Vennor/sfall into Vennor-feature/extra_msg 
# Conflicts:
#	sfall/Message.cpp
#	sfall/Message.h
 2016-08-15 14:38:18 +08:00
NovaRain 48f53388fd Fixed checking the horizontal position on the y-axis instead of x when setting coordinates on the world map. 
Added more item flag defines in define_extra.h.
 2016-08-15 10:32:53 +08:00
NovaRain 6199f95c38 Fixed incorrect death animations being used when killing critters with kill_critter_type function, e.g. ghouls die standing. (from Crafty) 2016-08-04 12:19:00 +08:00
NovaRain a6d84bd470 Fixed incorrect savegame path detection when reading/writing sfallgv.sav and sfallfs.sav under certain circumstances. (from Crafty) 2016-08-01 16:45:12 +08:00
NovaRain a11228a5ec Fixed get_screen_width/height functions not returning correct values when using older versions of hi-res patch. 
Corrected the parameter for intface_update_ac_ in wield_obj_critter fix.
Update the unlimited ammo exploit fix from Crafty's mod.
Removed unnecessary engine-related defines and constants that were added since 3.7b.
 2016-07-28 17:05:40 +08:00
NovaRain 7784e199af Integrated NumbersInDialogue option from Crafy's mod. 
Moved NPCLevelFix to Bugs.cpp.
Used "push retn" instead of "mov jmp" for some jumps, to skip using registers (at least in logic).
Changed the displayed version number to the same as the internal version number.
 2016-07-26 11:03:56 +08:00
NovaRain 53895a4af2 Added CreditsAtBottom option to display sfall built-in credits at the bottom of credits.txt contents. 
Unified log message format in main.cpp and bugs.cpp.
 2016-07-18 16:54:13 +08:00
NovaRain 643d8d3886 Added fix for destroy_p_proc not being called if the critter is killed by explosives when you leave the map. 
Integrated Crafty's explosives crash fix.
Updated the link of NMA forum post in the comment.
 2016-07-13 15:59:14 +08:00
NovaRain 924c35d011 Improved the unlimited ammo exploit fix to prevent crashes during map transition in RP new areas. (from Crafty) 
Updated set_new_results_hack with Crafty's newer code base.
 2016-07-12 09:47:26 +08:00
NovaRain 86163bf94c Changed the script procs defines in ScriptExtender.h to their real procedure names in SSL. 2016-07-06 17:15:05 +08:00
NovaRain 21b2d34432 Added some new engine-related defines and constants. 2016-06-03 09:38:31 +08:00
NovaRain 98508a9c76 Added a bug fix for incorrect initialization of action points at the beginning of each turn (from Crafty's mod) 
Removed unused code in Bugs.cpp.
 2016-05-27 10:37:12 +08:00
NovaRain f8b232cc09 Changed how SpeedInterfaceCounterAnims=2 works (from Crafty's mod). Now it updates the hp/ac counter instantly no matter what. 
Fixed get_screen_width/height functions not returning correct values when using the windowed mode in the hi-res patch.
Added some new engine-related defines and constants.
 2016-05-17 12:20:22 +08:00
NovaRain 394b4b9967 Edited the description of ExtraGameMsgFileList a bit. 2016-05-11 15:33:01 +08:00
NovaRain 1bea84eb3c Added ExtraGameMsgFileList setting to ddraw.ini, and updated message_str_game reference in sfall function notes.txt. 
Added a couple of new engine-related defines.
Updated version number. (Need to consider changing to semantic versioning for 3.8.)
 2016-05-10 17:18:31 +08:00
NovaRain 26159138e0 Removed the duplicated include from HeroAppearance.cpp. 2016-05-10 12:48:17 +08:00
NovaRain 1883009930 Cleaned up some artifacts in codes. 2016-05-10 12:42:34 +08:00
NovaRain f1289c1e7d Merge branch 'feature/extra_msg' of https://github.com/Vennor/sfall into Vennor-feature/extra_msg 
# Conflicts:
#	sfall/Message.cpp
#	sfall/Message.h
 2016-05-10 12:33:44 +08:00
NovaRain fcdb5633d4 Edited the description of InstantWeaponEquip a bit. 2016-04-21 09:21:12 +08:00
NovaRain 4e2bfd6b08 Some minor document edits: fixing typos, removing double/trailing spaces, unifying space/tab usages, and lining up some lines. 2016-04-20 10:20:05 +08:00
NovaRain 8c0fab1f6b Added an example mod of hs_keypress. 2016-04-19 17:18:26 +08:00
NovaRain 05f15f0262 Removed incorrect information from sfall function notes. 
Edited the description in ddraw.ini with less self-advertising.
Added a few new engine-related defines and constants.
 2016-04-18 10:28:12 +08:00
NovaRain 147cb50a66 Moved existing msg file reading functions and structs from HeroAppearance.cpp to a dedicated Message.h/.cpp file pair, for preparing to merge with Vennor's new feature. 
Enabled ComputeSprayMod by default (reason: more reasonable bullet distribution than vanilla logic, even with default ratios.)
Fixed a minor typo in sfall function list document.
 2016-04-07 12:04:24 +08:00
NovaRain 0ff6157b42 Added a few new engine-related defines and constants. 2016-03-31 09:43:15 +08:00
NovaRain 2bbb92420f Simplified the code of inventory drag and drop fix a bit (from Crafty's mod) 
Added a few new engine-related defines and constants.
Updated credits.
 2016-03-28 11:21:43 +08:00
NovaRain 694b699f15 Changed the order of script array element data removal from C++ containers. Without this std::unordered_map's keys were modified before erasure which lead to undefined behavior. 
(cherry picked from commit bdffc061d3)

Added keyHash map clearing after each for loop pass. Without this arrays could load hashed indices of elements they don't actually contain, which in turn could lead to crashes if certain conditions are met.

(cherry picked from commit 25094253e5)

Updated credits.
 2016-03-25 09:51:18 +08:00
NovaRain 720f937b4f Integrated Crafty's updated fix to prevent the game with old (pre-3.0) versions of f2_res from crashing/hanging while trying to use drag&drop to reload weapons in the inventory list. 
Added a few new engine-related defines and constants.
 2016-03-21 11:58:56 +08:00
NovaRain dfe4b6b2e0 Re-added CarChargingFix option back in ddraw.ini for other mods with custom vehicles. 2016-03-11 11:32:24 +08:00
NovaRain e99cca2b87 Added a few new engine-related defines and constants. 2016-03-07 11:41:04 +08:00
NovaRain 108719ac83 Added rounding calculation to ComputeSprayMod to give roundsCenter & roundsMainTarget some advantages. 
Added CarryWeightLimit option for changing the carry weight limit. (max value: 2^31 − 1, probably an overkill.)
 2016-03-07 11:29:26 +08:00
NovaRain 6feda61424 Added a check for old (pre-3.0) versions of f2_res to prevent the game from crashing/hanging while trying to use drag&drop to reload weapons in the inventory list. 2016-02-26 11:13:58 +08:00
NovaRain 19c94b8513 Simplified the code of Haenlomal's MultiHexFix a bit. 2016-02-24 09:47:26 +08:00
NovaRain af7b5cbb6b Condensed a few block of code in main.cpp with constant arrays, also made the DLL a bit smaller in size. 
Added new engine-related defines and constants.
 2016-02-19 11:08:00 +08:00
NovaRain 56009e1634 Moved the code of MultiHexFix to Bugs.cpp, and removed it from ddraw.ini. 
Optimized AnimationsAtOnceLimit.cpp using Crafty's method, which made the DLL about 10KB less in size.
 2016-02-18 15:25:56 +08:00
NovaRain 7bd3bd4128 Integrated InstantWeaponEquip option from Crafty's mod. 
Added PipboyTimeAnimDelay option to allow player to control the speed of pipboy alarm clock animations in certain degree.
 2016-02-16 16:44:24 +08:00
NovaRain 696be7fac5 Integrated the expanded SpeedInterfaceCounterAnims from Crafty's mod. 
Added new engine-related defines and constants.
 2016-02-15 13:13:31 +08:00
NovaRain 66dd966d8a Made a minor edit on ddraw.ini 2015-12-15 14:05:04 +08:00
NovaRain 8ce9ae89eb Removed TooManyItemsBugFix, InventoryDragIssuesFix, NPCDrugAddictionFix, ArmorCorruptsNPCStatsFix, NPCTurnsIntoContainerFix, CarChargingFix, NPCWeightFix from ddraw.ini 
Updated version number.
 2015-12-15 12:45:42 +08:00
NovaRain 361e961b38 Merge remote-tracking branch 'origin/master' into develop 2015-12-14 12:33:41 +08:00
NovaRain 473fbf81b4 Integrated ReloadReserve setting from Crafty's mod for skipping the 'Move Items' window when using drap and drop to reload weapons in the inventory. 
Partially refactored HeroAppearance.cpp to use proper engine function/variable names and unified the indent style across the code.
 2015-11-17 12:56:03 +08:00
NovaRain 225f36808d Added an optional bug fix for not counting in the weight of equipped items on NPC when stealing or bartering. 
Added an additional fix to InventoryDragIssuesFix for only using one box of ammo when the weapon is before the ammo.
Partially refactored Credits.cpp and QuestList.cpp to use proper engine function/variable names.
 2015-11-16 15:07:24 +08:00
NovaRain 879315b4d0 Partially refactored most of the source code to use proper engine function/variable names. 2015-11-16 10:40:26 +08:00
NovaRain 971be61d95 Integrated two bug fixes and a minor feature based on Crafty's code: 
1. Added CanSellUsedGeiger to fix the issue that unable to sell used geiger counters or stealth boys.
2. Added TownMapHotkeysFix to prevent players from using number keys to enter unknown areas on a town map. (original DisableHotkeysForUnknownAreasInCity is a bit too long IMO.)
3. Added EnableMusicInDialogue to leave the music playing in dialogue with talking heads.
Removed WieldObjCritterFix from ddraw.ini (was planning to do so in 3.7 but forgot)
Set DialogOptions9Lines enabled by default.
 2015-11-03 16:14:27 +08:00
NovaRain 25e2939fd0 Removed obsolete Jim's damage formula. 2015-10-28 10:43:11 +08:00
NovaRain 019d2d7095 Set InventoryDragIssuesFix enabled by default. 2015-10-27 15:21:26 +08:00
NovaRain c34dc2700a Added an optional bug fix for the car charging issues, and made some changes in the wording. 
Fixed the incorrect setting in CriticalOverrides.ini.
Updated version number for 3.7 release.
Unified tab/spaces usage, tweaked some typesettings, and trimmed trailing spaces in documents.
 2015-10-27 12:26:01 +08:00
NovaRain 65492941cc Added a break to prevent unexpected issue. 2015-10-06 13:12:47 +08:00
NovaRain 60ef5e91a1 minor changes for AmmoMod.cpp 2015-10-06 10:01:55 +08:00
NovaRain e907a8905b Integrated a minor feature and code changes from Crafty's mod: 
1. Added DisplayBonusDamage setting to display additional points of damage from Bonus HtH/Ranged Damage perks in the inventory.
2. Tweaked BonusHtHDamageFix to make it and DisplayBonusDamage interact with each other better.
3. Partially refactored code with proper engine function/variable names.
 2015-10-05 16:59:47 +08:00
NovaRain 44eae76402 Fixed two issues caused by enabling PerksFile setting: 
1. Both Armor Class and Melee Damage got increased by Heavy Handed trait.
2. Melee Damage bonus from Heavy Handed was less than it should have.
 2015-10-01 14:45:09 +08:00
NovaRain 5b2eea0bd7 Removed explicit zero-initialization of two variables for highlight function. 2015-08-17 11:19:46 +08:00
NovaRain 5e42537c42 Changed the naming of a couple of 'hook' functions to reflect their nature better. 
Rewrote descriptions of some newly added settings to make them constant with existing text.
 2015-08-14 12:26:08 +08:00
NovaRain 582fa35483 Removed highlight color setting for containers. 
Its functionality now merged with HighlightContainers. Can only be set to yellow and purple. (Maybe just set it to only one color after phobos2077 checks the outline color scheme in game engine.)
 2015-08-04 10:42:25 +08:00
NovaRain dc67cb3b7f Removed highlight color customization settings for items. 
Reverted highlight color for mouseovering items on the ground back to yellow as in vanilla (was changed to purple by Crafty)
Prepare to remove highlight color customization for containers as well. Reason: very limited color selection, no point in adding separated settings for it.
 2015-08-03 11:58:53 +08:00
NovaRain 6e1235147b Added a quick-and-dirty way to customize highlight colors. 
Currently experimental only, need some serious reworking.
 2015-07-29 16:07:26 +08:00
NovaRain 03ddd2e12e Removed unnecessary defines. 2015-07-27 11:21:22 +08:00
NovaRain 35380171cf Now Dodgy Door Fix is applied to both melee and ranged attacks. 2015-07-22 10:38:18 +08:00
NovaRain 77b299aeba Added final version of 'NPC turns into a container' bug fix 
Also added related definitions in corresponding source files
 2015-07-22 10:33:34 +08:00
NovaRain f0ecb65962 Removed BlackSkilldexFix, JetAntidoteFix, SpecialUnarmedAttacksFix and DodgyDoorsFix from ddraw.ini 2015-07-13 10:25:06 +08:00
NovaRain 1b3017c470 Integrated fixes and minor features from Crafty's mod 
1. bug fix for SpeedInterfaceCounterAnims
2. new Sharpshooter fix proposed by Slider2k
3. added StackEmptyWeapons
4. updated Credits
 2015-07-13 10:22:48 +08:00