mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-07-03 06:24:32 +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()

1
BBGE/Particles.h
View file

@ -234,7 +234,6 @@ protected:
Particle* stomp();
void nextFree(size_t f=1);
void prevFree(size_t f=1);
size_t oldFree;

5
BBGE/SkeletalSprite.h
View file

@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "Quad.h"
#include "SimpleIStringStream.h"
#include <map>
// for 2d system only
enum AnimationCommand
@ -61,9 +62,7 @@ public:
std::string gfx;
std::string name;
size_t boneIdx;
int pidx;
bool rbp;
int pidx, rbp;
std::string prt;
std::vector<Vector> changeStrip;

2
BBGE/Texture.cpp
View file

@ -419,7 +419,7 @@ ImageTGA *Texture::TGAloadMem(void *mem, int size)
ByteBuffer bb(mem, size, ByteBuffer::REUSE);
ImageTGA *pImageData = NULL; // This stores our important image data
unsigned short width = 0, height = 0;// The dimensions of the image
uint16_t width = 0, height = 0; // The dimensions of the image
byte length = 0; // The length in bytes to the pixels
byte imageType = 0; // The image type (RLE, RGB, Alpha...)
byte bits = 0; // The bits per pixel for the image (16, 24, 32)