Permalink
Browse files

Merge branch 'alpha22-freeze'

Conflicts:
	Changelog.txt
	configure.ac
	src/buildopts.h
  • Loading branch information...
2 parents e6d317d + b8f65ba commit a2db60f5149ac9b255040838e42d8ad74e41192a @robn committed May 8, 2012
Showing with 9 additions and 2 deletions.
  1. +1 −0 Changelog.txt
  2. +1 −1 README.txt
  3. +7 −1 src/LuaModelViewer.cpp
View
@@ -45,6 +45,7 @@ Alpha 22
* Don't take timesteps for dead ships. Stops the player firing during the
death screen (regression) (#1243, #1103, #1056)
* Fix crash when objectviewer activated with no target set (#1248)
+ * Fix modelviewer crash when animation sliders do not fit on screen (#1256)
* Script and model changes
* LMR "lathe" function radius and up vector now interpreted the same as
View
@@ -1,4 +1,4 @@
-Pioneer Space Simulator - alpha 21
+Pioneer Space Simulator - alpha 22
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Pioneer is a space adventure game set in the Milky Way galaxy at the turn of
View
@@ -186,7 +186,10 @@ class Viewer: public Gui::Fixed {
Add(new Gui::Label("Animations (0 gear, 1-4 are time - ignore them comrade)"),
200, Gui::Screen::GetHeight()-140.0f);
+
for (int i=0; i<LMR_ARG_MAX; i++) {
+ m_anim[i] = 0;
+
float x = float(200+i*25);
float w = 32.0f;
if (x >= Gui::Screen::GetWidth()-w)
@@ -222,7 +225,10 @@ class Viewer: public Gui::Fixed {
}
void OnResetAdjustments() {
- for (int i=0; i<LMR_ARG_MAX; i++) m_anim[i]->SetValue(0);
+ for (int i=0; i<LMR_ARG_MAX; i++) {
+ if(m_anim[i])
+ m_anim[i]->SetValue(0);
+ }
for (int i=0; i<3; i++) {
m_linthrust[i]->SetValue(0.5);
m_angthrust[i]->SetValue(0.5);

0 comments on commit a2db60f

Please sign in to comment.