You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Tree: 3508aa6d3d

1.3

1.4

1.5

AJenbo-patch-1

FindSlotUnderCursor

LineClear

LineClear-test

M_RoundWalk

access

amiga-fix

codeql

cpp20-using-enum

dependabot/github_actions/jidicula/clang-format-action-4.17.0

dev-app-icon

development

dun-data2

dyn-players

dyn-players-param

dyn-players-param2

fabiensanglard

fix-spectral-hack

glebm-patch-1

hubui

install

inv

julealgon/Enhancements/DamageStruct

master

maxexp

mpqfs

mutiny

next

player-max

ps2

psp

render

substitution

surface-to-cel

test

v1.0

w98-profile

wii

xad

xbrz

yuripourre-enhance-description

0.1.0

0.2.0

0.3.0

0.3.1

0.4.0

0.5.0

1.0.0

1.0.1

1.0.2

1.0.3

1.1.0

1.2.0

1.2.1

1.3.0

1.4.0

1.4.1

1.5.0

1.5.1

1.5.2

1.5.3

1.5.4

1.5.5

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '3508aa6d3d'

${ noResults }

devilutionX/Source

History

Andrew James 3508aa6d3d Align Life/Mana flask drawing routines (#2291) ... * Clamp hpPer as a sanity check * Refactor update mana routines in control.cpp to use PlayerStruct::UpdateManaPercentage * Remove unnecessary calls to UpdateHP/ManaPercentage * Unify logic that draws the flasks into a single internal function * Fix style violations * Remove unnecessary save/loads of hp/manaPer The way this variable is used expects a value in this range and it gets clamped again anyway, but this makes the code more similar to the manaPer logic for future refactoring Identical logic in use, the checks to see if the values are negative can be accomplished using clamp and the same divide by zero guard. I'll combine the two attributes in a near future commit. control_update_life_mana is called during the game loop before any of the drawing functions so hpPer/manaPer are calculated based on the latest current/max of their respective attributes every frame. There's no need to do the calculation again in the draw routines. (There's also no need to calculate this every frame but that's going to take a bit to untangle.)		5 years ago
..
DiabloUI	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
controls	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
dvlnet	♻️Clean up variable initialization	5 years ago
engine	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
miniwin	♻️ Leverage 'Point' to represent mouse position warping	5 years ago
platform	Switch custom RNG for libsodium	5 years ago
qol	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
storm	♻️Clean up variable initialization	5 years ago
utils	Clang-tidy: misc-unused-parameters	5 years ago
.clang-format	…
.clang-tidy	Revert and disable readability-convert-member-functions-to-static	5 years ago
appfat.cpp	🔥 Delete FileErrDlg as it is now unused	5 years ago
appfat.h	🔥 Delete FileErrDlg as it is now unused	5 years ago
automap.cpp	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
automap.h	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
capture.cpp	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
capture.h	…
codec.cpp	🐛 Fix password expansion	5 years ago
codec.h	Move byte from engine.h	5 years ago
control.cpp	Align Life/Mana flask drawing routines (#2291)	5 years ago
control.h	Align Life/Mana flask drawing routines (#2291)	5 years ago
cursor.cpp	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
cursor.h	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
dead.cpp	Clang-tidy: llvm-namespace-comment	5 years ago
dead.h	🚚 engine.h: Extract `Point`, `Direction`, `clamp`	5 years ago
debug.cpp	Clean up debug code	5 years ago
debug.h	♻️ Store CEL width with the sprite itself	5 years ago
devilutionx.exe.manifest	…
diablo.cpp	Align Life/Mana flask drawing routines (#2291)	5 years ago
diablo.h	Introduce GameLogicStep	5 years ago
doom.cpp	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
doom.h	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
drlg_l1.cpp	Clang-tidy: FunctionCase part 1	5 years ago
drlg_l1.h	Clang-tidy: readability-inconsistent-declaration-parameter-name	5 years ago
drlg_l2.cpp	Clang-tidy: GlobalConstantCase	5 years ago
drlg_l2.h	Clang-tidy: readability-inconsistent-declaration-parameter-name	5 years ago
drlg_l3.cpp	Clang-tidy: ConstexprVariableCase	5 years ago
drlg_l3.h	🔥 Remove more miniwin dependencies	5 years ago
drlg_l4.cpp	If cleanup + bugfixes (#2273)	5 years ago
drlg_l4.h	🔥 Remove more miniwin dependencies	5 years ago
dthread.cpp	Clang-tidy: FunctionCase part 1	5 years ago
dthread.h	♻️Migrate more code away from miniwin	5 years ago
dx.cpp	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
dx.h	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
effects.cpp	Clang-tidy: FunctionCase part 1	5 years ago
effects.h	Refactor PlaySfxLoc to take a Point instead of x/y params	5 years ago
effects_stubs.cpp	Refactor PlaySfxLoc to take a Point instead of x/y params	5 years ago
encrypt.cpp	Stabalize clang-tidy runs	5 years ago
encrypt.h	Move byte from engine.h	5 years ago
engine.cpp	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
engine.h	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
error.cpp	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
error.h	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
gamemenu.cpp	Clang-tidy: FunctionCase part 1	5 years ago
gamemenu.h	Add a keymapper	5 years ago
gendung.cpp	♻️Clean up variable initialization	5 years ago
gendung.h	♻️ Replace Point addition with 'Point + Displacement'	5 years ago
gmenu.cpp	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
gmenu.h	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
help.cpp	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
help.h	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
hwcursor.cpp	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
hwcursor.hpp	Hardware Cursor: Fall back to software on failure	5 years ago
init.cpp	Clang-tidy: FunctionCase part 1	5 years ago
init.h	🐛 Do not utilize translations till after it has been initialize	5 years ago
interfac.cpp	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
interfac.h	Modernize deprecated headers	5 years ago
inv.cpp	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
inv.h	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
itemdat.cpp	Align data tables	5 years ago
itemdat.h	Merge remote-tracking branch 'refs/remotes/devilution/master'	5 years ago
items.cpp	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
items.h	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
lighting.cpp	fix typo (#2266)	5 years ago
lighting.h	fix typo (#2266)	5 years ago
loadsave.cpp	Align Life/Mana flask drawing routines (#2291)	5 years ago
loadsave.h	Player by reference part 3	5 years ago
main.cpp	Clang-tidy: basic naming	5 years ago
mainmenu.cpp	Clang-tidy: FunctionCase part 1	5 years ago
mainmenu.h	🎨 Format code	5 years ago
minitext.cpp	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
minitext.h	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
misdat.cpp	Merge remote-tracking branch 'refs/remotes/devilution/master'	5 years ago
misdat.h	Refactor missiles.cpp	5 years ago
missiles.cpp	Clang-tidy: FunctionCase part 1	5 years ago
missiles.h	♻️ Replace Point addition with 'Point + Displacement'	5 years ago
monstdat.cpp	Harmonize DelayLen for Player and Monster (was 1-based on monseter (>= DelayLen) and 0-based on player (> DelayLen). Now both are 1-based (>= DelayLen)	5 years ago
monstdat.h	♻️Refactor towner initialization	5 years ago
monster.cpp	Correct assertions in ProcessMonsters	5 years ago
monster.h	Clang-tidy: GlobalConstantCase	5 years ago
movie.cpp	Clang-tidy: misc-unused-parameters	5 years ago
movie.h	🔥 Remove more miniwin dependencies	5 years ago
mpqapi.cpp	Clang-tidy: ConstexprVariableCase	5 years ago
mpqapi.h	Move byte from engine.h	5 years ago
msg.cpp	Merge remote-tracking branch 'refs/remotes/devilution/master'	5 years ago
msg.h	Update random number functions to avoid IB (#2226)	5 years ago
multi.cpp	Clang-tidy: GlobalConstantCase	5 years ago
multi.h	Update random number functions to avoid IB (#2226)	5 years ago
nthread.cpp	Clang-tidy: FunctionCase part 1	5 years ago
nthread.h	🎨 Format code	5 years ago
objdat.cpp	🐛 [hellfire] Fix missing braziers in crypt (causing instability)	5 years ago
objdat.h	Modernize deprecated headers	5 years ago
objects.cpp	Clang-tidy: FunctionCase part 1	5 years ago
objects.h	Merge remote-tracking branch 'refs/remotes/devilution/master'	5 years ago
options.cpp	Clang-tidy: llvm-include-order	5 years ago
options.h	♻️Create QuickMessage struct	5 years ago
pack.cpp	Move RNG functions to their own header/source files	5 years ago
pack.h	♻️Clean up implicit bool conversions	5 years ago
palette.cpp	Move RNG functions to their own header/source files	5 years ago
palette.h	Optimize blended transparency calculations at the end of Poisoned Water Supply.	5 years ago
path.cpp	♻️Clean up variable initialization	5 years ago
path.h	🚚 engine.h: Extract `Point`, `Direction`, `clamp`	5 years ago
pfile.cpp	Clang-tidy: readability-simplify-boolean-expr	5 years ago
pfile.h	♻️Migrate more code away from miniwin	5 years ago
player.cpp	Clang-tidy: FunctionCase part 1	5 years ago
player.h	Align Life/Mana flask drawing routines (#2291)	5 years ago
plrmsg.cpp	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
plrmsg.h	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
portal.cpp	Refactor missiles.cpp	5 years ago
portal.h	🚚 engine.h: Extract `Point`, `Direction`, `clamp`	5 years ago
quests.cpp	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
quests.h	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
restrict.cpp	Convert ReadOnlyTest to FOpen	5 years ago
restrict.h	…
scrollrt.cpp	Align Life/Mana flask drawing routines (#2291)	5 years ago
scrollrt.h	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
setmaps.cpp	🚚 engine.h: Extract `CelSprite` and file loading	5 years ago
setmaps.h	🎨 Format code	5 years ago
sha.cpp	♻️Clean up variable initialization	5 years ago
sha.h	Modernize deprecated headers	5 years ago
sound.cpp	Clang-tidy: GlobalConstantCase	5 years ago
sound.h	Fix sound volume/panning attenuation (#1789)	5 years ago
sound_stubs.cpp	🐞 Duplicate sounds: Fix data race	5 years ago
spelldat.cpp	Correct hellfire/spawn Elemental spell levels	5 years ago
spelldat.h	Modernize deprecated headers	5 years ago
spells.cpp	Merge remote-tracking branch 'refs/remotes/devilution/master'	5 years ago
spells.h	♻️Unfold a few functions	5 years ago
stores.cpp	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
stores.h	🚚 Rename `CelOutputBuf` to `Surface` and extract	5 years ago
sync.cpp	Clang-tidy: FunctionCase part 1	5 years ago
sync.h	Move byte from engine.h	5 years ago
textdat.cpp	Missing transcriptions (#1341)	5 years ago
textdat.h	Add blacksmith's missing transcriptions (#1203)	5 years ago
themes.cpp	♻️Clean up variable initialization	5 years ago
themes.h	Modernize deprecated headers	5 years ago
tmsg.cpp	♻️Migrate more code away from miniwin	5 years ago
tmsg.h	Move byte from engine.h	5 years ago
town.cpp	♻️Clean up variable initialization	5 years ago
town.h	🎨 Format code	5 years ago
towners.cpp	Merge remote-tracking branch 'refs/remotes/devilution/master'	5 years ago
towners.h	Update random number functions to avoid IB (#2226)	5 years ago
track.cpp	♻️Clean up implicit bool conversions	5 years ago
track.h	🎨 Format code	5 years ago
trigs.cpp	Clean up debug code	5 years ago
trigs.h	🚚 engine.h: Extract `Point`, `Direction`, `clamp`	5 years ago