zaki/irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Let's not have a global variable called 'b'.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5852 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien 2019-08-17 15:03:24 +00:00
parent a57584d320
commit cc07570496
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/Irrlicht/CSoftwareDriver2.cpp
View File

@ -2398,14 +2398,18 @@ struct dreadglobal
irr::io::IFileSystem* io; irr::io::IFileSystem* io;
irr::video::IImagePresenter* presenter; irr::video::IImagePresenter* presenter;
}; };
dreadglobal b;
namespace
{
dreadglobal burning_dread;
}
DWORD WINAPI dreadFun( void *p) DWORD WINAPI dreadFun( void *p)
{ {
printf("Hi This is burning dread\n"); printf("Hi This is burning dread\n");
b.driver = new irr::video::CBurningVideoDriver(*b.params, b.io, b.presenter); burning_dread.driver = new irr::video::CBurningVideoDriver(*burning_dread.params, burning_dread.io, burning_dread.presenter);
SetEvent ( b.sync ); SetEvent (burning_dread.sync );
while ( 1 ) while ( 1 )
{ {
Sleep ( 1000 ); Sleep ( 1000 );
@ -2426,13 +2430,13 @@ IVideoDriver* createBurningVideoDriver(const irr::SIrrlichtCreationParameters& p
#ifdef _IRR_COMPILE_WITH_BURNINGSVIDEO_ #ifdef _IRR_COMPILE_WITH_BURNINGSVIDEO_
#ifdef _IRR_WINDOWS_ #ifdef _IRR_WINDOWS_
b.sync = CreateEventA ( 0, 0, 0, "burnevent0" ); burning_dread.sync = CreateEventA ( 0, 0, 0, "burnevent0" );
b.params = &params; burning_dread.params = &params;
b.io = io; burning_dread.io = io;
b.presenter = presenter; burning_dread.presenter = presenter;
b.dread = CreateThread ( 0, 0, dreadFun, 0, 0, &b.dreadid ); burning_dread.dread = CreateThread ( 0, 0, dreadFun, 0, 0, &burning_dread.dreadid );
WaitForSingleObject ( b.sync, INFINITE ); WaitForSingleObject (burning_dread.sync, INFINITE );
return b.driver; return burning_dread.driver;
#else #else
return new CBurningVideoDriver(params, io, presenter); return new CBurningVideoDriver(params, io, presenter);
#endif #endif