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

Cosmetic edits: alignment of multi-line ternary

Browse Source
This commit is contained in:
NovaRain
2021-04-07 21:07:20 +08:00
parent 1f90894dc5
commit 78aadeebe5
10 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/Arrays.cpp
+2 -2
View File
@@ -538,8 +538,8 @@ void __stdcall setArray(DWORD id, DWORD key, DWORD keyType, DWORD val, DWORD val
sArrayElement sEl(key, keyType);
ArrayKeysMap::iterator elIter = arr.keyHash.find(sEl);
int el = (elIter != arr.keyHash.end())
? elIter->second
: -1;
? elIter->second
: -1;
bool lookupMap = (arr.flags & ARRAYFLAG_CONSTVAL) != 0;
if (lookupMap && el != -1) return; // don't update value of key
sfall/Combat.cpp
+2 -2
View File
@@ -355,8 +355,8 @@ void __stdcall KnockbackSetMod(TGameObj* object, DWORD type, float val, DWORD mo
}
long id = (mode == 0)
? Objects_SetSpecialID(object)
: Objects_SetObjectUniqueID(object);
? Objects_SetSpecialID(object)
: Objects_SetObjectUniqueID(object);
KnockbackModifier mod = { id, type, (double)val };
for (size_t i = 0; i < mods->size(); i++) {
sfall/ExtraSaveSlots.cpp
+2 -2
View File
@@ -436,8 +436,8 @@ static DWORD __stdcall QuickSaveGame(DbFile* file, char* filename) {
FILETIME ftCurrSlot;
GetSaveFileTime(filename, &ftCurrSlot);
if (currSlot == 0 || ftCurrSlot.dwHighDateTime > ftPrevSlot.dwHighDateTime
|| (ftCurrSlot.dwHighDateTime == ftPrevSlot.dwHighDateTime && ftCurrSlot.dwLowDateTime > ftPrevSlot.dwLowDateTime))
if (currSlot == 0 || ftCurrSlot.dwHighDateTime > ftPrevSlot.dwHighDateTime ||
(ftCurrSlot.dwHighDateTime == ftPrevSlot.dwHighDateTime && ftCurrSlot.dwLowDateTime > ftPrevSlot.dwLowDateTime))
{
ftPrevSlot.dwHighDateTime = ftCurrSlot.dwHighDateTime;
ftPrevSlot.dwLowDateTime = ftCurrSlot.dwLowDateTime;
sfall/HeroAppearance.cpp
+4 -4
View File
@@ -1016,11 +1016,11 @@ endFunc:
static void __fastcall HeroGenderChange(long gender) {
// get PC stat current gender
long newGender = fo_stat_level(*ptr_obj_dude, STAT_gender);
if (newGender == gender) return; // check if gender has been changed
if (newGender == gender) return; // check if gender has been changed
long baseModel = (newGender) // check if male 0
? *(DWORD*)0x5108AC // base female model
: *ptr_art_vault_person_nums; // base male model
long baseModel = (newGender) // check if male (0)
? *(DWORD*)0x5108AC // base female model
: *ptr_art_vault_person_nums; // base male model
// adjust base hero art
baseModel += critterListSize;
sfall/HookScripts.cpp
+2 -2
View File
@@ -260,8 +260,8 @@ static long __stdcall CalcApCostHook_Script(TGameObj* source, long hitMode, long
long __stdcall CalcApCostHook_Invoke(TGameObj* source, long hitMode, long isCalled, long cost, TGameObj* weapon) {
return (HookHasScript(HOOK_CALCAPCOST))
? CalcApCostHook_Script(source, hitMode, isCalled, cost, weapon)
: cost;
? CalcApCostHook_Script(source, hitMode, isCalled, cost, weapon)
: cost;
}
static void __declspec(naked) CalcApCostHook() {
sfall/PartyControl.cpp
+4 -4
View File
@@ -128,8 +128,8 @@ static void TakeControlOfNPC(TGameObj* npc) {
// change level
int level = fo_isPartyMember(npc)
? fo_partyMemberGetCurLevel(npc)
: 0;
? fo_partyMemberGetCurLevel(npc)
: 0;
*ptr_Level_ = level;
*ptr_last_level = level;
@@ -397,8 +397,8 @@ bool PartyControl_IsNpcControlled() {
TGameObj* PartyControl_RealDudeObject() {
return realDude.obj_dude != nullptr
? realDude.obj_dude
: *ptr_obj_dude;
? realDude.obj_dude
: *ptr_obj_dude;
}
static char levelMsg[12], armorClassMsg[12], addictMsg[16];
sfall/ReplacementFuncs.cpp
+4 -4
View File
@@ -81,8 +81,8 @@ DWORD __stdcall sfgame_adjust_fid() {
sProto* armorPro;
GetProto((*ptr_i_worn)->protoId, &armorPro);
DWORD armorFid = fo_stat_level(*ptr_inven_dude, STAT_gender) == GENDER_FEMALE
? armorPro->item.armor.femaleFID
: armorPro->item.armor.maleFID;
? armorPro->item.armor.femaleFID
: armorPro->item.armor.maleFID;
if (armorFid != -1) {
indexNum = armorFid;
@@ -90,8 +90,8 @@ DWORD __stdcall sfgame_adjust_fid() {
}
}
TGameObj* itemInHand = fo_intface_is_item_right_hand()
? *ptr_i_rhand
: *ptr_i_lhand;
? *ptr_i_rhand
: *ptr_i_lhand;
if (itemInHand != nullptr) {
sProto* itemPro;
sfall/ScriptExtender.cpp
+4 -4
View File
@@ -151,14 +151,14 @@ public:
const char* asString() const {
return (_type == DATATYPE_STR)
? _val.str
: "";
? _val.str
: "";
}
TGameObj* asObject() const {
return (_type == DATATYPE_INT)
? _val.gObj
: nullptr;
? _val.gObj
: nullptr;
}
TGameObj* object() const {
sfall/ScriptOps/InterfaceOps.hpp
+5 -5
View File
@@ -445,13 +445,13 @@ static void mf_inventory_redraw() {
static void mf_create_win() {
int flags = (opHandler.numArgs() > 5)
? opHandler.arg(5).rawValue()
: WinFlags::MoveOnTop;
? opHandler.arg(5).rawValue()
: WinFlags::MoveOnTop;
if (fo_createWindow(opHandler.arg(0).strValue(),
opHandler.arg(1).rawValue(), opHandler.arg(2).rawValue(), // x, y
opHandler.arg(3).rawValue(), opHandler.arg(4).rawValue(), // w, h
(flags & WinFlags::Transparent) ? 0 : 256, flags) == -1)
opHandler.arg(1).rawValue(), opHandler.arg(2).rawValue(), // x, y
opHandler.arg(3).rawValue(), opHandler.arg(4).rawValue(), // w, h
(flags & WinFlags::Transparent) ? 0 : 256, flags) == -1)
{
opHandler.printOpcodeError("create_win() - couldn't create window.");
opHandler.setReturn(-1);
sfall/Stats.cpp
+2 -2
View File
@@ -352,8 +352,8 @@ void Stats_Init() {
for (size_t i = 0; i < 99; i++) {
xpTable[i] = (i < numLevels)
? atoi(xpTableList[i].c_str())
: -1;
? atoi(xpTableList[i].c_str())
: -1;
}
SafeWrite8(0x4AFB1B, static_cast<BYTE>(numLevels + 1));
}