diff --git a/stepmania/src/ActorScroller.cpp b/stepmania/src/ActorScroller.cpp index a2eb2517b5..3b5f0986b2 100644 --- a/stepmania/src/ActorScroller.cpp +++ b/stepmania/src/ActorScroller.cpp @@ -55,7 +55,7 @@ void ActorScroller::Load2( m_fNumItemsToDraw = fNumItemsToDraw; m_exprTransformFunction.SetFromExpression( - ssprintf("function(self,offset,itemIndex,numItems) return self:y(%f*offset) end",fItemHeight), + ssprintf("function(self,offset,itemIndex,numItems) self:y(%f*offset) end",fItemHeight), 1 ); diff --git a/stepmania/src/DisplayResolutions.h b/stepmania/src/DisplayResolutions.h index 3cdb354816..8dc6403e29 100644 --- a/stepmania/src/DisplayResolutions.h +++ b/stepmania/src/DisplayResolutions.h @@ -11,7 +11,7 @@ public: bool operator<( const DisplayResolution &other ) const { -#define COMPARE(x) if( x < other.x ) return true; else if( x > other.x ) return false; +#define COMPARE(x) if( x != other.x ) return x < other.x; COMPARE( iWidth ); COMPARE( iHeight ); #undef COMPARE