mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-08-13 01:40:05 +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

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);
}