zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-26 13:51:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Merged r1236, r1237, and r1240 of GZDoom.

Browse source 
SVN r3279 (trunk)
This commit is contained in:
Braden Obrzut 2011-08-14 23:53:20 +00:00
parent f42358ad08
commit 5c81cf20ba
4 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/dobjgc.cpp
View file

@ -533,7 +533,12 @@ void Barrier(DObject *pointing, DObject *pointed)
void DelSoftRootHead() void DelSoftRootHead()
{ {
if (SoftRoots != NULL) delete SoftRoots; if (SoftRoots != NULL)
{
// Don't let the destructor print a warning message
SoftRoots->ObjectFlags |= OF_YesReallyDelete;
delete SoftRoots;
}
SoftRoots = NULL; SoftRoots = NULL;
} }

5
src/r_utility.cpp
View file

@ -529,8 +529,9 @@ void R_Init ()
StartScreen->Progress(); StartScreen->Progress();
V_InitFonts(); V_InitFonts();
StartScreen->Progress(); StartScreen->Progress();
R_InitColormaps (); // Colormap init moved back to InitPalette()
StartScreen->Progress(); //R_InitColormaps ();
//StartScreen->Progress();
R_InitPointToAngle (); R_InitPointToAngle ();
R_InitTables (); R_InitTables ();

4
src/sound/fmodsound.cpp
View file

@ -397,7 +397,9 @@ public:
bool is; bool is;
FMOD_OPENSTATE openstate = FMOD_OPENSTATE_MAX; FMOD_OPENSTATE openstate = FMOD_OPENSTATE_MAX;
bool starving; bool starving;
#if FMOD_VERSION >= 0x43400
bool diskbusy; bool diskbusy;
#endif
if (Stream == NULL) if (Stream == NULL)
{ {
@ -494,7 +496,9 @@ public:
unsigned int percentbuffered; unsigned int percentbuffered;
unsigned int position; unsigned int position;
bool starving; bool starving;
#if FMOD_VERSION >= 0x43400
bool diskbusy; bool diskbusy;
#endif
float volume; float volume;
float frequency; float frequency;
bool paused; bool paused;

4
src/v_palette.cpp
View file

@ -378,6 +378,10 @@ void InitPalette ()
GPalette.BaseColors[0].r, GPalette.BaseColors[0].g, GPalette.BaseColors[0].b, 1, 255); GPalette.BaseColors[0].r, GPalette.BaseColors[0].g, GPalette.BaseColors[0].b, 1, 255);
} }
} }
// Colormaps have to be initialized before actors are loaded,
// otherwise Powerup.Colormap will not work.
R_InitColormaps ();
} }
extern "C" void STACK_ARGS DoBlending_MMX (const PalEntry *from, PalEntry *to, int count, int r, int g, int b, int a); extern "C" void STACK_ARGS DoBlending_MMX (const PalEntry *from, PalEntry *to, int count, int r, int g, int b, int a);