mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-25 09:44:02 +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
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Aquaria/AnimationEditor.cpp
View file

@ -508,11 +508,10 @@ void AnimationEditor::undo()
{
if (undoEntry < undoHistory.size())
{
std::list<SkeletalSprite>::iterator it = undoHistory.begin();
std::advance(it, undoEntry);
editSprite->animations = it->animations;
if(undoEntry)
editSprite->animations = undoHistory[undoEntry].animations;
if(undoEntry > 0) {
undoEntry--;
}
}
}
}
@ -526,9 +525,7 @@ void AnimationEditor::redo()
undoEntry++;
if (undoEntry < undoHistory.size())
{
std::list<SkeletalSprite>::iterator it = undoHistory.begin();
std::advance(it, undoEntry);
editSprite->animations = it->animations;
editSprite->animations = undoHistory[undoEntry].animations;
}
else
{

4
Aquaria/AnimationEditor.h
View file

@ -3,7 +3,7 @@
#include "../BBGE/SkeletalSprite.h"
#include "StateManager.h"
#include <list>
#include <deque>
class DebugFont;
class BitmapText;
@ -92,7 +92,7 @@ public:
void moveNextWidgets(float dt);
std::list<SkeletalSprite> undoHistory;
std::deque<SkeletalSprite> undoHistory;
size_t undoEntry;

7
Aquaria/Continuity.cpp
View file

@ -43,11 +43,6 @@ const float webTime = 8;
const float petPowerTime = 30;
const float lightTime = 60;
Profile::Profile()
{
name = "save";
}
Continuity::Continuity()
{
toggleMoveMode = false;
@ -2627,7 +2622,7 @@ void Continuity::saveFile(int slot, Vector position, unsigned char *scrShotData,
std::string Continuity::getSaveFileName(int slot, const std::string &pfix)
{
std::ostringstream os;
os << dsq->getSaveDirectory() << "/" << dsq->currentProfile.name << "-" << numToZeroString(slot, 4) << "." << pfix;
os << dsq->getSaveDirectory() << "/save-" << numToZeroString(slot, 4) << "." << pfix;
return os.str();
}

9
Aquaria/DSQ.h
View file

@ -115,13 +115,6 @@ public:
void load();
};
class Profile
{
public:
Profile();
std::string name;
};
enum SaveSlotMode
{
SSM_NONE = -1,
@ -265,8 +258,6 @@ public:
typedef std::vector<std::string> StringList;
StringList profiles;
Profile currentProfile;
AquariaScreenTransition *screenTransition;
Precacher precacher;

3
Aquaria/Game.cpp
View file

@ -2109,7 +2109,6 @@ bool Game::saveScene(std::string scene)
std::ostringstream os2;
os2 << gradBtm.x << " " << gradBtm.y << " " << gradBtm.z;
level->SetAttribute("gradBtm", os2.str().c_str());
}
if (!saveMusic.empty())
@ -2627,7 +2626,6 @@ void Game::applyState()
firstSchoolFish = true;
invincibleOnNested = true;
controlHintNotes.clear();
worldMapIndex = -1;
@ -3943,7 +3941,6 @@ bool Game::collideCircleVsLineAngle(RenderObject *r, float angle, float startLen
return collision;
}
Bone *Game::collideSkeletalVsCircle(Entity *skeletal, Vector pos, float radius)
{
float smallestDist = HUGE_VALF;

3
Aquaria/Game.h
View file

@ -131,9 +131,6 @@ public:
int idx;
};
typedef std::vector<Quad*> QuadList;
typedef std::vector<QuadList> QuadArray;
typedef std::vector<Element*> ElementUpdateList;
struct EntitySaveData

18
Aquaria/SceneEditor.cpp
View file

@ -96,7 +96,6 @@ std::string getMapTemplateFilename()
return "";
}
SceneEditor::SceneEditor() : ActionMapper(), on(false)
{
autoSaveFile = 0;
@ -2415,18 +2414,17 @@ void SceneEditor::prevElement()
void SceneEditor::doPrevElement()
{
size_t oldCur = curElement;
size_t maxn = dsq->game->elementTemplates.size();
if(dsq->game->elementTemplates.size() == 0) {
return;
}
if(curElement > 0) {
if(curElement)
curElement--;
}
if (curElement >= game->elementTemplates.size())
curElement = dsq->game->elementTemplates.size()-1;
else if(maxn)
curElement = maxn-1;
if (dsq->game->elementTemplates[curElement].idx < 1024)
if (maxn && curElement >= maxn)
curElement = maxn-1;
if (maxn && dsq->game->elementTemplates[curElement].idx < 1024)
{
placer->setTexture(dsq->game->elementTemplates[curElement].gfx);
}

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)