OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added Jim' Linux fix.

Browse source 
- Added MartinHowe's fix for mugshot display in status bars.


SVN r856 (trunk)
This commit is contained in:
Christoph Oelckers 2008-03-26 08:50:54 +00:00
commit 670edb2356
10 changed files with 138 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/g_doom/doom_sbar.cpp
View file

@ -125,6 +125,11 @@ public:
OldFaceIndex = -1;
}
void AddFaceToImageCollection (void *skn, FImageCollection *images)
{
AddFaceToImageCollectionActual (skn, images, true);
}
void MultiplayerChanged ()
{
DBaseStatusBar::MultiplayerChanged ();
@ -989,24 +994,6 @@ private:
NUM_DOOMSB_IMAGES
};
enum
{
ST_NUMPAINFACES = 5,
ST_NUMSTRAIGHTFACES = 3,
ST_NUMTURNFACES = 2,
ST_NUMSPECIALFACES = 3,
ST_NUMEXTRAFACES = 2,
ST_FACESTRIDE = ST_NUMSTRAIGHTFACES+ST_NUMTURNFACES+ST_NUMSPECIALFACES,
ST_NUMFACES = ST_FACESTRIDE*ST_NUMPAINFACES+ST_NUMEXTRAFACES,
ST_TURNOFFSET = ST_NUMSTRAIGHTFACES,
ST_OUCHOFFSET = ST_TURNOFFSET + ST_NUMTURNFACES,
ST_EVILGRINOFFSET = ST_OUCHOFFSET + 1,
ST_RAMPAGEOFFSET = ST_EVILGRINOFFSET + 1,
ST_GODFACE = ST_NUMPAINFACES*ST_FACESTRIDE,
ST_DEADFACE = ST_GODFACE + 1
};
FImageCollection Images;
FImageCollection Faces;