diff --git a/.gitignore b/.gitignore index ac2da33..77cf21f 100644 --- a/.gitignore +++ b/.gitignore @@ -261,3 +261,4 @@ __pycache__/ *.pyc /Ida /Export +/DrMem diff --git a/CompileForDrMemory.bat b/CompileForDrMemory.bat index 13ab55b..bcbdb8c 100644 --- a/CompileForDrMemory.bat +++ b/CompileForDrMemory.bat @@ -1 +1,3 @@ -cl /Zi /MT /EHsc /O y- /Ob0 /Femyapp.exe *.cpp user32.lib \ No newline at end of file +rc /Fo.\DrMem\SpaceCadetPinball.res ".\SpaceCadetPinball\SpaceCadetPinball.rc" + + cl /Zi /MT /EHsc /O /Ob0 /cgthreads4 /Fo.\DrMem\ /Fe.\DrMem\myapp.exe ".\SpaceCadetPinball\*.cpp" Comctl32.lib Winmm.lib Htmlhelp.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ".\DrMem\SpaceCadetPinball.res" \ No newline at end of file diff --git a/SpaceCadetPinball/TPinballComponent.cpp b/SpaceCadetPinball/TPinballComponent.cpp index b0d82cb..9ceb066 100644 --- a/SpaceCadetPinball/TPinballComponent.cpp +++ b/SpaceCadetPinball/TPinballComponent.cpp @@ -17,6 +17,8 @@ TPinballComponent::TPinballComponent(TPinballTable* table, int groupIndex, bool RenderSprite = nullptr; ListBitmap = nullptr; ListZMap = nullptr; + GroupName = nullptr; + Control = nullptr; if (table) table->ComponentList->Add(this); if (groupIndex >= 0) @@ -64,7 +66,7 @@ TPinballComponent::TPinballComponent(TPinballTable* table, int groupIndex, bool } RenderSprite = render::create_sprite( - visualCount > 0 ? VisualType::Sprite :VisualType::None, + visualCount > 0 ? VisualType::Sprite : VisualType::None, rootBmp, zMap, rootBmp->XPosition - table->XOffset, diff --git a/SpaceCadetPinball/TPinballTable.cpp b/SpaceCadetPinball/TPinballTable.cpp index 6c4307f..7e2f713 100644 --- a/SpaceCadetPinball/TPinballTable.cpp +++ b/SpaceCadetPinball/TPinballTable.cpp @@ -60,6 +60,7 @@ TPinballTable::TPinballTable(): TPinballComponent(nullptr, -1, false) ReplayTimer = 0; TiltTimeoutTimer = 0; MultiballFlag = 0; + PlayerCount = 0; auto ballObj = new TBall(this); BallList->Add(ballObj); diff --git a/SpaceCadetPinball/render.cpp b/SpaceCadetPinball/render.cpp index 97a3713..70bdbfa 100644 --- a/SpaceCadetPinball/render.cpp +++ b/SpaceCadetPinball/render.cpp @@ -231,6 +231,7 @@ render_sprite_type_struct* render::create_sprite(VisualType visualType, gdrv_bit sprite->UnknownFlag = 0; sprite->SpriteArray = nullptr; sprite->SpriteCount = 0; + sprite->DirtyRect = rectangle_type{}; if (rect) { sprite->BoundingRect = *rect;