Fixed crash bug in TileMap

master
Joey Pollack 3 years ago
parent 3dd13b06f5
commit 8bda714099

@ -14,6 +14,7 @@ IF not exist build/ (
set "DELGUI=" set "DELGUI="
set "RELEASE=" set "RELEASE="
set "DEBINFO="
If "%~1" == "r" set "RELEASE=1" If "%~1" == "r" set "RELEASE=1"
If "%~2" == "r" set "RELEASE=1" If "%~2" == "r" set "RELEASE=1"
@ -21,32 +22,36 @@ If "%~2" == "r" set "RELEASE=1"
If "%~1" == "g" set "DELGUI=1" If "%~1" == "g" set "DELGUI=1"
If "%~2" == "g" set "DELGUI=1" If "%~2" == "g" set "DELGUI=1"
If "%~1" == "rd" set "DEBINFO=1"
If "%~2" == "rd" set "DEBINFO=1"
IF defined RELEASE ( IF defined RELEASE (
cmake --build build/ --target ALL_BUILD --config Release cmake --build build/ --target ALL_BUILD --config Release
SET BUILD_ERRORLEVEL=!ERRORLEVEL!
IF NOT "!BUILD_ERRORLEVEL!"=="0" (
echo %ESC%[91mBUILD FAILED!%ESC%[0m %BUILD_ERRORLEVEL%
EXIT /B !BUILD_ERRORLEVEL!
)
xcopy /y test_data\engine_state.json build\Release\ xcopy /y test_data\engine_state.json build\Release\
xcopy /y src\renderer\shaders\* build\Release\* xcopy /y src\renderer\shaders\* build\Release\*
) ELSE IF defined DEBINFO (
cmake --build build/ --target ALL_BUILD --config RelWithDebInfo
xcopy /y test_data\engine_state.json build\RelWithDebInfo\
xcopy /y src\renderer\shaders\* build\RelWithDebInfo\*
) ELSE ( ) ELSE (
cmake --build build/ --target ALL_BUILD --config Debug cmake --build build/ --target ALL_BUILD --config Debug
xcopy /y test_data\engine_state.json build\Debug\
xcopy /y src\renderer\shaders\* build\Debug\*
)
SET BUILD_ERRORLEVEL=!ERRORLEVEL! SET BUILD_ERRORLEVEL=!ERRORLEVEL!
IF NOT "!BUILD_ERRORLEVEL!"=="0" ( IF NOT "!BUILD_ERRORLEVEL!"=="0" (
echo %ESC%[91mBUILD FAILED!%ESC%[0m %BUILD_ERRORLEVEL% echo %ESC%[91mBUILD FAILED!%ESC%[0m %BUILD_ERRORLEVEL%
EXIT /B !BUILD_ERRORLEVEL! EXIT /B !BUILD_ERRORLEVEL!
) )
xcopy /y test_data\engine_state.json build\Debug\
xcopy /y src\renderer\shaders\* build\Debug\*
)
echo %ESC%[92mBUILD SUCCEEDED!%ESC%[0m echo %ESC%[92mBUILD SUCCEEDED!%ESC%[0m
IF defined DELGUI ( IF defined DELGUI (

@ -122,6 +122,8 @@ namespace lunarium { namespace editor
int smaller_width = mSizeInTiles.Width < size.Width ? mSizeInTiles.Width : size.Width; int smaller_width = mSizeInTiles.Width < size.Width ? mSizeInTiles.Width : size.Width;
int smaller_height = mSizeInTiles.Height < size.Height ? mSizeInTiles.Height : size.Height; int smaller_height = mSizeInTiles.Height < size.Height ? mSizeInTiles.Height : size.Height;
if (mpMap)
{
for(int i = 0; i < smaller_width; i++) for(int i = 0; i < smaller_width; i++)
{ {
for (int j = 0; j < smaller_height; j++) for (int j = 0; j < smaller_height; j++)
@ -134,6 +136,7 @@ namespace lunarium { namespace editor
{ {
delete[] mpMap[i]; delete[] mpMap[i];
} }
}
delete[] mpMap; delete[] mpMap;
mSizeInTiles = size; mSizeInTiles = size;

Loading…
Cancel
Save