@@ -247,8 +247,8 @@ SurfaceSet *ExtraSprites::loadSurfaceSet(SurfaceSet *set)
 			}
 			else
 			{
-				Surface *temp = new Surface(_width, _height);
-				temp->loadImage(fullPath);
+				Surface temp = Surface(_width, _height);
+				temp.loadImage(fullPath);
 				int xDivision = _width / _subX;
 				int yDivision = _height / _subY;
 				int frames = xDivision * yDivision;
@@ -259,18 +259,13 @@ SurfaceSet *ExtraSprites::loadSurfaceSet(SurfaceSet *set)
 				{
 					for (int x = 0; x != xDivision; ++x)
 					{
-						Surface *frame = set->getFrame(offset);
-						if (frame)
-						{
-							frame->clear();
-						}
-						frame = getFrame(set, offset, adding);
+						Surface* frame = getFrame(set, offset, adding);
+						frame->clear();
 						// for some reason regular blit() doesn't work here how i want it, so i use this function instead.
-						temp->blitNShade(frame, 0 - (x * _subX), 0 - (y * _subY), 0);
+						temp.blitNShade(frame, 0 - (x * _subX), 0 - (y * _subY), 0);
 						++offset;
 					}
 				}
-				delete temp;
 			}
 		}
 	}
Original file line number	Diff line number	Diff line change
`@@ -247,8 +247,8 @@ SurfaceSet ExtraSprites::loadSurfaceSet(SurfaceSet set)`
`247`	`247`	`}`
`248`	`248`	`else`
`249`	`249`	`{`
`250`		`- Surface *temp = new Surface(_width, _height);`
`251`		`- temp->loadImage(fullPath);`
	`250`	`+ Surface temp = Surface(_width, _height);`
	`251`	`+ temp.loadImage(fullPath);`
`252`	`252`	`int xDivision = _width / _subX;`
`253`	`253`	`int yDivision = _height / _subY;`
`254`	`254`	`int frames = xDivision * yDivision;`
`@@ -259,18 +259,13 @@ SurfaceSet ExtraSprites::loadSurfaceSet(SurfaceSet set)`
`259`	`259`	`{`
`260`	`260`	`for (int x = 0; x != xDivision; ++x)`
`261`	`261`	`{`
`262`		`- Surface *frame = set->getFrame(offset);`
`263`		`- if (frame)`
`264`		`- {`
`265`		`- frame->clear();`
`266`		`- }`
`267`		`- frame = getFrame(set, offset, adding);`
	`262`	`+ Surface* frame = getFrame(set, offset, adding);`
	`263`	`+ frame->clear();`
`268`	`264`	`// for some reason regular blit() doesn't work here how i want it, so i use this function instead.`
`269`		`- temp->blitNShade(frame, 0 - (x * _subX), 0 - (y * _subY), 0);`
	`265`	`+ temp.blitNShade(frame, 0 - (x * _subX), 0 - (y * _subY), 0);`
`270`	`266`	`++offset;`
`271`	`267`	`}`
`272`	`268`	`}`
`273`		`- delete temp;`
`274`	`269`	`}`
`275`	`270`	`}`
`276`	`271`	`}`