diff --git a/stepmania/SDL_net.dll b/stepmania/SDL_net.dll new file mode 100644 index 0000000000..e1e57d622b Binary files /dev/null and b/stepmania/SDL_net.dll differ diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp index fd05b510f6..6acac3f921 100644 --- a/stepmania/src/Actor.cpp +++ b/stepmania/src/Actor.cpp @@ -308,18 +308,18 @@ void Actor::SetTweenDiffuseLeftEdge( RageColor c ) { LatestTween().diffuse[0] = void Actor::SetTweenGlow( RageColor c ) { LatestTween().glow = c; }; -void Actor::ScaleTo( const RectI &Rect, StretchType st ) +void Actor::ScaleTo( const RectI &rect, StretchType st ) { // width and height of rectangle - float rect_width = (float)RECTWIDTH(Rect); - float rect_height = (float)RECTHEIGHT(Rect); + float rect_width = (float)RECTWIDTH(rect); + float rect_height = (float)RECTHEIGHT(rect); if( rect_width < 0 ) SetRotationY( PI ); if( rect_height < 0 ) SetRotationX( PI ); // center of the rectangle - float rect_cx = Rect.left + rect_width/2; - float rect_cy = Rect.top + rect_height/2; + float rect_cx = rect.left + rect_width/2; + float rect_cy = rect.top + rect_height/2; // zoom fActor needed to scale the Actor to fill the rectangle float fNewZoomX = fabsf(rect_width / m_size.x); @@ -341,15 +341,15 @@ void Actor::ScaleTo( const RectI &Rect, StretchType st ) } -void Actor::StretchTo( const RectI &Rect ) +void Actor::StretchTo( const RectI &rect ) { // width and height of rectangle - int rect_width = RECTWIDTH(Rect); - int rect_height = RECTHEIGHT(Rect); + int rect_width = RECTWIDTH(rect); + int rect_height = RECTHEIGHT(rect); // center of the rectangle - float rect_cx = Rect.left + rect_width/2.0f; - float rect_cy = Rect.top + rect_height/2.0f; + float rect_cx = rect.left + rect_width/2.0f; + float rect_cy = rect.top + rect_height/2.0f; // zoom fActor needed to scale the Actor to fill the rectangle float fNewZoomX = rect_width / m_size.x; diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp index a9ac8432d0..8262886ad6 100644 --- a/stepmania/src/RageUtil.cpp +++ b/stepmania/src/RageUtil.cpp @@ -774,7 +774,7 @@ void TrimLeft(string &str, const char *s) void TrimRight(string &str, const char *s) { - int n = str.size(); + int n = str.size()-1; while(n >= 0 && strchr(s, str[n-1])) n--; diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index 530a84d1b1..d6c468f9b9 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -867,6 +867,7 @@ void Update() NETWORK->Update( fDeltaTime ); + /* // handle network input Packet packet; while( NETWORK->Recv(&packet) ) @@ -911,6 +912,7 @@ void Update() ASSERT(0); // corrupt packet? Not a type we recognize } } + */ static InputEventArray ieArray; ieArray.clear(); // empty the array @@ -936,6 +938,8 @@ void Update() SCREENMAN->Input( DeviceI, type, GameI, MenuI, StyleI ); + /* + // Replicate input over network if( GameI.IsValid() && type == IET_FIRST_PRESS ) { Packet packet; @@ -946,6 +950,7 @@ void Update() SCREENMAN->SystemMessage( "Packet Sent" ); } + */ } }