From 2f22a1e982c2c9e1c29d354fd7b891e5933901da Mon Sep 17 00:00:00 2001 From: NovaRain Date: Mon, 25 Jun 2018 22:12:42 +0800 Subject: [PATCH] Edited the description of HOOK_USEANIMOBJ in hookscripts.txt. Removed obsoleted WIN2K preprocessor define. Updated version number. --- artifacts/ddraw.ini | 2 +- artifacts/scripting/hookscripts.txt | 13 ++++++------- sfall/Modules/Graphics.cpp | 4 ---- sfall/version.h | 8 ++------ 4 files changed, 9 insertions(+), 18 deletions(-) diff --git a/artifacts/ddraw.ini b/artifacts/ddraw.ini index 44aff074..6ebaa955 100644 --- a/artifacts/ddraw.ini +++ b/artifacts/ddraw.ini @@ -1,5 +1,5 @@ ;sfall configuration settings -;v4.0.5 +;v4.0.7 [Main] ;Change to 1 if you want to use command line args to tell sfall to use another ini file. diff --git a/artifacts/scripting/hookscripts.txt b/artifacts/scripting/hookscripts.txt index 01ee6a67..f3302dec 100644 --- a/artifacts/scripting/hookscripts.txt +++ b/artifacts/scripting/hookscripts.txt @@ -497,7 +497,7 @@ int arg2 - event type: 1 - when the resting ends normally, -1 - when pressin int arg3 - the hour part of the length of resting time int arg4 - the minute part of the length of resting time -int ret1 - pass 1 to interrupt the resting, or pass 0 to continue the rest if it was interrupted by the player using the Esc key. +int ret1 - pass 1 to interrupt the resting, pass 0 to continue the rest if it was interrupted by pressing ESC key ------------------------------------------- @@ -511,11 +511,10 @@ int arg1 - event type: 1 - when the player exits the game, 0 - otherwise HOOK_USEANIMOBJ (hs_useanimobj.int) -Runs before the uses animation the map object (or walking/running animation if the player is at a distance from the object). -Hook allows to override the usage animation. +Runs before playing the "use" (usually "magic hands") animation when a critter uses a scenery/container object on the map, or before walking/running animation if the player is at a distance from the object. -Critter arg1 - critter that uses an object (usually dude_obj) -Obj arg2 - the map object that is used -int arg3 - animation code (ANIM_* see Animcomd.h) +Critter arg1 - the critter that uses an object (usually dude_obj) +Obj arg2 - the object being used +int arg3 - the animation code being used (see ANIM_* in Animcomd.h) -int ret1 - pass the animation code to override the animation, or pass -1 to skip the usage animation +int ret1 - overrides the animation code (pass -1 if you want to skip the animation) diff --git a/sfall/Modules/Graphics.cpp b/sfall/Modules/Graphics.cpp index a7ec1232..f63d834b 100644 --- a/sfall/Modules/Graphics.cpp +++ b/sfall/Modules/Graphics.cpp @@ -983,11 +983,7 @@ void Graphics::init() { } if (Graphics::mode == 4 || Graphics::mode == 5) { dlog("Applying dx9 graphics patch.", DL_INIT); -#ifdef WIN2K -#define _DLL_NAME "d3dx9_42.dll" -#else #define _DLL_NAME "d3dx9_43.dll" -#endif HMODULE h = LoadLibraryEx(_DLL_NAME, 0, LOAD_LIBRARY_AS_DATAFILE); if (!h) { MessageBoxA(0, "You have selected graphics mode 4 or 5, but " _DLL_NAME " is missing\nSwitch back to mode 0, or install an up to date version of DirectX", "Error", 0); diff --git a/sfall/version.h b/sfall/version.h index 7357e338..5b0be16e 100644 --- a/sfall/version.h +++ b/sfall/version.h @@ -24,14 +24,10 @@ #define VERSION_MAJOR 4 #define VERSION_MINOR 0 -#define VERSION_BUILD 5 +#define VERSION_BUILD 7 #define VERSION_REV 0 -#ifdef WIN2K -#define VERSION_STRING "4.0.5 win2k" -#else -#define VERSION_STRING "4.0.5" -#endif +#define VERSION_STRING "4.0.7" #define CHECK_VAL (4)