mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-07-17 13:24:57 +00:00
Code Issues Releases Wiki Activity

Merge branch 'experimental' into controllerfixup

Browse source 
# Conflicts:
#	Aquaria/AnimationEditor.cpp
#	Aquaria/AquariaComboBox.cpp
#	Aquaria/AquariaMenuItem.h
#	Aquaria/Avatar.cpp
#	Aquaria/BitBlotLogo.cpp
#	Aquaria/Continuity.cpp
#	Aquaria/DSQ.cpp
#	Aquaria/DSQ.h
#	Aquaria/Game.cpp
#	Aquaria/Game.h
#	Aquaria/Intro.cpp
#	Aquaria/RecipeMenuEntry.cpp
#	Aquaria/SceneEditor.cpp
#	Aquaria/States.h
#	Aquaria/UserSettings.cpp
#	BBGE/ActionMapper.cpp
#	BBGE/Base.cpp
#	BBGE/BitmapFont.h
#	BBGE/Core.cpp
#	BBGE/Core.h
#	BBGE/ParticleManager.cpp
#	BBGE/Particles.h
#	BBGE/RenderObject.h
#	BBGE/Shader.cpp
#	BBGE/Shader.h
#	BBGE/SkeletalSprite.h
#	BBGE/Texture.cpp
#	BBGE/Vector.h
This commit is contained in:
fgenesis 2021-01-12 00:26:44 +01:00
commit 03c698320a
11 changed files with 20 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

13
BBGE/ParticleManager.cpp
View file

@ -205,15 +205,6 @@ void ParticleManager::nextFree(size_t jump)
free -= size;
}
void ParticleManager::prevFree(size_t jump)
{
if(free < jump) {
free = free + size - jump;
} else {
free -= jump;
}
}
void ParticleManager::setFree(size_t free)
{
if (free != -1)
@ -222,8 +213,8 @@ void ParticleManager::setFree(size_t free)
}
}
const int spread = 8;
const int spreadCheck = 128;
static const size_t spread = 8;
static const size_t spreadCheck = 128;
// travel the list until you find an empty or give up
Particle *ParticleManager::stomp()