diff --git a/artifacts/translations/french.ini b/artifacts/translations/french.ini index 402c4209..e57e8efb 100644 --- a/artifacts/translations/french.ini +++ b/artifacts/translations/french.ini @@ -14,7 +14,7 @@ NPCPickupFail=%s ne peux pas prendre cet objet. AmmoInfoGlovz=Div. : RD/%d, SD/%d AmmoInfoYAAM=Mod. SD : %d -PartyOrderAttackHuman=Je m'en occupe|Okay, je fais ça|Bonne idée +PartyOrderAttackHuman=Je m'en occupe.|Okay, je fais ça.|Bonne idée. PartyOrderAttackCreature=::Grogne:: PartyOrderAttackRobot=::Biip:: diff --git a/sfall/Modules/PartyControl.cpp b/sfall/Modules/PartyControl.cpp index 858da15b..3e0b944f 100644 --- a/sfall/Modules/PartyControl.cpp +++ b/sfall/Modules/PartyControl.cpp @@ -19,7 +19,6 @@ #include "..\main.h" #include "..\FalloutEngine\Fallout2.h" #include "..\Translate.h" -#include "..\Utils.h" #include "Drugs.h" #include "HookScripts.h" @@ -27,7 +26,6 @@ #include "ScriptExtender.h" //#include "Objects.h" -#include "..\Game\inventory.h" #include "..\Game\objects.h" #include "..\Game\tilemap.h" @@ -709,10 +707,10 @@ static void __fastcall action_attack_to(long unused, fo::GameObject* partyMember targetObject->outline = outlineColor; fo::func::obj_bound(targetObject, &rect); if (!outlineColor) { - rect.x--; - rect.y--; - rect.offx += 2; - rect.offy += 2; + rect.x--; + rect.y--; + rect.offx += 2; + rect.offy += 2; } fo::func::tile_refresh_rect(&rect, fo::var::map_elevation); targetObject = validTarget = nullptr; @@ -759,7 +757,7 @@ static void __fastcall action_attack_to(long unused, fo::GameObject* partyMember break; default: // biped long max = partyOrderAttackMsg.size() - 1; - long rnd = (max > 2) ? GetRandom(2, max) : 2; + long rnd = (max > 2) ? fo::func::roll_random(2, max) : 2; message = partyOrderAttackMsg[rnd].c_str(); } fo::util::PrintFloatText(partyMember, message, cap->color, cap->outline_color, cap->font); diff --git a/sfall/Utils.cpp b/sfall/Utils.cpp index 4b9c8ca2..0731796f 100644 --- a/sfall/Utils.cpp +++ b/sfall/Utils.cpp @@ -78,8 +78,8 @@ void StrNormalizePath(char* path) { } // max range 0-32767 -long GetRandom(long min, long max) { - return (min + (std::rand() % (max - (min - 1)))); -} +//long GetRandom(long min, long max) { // uncomment the srand() in main.cpp before use +// return (min + (std::rand() % (max - (min - 1)))); +//} } diff --git a/sfall/Utils.h b/sfall/Utils.h index 16c51359..b494a6a8 100644 --- a/sfall/Utils.h +++ b/sfall/Utils.h @@ -39,6 +39,6 @@ const char* strfind(const char* source, const char* word); void StrNormalizePath(char* path); -long GetRandom(long min, long max); +//long GetRandom(long min, long max); } diff --git a/sfall/main.cpp b/sfall/main.cpp index 471ba4e2..6ef2bfaf 100644 --- a/sfall/main.cpp +++ b/sfall/main.cpp @@ -267,7 +267,7 @@ static HMODULE SfallInit() { defaultIni: IniReader::SetDefaultConfigFile(); } - std::srand(GetTickCount()); + //std::srand(GetTickCount()); IniReader::init(); diff --git a/sfall/version.h b/sfall/version.h index 4d6cfadb..b5925b73 100644 --- a/sfall/version.h +++ b/sfall/version.h @@ -25,6 +25,6 @@ #define VERSION_MAJOR 4 #define VERSION_MINOR 3 #define VERSION_BUILD 8 -#define VERSION_REV 0 +#define VERSION_REV 1 -#define VERSION_STRING "4.3.8" +#define VERSION_STRING "4.3.8.1"