From 23deb80a4454d54b1b58803d47c4abca060c6925 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Fri, 1 Nov 2002 20:01:59 +0000 Subject: [PATCH] Winsock replaced with SDL_net --- stepmania/SDL_net.dll | Bin 0 -> 24576 bytes stepmania/src/Actor.cpp | 20 ++++++++++---------- stepmania/src/RageUtil.cpp | 2 +- stepmania/src/StepMania.cpp | 5 +++++ 4 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 stepmania/SDL_net.dll diff --git a/stepmania/SDL_net.dll b/stepmania/SDL_net.dll new file mode 100644 index 0000000000000000000000000000000000000000..e1e57d622be4da8f106826d36e671852c569d327 GIT binary patch literal 24576 zcmeHP4RBM}mA&7vIGlZKSff6>_|^6 zbiuW&xEpb+;C9kUx06hNlI}FS*tvNjK1LekSQ|$aK38Ob8h=4%xD3 zzjLMMACh!-c4xNJ+4nN%zIV?(@BDoC+;iX4Gr8+e2Usa%OakTej6H`l9UjsC{zk{} zoEx5>!+t#T)n(6FnqFPDEfP&B-N~-|lA+y7M<|i#(v)4Ql1wL*XhNym>Qi=ib*igp z&n|NoRsY3_zkFx-sgDmC^z@PcJaioWr;l7ZG$iw_0=hkRPgmiqK$KHCznk>^8`>W?R88Yv(Im>2QrZZ*($5Y^LU5YdH716he zYxD^pI*c>hi4Mu(C=o3>qHmmw-5VJj0>HfrW1S@DVXTq>zxMDl_M>Zg|DC=9-M>d} zwWjXXFg~vw4f$u#qM=x_s%ACme9V5YE z*I@Btpm6B#TOn~dpI)f{8dvVB6^y0J^q=GU>}fQ^MLFZ-Yx8r>X?MNfKbDsHy-r)! zHCpZ0{{f=ZgQje0`ip-3F)-l9lJcK5mT`}jp9=8b@yemIC6|84U(TER+ViMXD$n60?kCXdmX?a@PJZmv7I?oV8Er z0F;tHK>qdTwFX`WM^5&X^Q647Mw306<5Km|{*S7M((@yYq;m1N%3%BOmg=Ew*@3zI zPh=0T>dR_iF3u@bMUT+Yo)W&S}p{-^@w9xvJiw-4H12y3NZE5uPDcyWRZu6!a@(9MW31Ji z)tr_3g_%&M=ikU|khCB4zaQ*b#a+#NSCF?&&WaW;J;NKN7JUd}m^CZek)9c0@Rv33 zdyBu+zGHjeF$&lSe}Gnxj1;i*206gpG?Cu?8-AELCKF1T^ERJ9R*_#oSyRlHbXnvb zfPMBN)V@HvW6T#T(bKR>>#ae8z%df|CyJdSku#s<`g|xmR+X#O*RFP6ern zNoeh)+X~%)5(K^5oO5`yVCb1_>}YQ+cU>(!v#$ht&yIv)a!+Tm3jjtvh9vSFcmSW#TT32 zT3lx2zy^#19xK*Z7+Fvj&Nf^5@q#*I5oONXMfxlJ4oClBdO_q0IZ}SD$FzmB4c6k+6hcHKbh8mi@eEOkH#(3CrKp;jL6o>DM;nhj zk%(CDydD8-^CQX{xK>;62>V8G$FPr*w!-yxet}qd4qh+Cm_Ojv^C)5cgFVwr-~7_W z(#!p0J>~s_UpZ3{qb2h?A8y|c1(Ph2DOq5v&5LXzQ*S~EP#{yosFq}+&5v3ccUFuL z0yJd~z7;0hye;}SAT8F`^;S5?HUaH#EFu`uX0cpRNb?|8 zHkGB(J7~2z!pK3@bvkB4ahOt!kkwR!K-Po*eDFic{uVElka>DesBDVFrm0k_79>` zv+{@Ef?`U-iZ)UAR$)u1>VYHdu8k`E&NWb z%vP*S2?4?L1ivo3*#;Xn4^-Jk+jG*%TvG;|jID96*TeN()evvK!e`KK5#|e_*G_sD zl3u%^7hBP|=D#ixn&(W_oVg(1l|BMPm6;K#k=!otucgd})gU%rDu$ToYf2(Utw2h~ zE@X{aFjc@Cd(ppLrL~0xoH_3xG@SHY0+@jkN@MwhzW_>Dg{ycyoyI1-GPH11u(d+=;>RIc84B|S6D6OM58&Dy-i%vt2efpd3e&N=(vKJfZzNp`8I z-sBuMxjV?;(HSGO7sAU;FR=3dI|!AL;7C2On1IGX`MruVV#f&3WejjRC=>h6Tj44_ zozY_pP`HH(av*oVCI32he%kkK-WHlV%8M2R?rdqJ?H!@7qV(3EN5e1YU#ANFbJt)d zZ=u;Je*`ZcqNQx)`RBi9Hh!`_PpT(^6c@Vu={_)jDKO0=42 z_lnjd+B(rTidI2OIYwK~#%T{><@c=4&!#h2XGTD_xrL1cb{PvP?QdJrI zM#=6_TznBf!GdZsnE-Hi`TVu5+k_Y^w*;e!sHUmO-RyA|40XoRDJ>Z8jP4;o>!PX9 zuDH4_l2k*TP0?M+P;y@_^rhIH^{vhIO+_cB!ZZFi5y>ww@#;xX60N+Ev8O?m;M*{< zHcb8?=zEy#!{~cK1L!Mw!8?pe#d2aEkQd|KATP$c(SMhCNS2EgkX^{wYmhyRvj?PH zU*KQFc_;J?LdLroHi;HN7JLR>3aAHu90L6SbOiJY=v~l1+m* z*-Tc(W-%+9&E~LjKrolhWAmAvEno}Tb79ArR)ZzD9wLD)x>n-x>?nN zw|92>x;pMxH5wEQN&#=^b6EZ4vbK1Q`?l43gSU5d zsNLft#Ho#UrPRqHcc_|IRg-`*siwwbCef|kYGSfvtJ<+=a^I&WI*oo?oj15SI<-H= z6bXE`DH@qQ519OYEBDP9Pc8)Cqt^7YLh&iGYcKiGYcKiGYcK ziGYcKiNOB?f!eNgyfd*v!{6&iwP+}g$95$UO{DO8qO4iH2CwvZpAzpXDHTE~C7i}v zt-(|15B|el=|m^}z5loz#>e%>qbW^IC|Z|-SDa8>>F!F>-=~j{(Oax2>Oax2>Oax2>Oax2>Oax2>Oa%U~5U|iETzs=+ zy;Ch(@YNIFV?TpGQ(~+UV>>SPSRd#3*ryH}&`;7#8T$Sdv9qg53vgQ5I(^G$&Y?;nO*rE@UcM z6};aFs$#n+4t$5Ddut)Hn{~4g0*yTP0fZhOi}jwHp7AgE;!cVj@czb0WVO+lEm>A_c!f0uN)JXG(`j zz&uO@Oax2>Oax2>Oax2>Oax2>Oax2>{&*3<3;&Pc{i4bz){L!LvG&VrKU(`U*ITZC zcga=vR=rg9PF3iZuiTQm<=I%Y7Hwe?#z+`nPphVO3B zH^evoc;l{3W$qi@E8VNzRqk8e9(RMg$=&L{+uiQ&bjRG??mh1P?ytHZazE^T#Qh!j z_uPNyKH~nVd&K=K_dD)$?ho7_xj%7BHFIkg*HqSQs@YuAS+l3+bj^jD-_^**&j5eC lIGdiE2$%?%2$%?%2$%?%2$%?%2$%?%2$%?%2>byN_%Dw)jivwq literal 0 HcmV?d00001 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" ); } + */ } }