Merge latest changes from branch miscellaneous-fixes.
--- a/Aquaria/Game.h Sat Feb 19 11:56:51 2011 +0900
+++ b/Aquaria/Game.h Sun Apr 03 02:49:18 2011 +0900
@@ -404,6 +404,7 @@
void update(float dt);
void prevElement();
void nextElement();
+ void doPrevElement();
Element *cycleElementNext(Element *e);
Element *cycleElementPrev(Element *e);
void selectZero();
--- a/Aquaria/SceneEditor.cpp Sat Feb 19 11:56:51 2011 +0900
+++ b/Aquaria/SceneEditor.cpp Sun Apr 03 02:49:18 2011 +0900
@@ -777,7 +777,7 @@
updateText();
- prevElement();
+ doPrevElement();
}
void SceneEditor::alignHorz()
@@ -2986,24 +2986,29 @@
}
else
{
- int oldCur = curElement;
- curElement--;
- if (curElement < 0)
- curElement = dsq->game->elementTemplates.size()-1;
-
- if (dsq->game->elementTemplates[curElement].idx < 1024)
- {
- //int idx = dsq->game->elementTemplates[curElement].idx;
- placer->setTexture(dsq->game->elementTemplates[curElement].gfx);
- }
- else
- {
- curElement = oldCur;
- }
+ doPrevElement();
}
}
}
+void SceneEditor::doPrevElement()
+{
+ int oldCur = curElement;
+ curElement--;
+ if (curElement < 0)
+ curElement = dsq->game->elementTemplates.size()-1;
+
+ if (dsq->game->elementTemplates[curElement].idx < 1024)
+ {
+ //int idx = dsq->game->elementTemplates[curElement].idx;
+ placer->setTexture(dsq->game->elementTemplates[curElement].gfx);
+ }
+ else
+ {
+ curElement = oldCur;
+ }
+}
+
void SceneEditor::moveLayer()
{
std::string s = dsq->getUserInputString("Enter 'fromLayer toLayer' (space inbetween, ESC/m-ty to cancel)");
--- a/BBGE/SkeletalSprite.cpp Sat Feb 19 11:56:51 2011 +0900
+++ b/BBGE/SkeletalSprite.cpp Sun Apr 03 02:49:18 2011 +0900
@@ -1291,8 +1291,6 @@
return;
}
- stringToLower(file);
-
loaded = true;
TiXmlDocument xml;