zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-24 21:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: DSBarInfo did not declare its object pointers for the garbage collector.

Browse source 
SVN r3559 (trunk)
This commit is contained in:
Randy Heit 2012-04-14 02:55:47 +00:00
parent b2336f5c21
commit 66a1b8be9d
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/g_shared/sbarinfo.cpp
View file

@ -948,6 +948,7 @@ inline void adjustRelCenter(bool relX, bool relY, const double &x, const double
class DSBarInfo : public DBaseStatusBar class DSBarInfo : public DBaseStatusBar
{ {
DECLARE_CLASS(DSBarInfo, DBaseStatusBar) DECLARE_CLASS(DSBarInfo, DBaseStatusBar)
HAS_OBJECT_POINTERS
public: public:
DSBarInfo (SBarInfo *script=NULL) : DBaseStatusBar(script->height, script->resW, script->resH), DSBarInfo (SBarInfo *script=NULL) : DBaseStatusBar(script->height, script->resW, script->resH),
ammo1(NULL), ammo2(NULL), ammocount1(0), ammocount2(0), armor(NULL), ammo1(NULL), ammo2(NULL), ammocount1(0), ammocount2(0), armor(NULL),
@ -1476,7 +1477,11 @@ private:
SBarInfoMainBlock *lastPopup; SBarInfoMainBlock *lastPopup;
}; };
IMPLEMENT_CLASS(DSBarInfo); IMPLEMENT_POINTY_CLASS(DSBarInfo)
DECLARE_POINTER(ammo1)
DECLARE_POINTER(ammo2)
DECLARE_POINTER(armor)
END_POINTERS
DBaseStatusBar *CreateCustomStatusBar (int script) DBaseStatusBar *CreateCustomStatusBar (int script)
{ {