mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-10-18 04:19:31 +00:00
Code Issues Releases Wiki Activity

Minor cosmetic fixes + prevent heap overflow after on taking more than 99999999 screenshots

Browse source 
Gotta be correct!!11
This commit is contained in:
fgenesis 2016-07-14 05:01:30 +02:00
commit 881226fe43
4 changed files with 24 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BBGE/ActionSet.cpp
View file

@ -97,8 +97,6 @@ ActionInput *ActionSet::addActionInput(const std::string &name)
newa.name = name;
inputSet.push_back(newa);
a = getActionInputByName(name);
if (!a) return 0;
}
return a;

11
BBGE/Core.cpp
View file

@ -2861,7 +2861,7 @@ int Core::tgaSaveSeries(char *filename,
// compute the new filename by adding the
// series number and the extension
newFilename = (char *)malloc(sizeof(char) * strlen(filename)+8);
newFilename = (char *)malloc(sizeof(char) * strlen(filename)+16);
sprintf(newFilename,"%s%d",filename,numSavedScreenshots);
@ -2875,11 +2875,10 @@ int Core::tgaSaveSeries(char *filename,
return(status);
}
void Core::screenshot()
{
doScreenshot = true;
}
void Core::screenshot()
{
doScreenshot = true;
}
#include "DeflateCompressor.h"

10
BBGE/Vector.cpp
View file

@ -456,8 +456,6 @@ void InterpolatedVector::doInterpolate(float dt)
{
InterpolatedVectorData *data = ensureData();
data->timePassed += dt;
if (data->timePassed >= data->timePeriod)
{
@ -487,15 +485,9 @@ void InterpolatedVector::doInterpolate(float dt)
}
else
{
Vector v;
v = lerp(data->from, data->target, (data->timePassed / data->timePeriod), data->ease ? LERP_EASE : LERP_LINEAR);
Vector v = lerp(data->from, data->target, (data->timePassed / data->timePeriod), data->ease ? LERP_EASE : LERP_LINEAR);
this->x = v.x;
this->y = v.y;
this->z = v.z;
}
}