mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-11 07:12:16 +00:00
5b9073add4
- Fixed: ACS SetMugShotState needs to check the StatusBar pointer for the proper object type. - Move SBarInfo loading code in d_main.cpp into a static method of DSBarInfo. - Removed dobject.err from the repository. It only contained a list of compiler errors for some very old version of dobject.cpp. - Fixed: A_JumpIfCloser was missing a z-check. - Added Blzut3's SBARINFO update #13: - Split sbarinfo.cpp into two files sbarinfo_display.cpp and sbarinfo_parser.cpp - Rewrote the mug shot system for SBarInfo to allow for scripting and custom states for different means of death. - SBarInfo now loads all SBarInfo lumps instead of just the last one. Clashing status bar definitions will now be cleared before the bar is read. - Fixed: When using transparency with bars the new drawing method (bg over fg) didn't work. In the case that the border value is set to 0 it will revert to the old method (fg over bg). - Fixed: drawbar lost any high res information it was given. - Added: ACS command SetMugShotState(str state) which sets the mug shot state for the activating player. - Added: keepoffsets flag to drawbar. When set the offsets in the fg image will also be applied when displaying the bar. SVN r812 (trunk)
49 lines
No EOL
492 B
Text
49 lines
No EOL
492 B
Text
mugshot "Normal", health2
|
|
{
|
|
{ST00, ST01, ST02} 17;
|
|
}
|
|
|
|
mugshot "Pain", healthspecial, directional
|
|
{
|
|
{TR00, KILL0, TL00} 35;
|
|
}
|
|
|
|
mugshot "Rampage", health
|
|
{
|
|
KILL0 1;
|
|
}
|
|
|
|
mugshot "Ouch", health
|
|
{
|
|
OUCH0 35;
|
|
}
|
|
|
|
mugshot "Grin", health
|
|
{
|
|
EVL0 70;
|
|
}
|
|
|
|
mugshot "God"
|
|
{
|
|
GOD0 -1;
|
|
}
|
|
|
|
mugshot "GodAnimated"
|
|
{
|
|
{GOD0, GOD1, GOD2} 17;
|
|
}
|
|
|
|
mugshot "Death"
|
|
{
|
|
DEAD0 -1;
|
|
}
|
|
|
|
mugshot "XDeath"
|
|
{
|
|
XDTH0 10;
|
|
XDTH1 10;
|
|
XDTH2 10;
|
|
XDTH3 10;
|
|
XDTH4 10;
|
|
XDTH5 -1;
|
|
} |