From 49727c573f6ab878a73e1c7f124c5b1b7dade630 Mon Sep 17 00:00:00 2001 From: Eduardo Bart Date: Thu, 5 Apr 2012 09:18:25 -0300 Subject: [PATCH] platform fixes * fix black cursor on win32 * fix front buffer refresh on some x11 platforms * fix outfit framebuffer glitch * display entergame by default * change some icons --- BUGS | 9 --------- modules/client_entergame/entergame.lua | 1 - modules/client_entergame/login.png | Bin 696 -> 962 bytes modules/game_viplist/viplist.png | Bin 928 -> 945 bytes src/framework/graphics/painter.cpp | 2 +- src/framework/platform/win32window.cpp | 12 ++++-------- src/framework/platform/x11window.cpp | 15 ++++++--------- 7 files changed, 11 insertions(+), 28 deletions(-) diff --git a/BUGS b/BUGS index 93fcca5d..e69de29b 100644 --- a/BUGS +++ b/BUGS @@ -1,9 +0,0 @@ -trying to walking while following doesn't cancel de walk -attacked/followed creatures are not cleared when it goes out of range -hotkeys works while windows are locked, it shouldnt -some animated hits are displayed as 2 hits instead of one -skulls is rendering outside map bounds -paste on x11 platform does not work correctly when doing ctrl+c in google chrome -party options does not work when relogging inside a party - -when the player gets disconnected it isn't removed from the map diff --git a/modules/client_entergame/entergame.lua b/modules/client_entergame/entergame.lua index ca78f4ca..09f8c297 100644 --- a/modules/client_entergame/entergame.lua +++ b/modules/client_entergame/entergame.lua @@ -80,7 +80,6 @@ function EnterGame.init() enterGame:getChildById('accountNameTextEdit'):focus() -- only open entergame when app starts - enterGame:hide() if not g_app.isRunning() then if #account > 0 and autologin then addEvent(EnterGame.doLogin) diff --git a/modules/client_entergame/login.png b/modules/client_entergame/login.png index 1adfa2a5cb4173c1766e1ba438169823a7d52979..55ec69750dfbfbaab5fccb203f845cd1f77165be 100644 GIT binary patch delta 940 zcmV;d15^CC1;PiAB!2{FK}|sb0I$e51&Zka000?uMObuGZ)S9NVRB^vL1b@YWgtmy zVP|DhWnpA_ami&o000A2Nklq4rXHjhAb?mHkig$R|5*(z^nYfAMLH)53v)93{`HgL z&#&JMB0`*^8fwXUvQiR3E7x>H{Qdv=B1{iJ0HGMb$uE;9tE`fA>Bc*T-+%rxFf;sN z`2YJm!>@1O7#RQjV2~77&`_3fn0o8+=3t=mmmoa=0fb_}w_m)mmo7bFh;#bSpeX&D zp?3=h!<)Ci7=M_4eP;Ok<1+)p&o2x=Kk-_#Gl_=${P%h)NDn{&p%@^;_np7U^(}*+ zEe8Vw3lqbSFYg%U@A$^>>dP0PYrZmw3jbv=mgD-nbnhRbpFbElfm*%;1Q3b=vr9RS ztI4q`{QAwoz{1GJ;OW4};AZuY;mfzb3`~sw8F&Ra7=P|Qc=BcO{%^N{%723N00a;d zvH^R}Ufc1HfsNrGGb_VC7ET7B76xW6AqIXiF$P`{F$M+!35GqVAKd@)?I$QE{(YGOEv|Hiz+vo2^SbqOxIL65Py<_&~#gCpoUjS709;6qh2OxkL zkyGO0#rqh3{raUKAi%R(K}AM~`7==MkM9gDGJgsT*DhUqUR|9ZdFRfxgUGH22q2U& z`1tVy!`H8$I(c|lb$$fF)!4`t{q@fB*ho1hW4F1Q-A{ZbG?mX%6fF O0000IH03B&mSad^gZEa<4bN~PV002XB zWnpw>WFU8GbZ8()Nlj2>E@cM*00Iw5L_t(I%Z-vTixWW@hJWAe?o1{u@y?JzHX#ew zSe%L$Hj1EjcCoOqu(why)Xw(sN7xD?T#-T!4pLae#?~stgAg_(8}+;sXU6W3 znA|z#@O%&Nyz`Z?;T#?wmbBI{2_esY--qKkpVKt`)NZ%!I_qr`FvdPgDc?7nO|)7q z7-Jp|27?g5hktd}S-3gV2lOUT6%hV3Lyka zr4qE(D2jqnO0NMpxiEp0@+1g?*jkGuNidtu5XUhXV`HV%aGfu0>L7}ur;g)%nM@|- zq9{zs>F+XRs*_cwgM=8Z{I9zz1_kVj6`_B{l{k|iF_!`IYp4J+^ z@1s(wG?Y@EUawcVRN(vmi|KTFpL34g-CfjbHSF*2gAj7v81wp4!P(i_JEar=Kq&^F7#mp(kPR_#bI)AfIn- z%3@lHu#GXyrN#8io$+G6sfGs2Utpg_O7waQHV7=dT4i?pHRI`XA{?HX z^{3U?A=RHtLMW1gZfKBC1p{&*tNTU^4)$`SIQb`B5;!lZYO9R_ttF@3Ic`!6QhF@=V!_Y0d*dPsc9ffibvs zF`0?s)I_pztmQP{9a-}=u3l>kX)pP%umGK{dy9W(e+(yYo%yCEroQI$&ND){Gc%P;a9~?xHVEtp+o^7KMtl8nsq&AJ-kFPW5x$TNy xauWnB%Q+0={qbaTZQ^vES4N&E_*;Mh02F*VRVK#)wk7}o002ovPDHLkV1g*A!+8Jz delta 906 zcmV;519kkd2cQR#B!2;OQb$4nuFf3k00006VoOIv02Kf^02Yod$in~t010qNS#tmY z3ljhU3ljkVnw%H_000McNliru+yM^-2`O2SuG|0s06A$?Sad^gZEa<4bN~PV001as zDIhX1Ff<@aVQY0_AX9W@X>Mh53JODVWnpw>WFU8GbZ8({Xn$oOM@dakY4ojx0008p zNklFjg%BbXqXV%j8ZwwiGnqJ(%;P@h&i_9C*G)1_k@~F;hx2`$ zb3Q(W1IT5`-hZ(4w+^ZDq(JeHX!7S%ZQ*xgQ@qPPpd2K}60yt1SY}*w9zixuY}1nY zg}K#{M0jCriroJSeDaF%{S)V&KU?%70wECAHd@UjUN1+TPECna#ZhE*16Vq^QEa~` ziRf&_lQeCUFy2GbbqLJ@1LMyq-48uRXcar0o$`x?*?*~YF3UIj8>#yO0tMHt6S%v` zMww=Ho8hNkqHFMBoO%gsCy$Xjs`iXNJ_dZW&ua;+OMQ)|hwE!tl?_r&ljQwF2-haw zGX$D}y>S!0e;^J#dY3?Eaw40kjr7kg+8ByLT<>HDm1d)gDBZ#=Ea6p_k*K(CV+E+T zevp}*$bSN#Dx)@Qc8PFxm}+Sezqgyg!WKqq0DFBNEs>(pJ{Y;Tw|dLX?scdEpq)6? z|Lf^thfpc=!0`u(^(oXto%ZEX3jb6XN~;9PV|d0fYE`NHIA7G)c8{jhhcnTwt=xRe z1Cf?h+U7~?Gb*x+e1CHgK~l>HRyAZ+w z-Qu^kIx_T;GN6Xe)%PzlvjKTaA(A072v{jPciY&XN|Dr0g4ab9Nun@71|A>I{>9&0 zHGiVOXZGeQG7M0)*5#zS(nZF|k0 gdqi1A@|}MH&!k$a!ul3q00000NkvXXt^-0~f=9BJIRF3v diff --git a/src/framework/graphics/painter.cpp b/src/framework/graphics/painter.cpp index 4c9433ba..b5d19710 100644 --- a/src/framework/graphics/painter.cpp +++ b/src/framework/graphics/painter.cpp @@ -143,10 +143,10 @@ void Painter::setClipRect(const Rect& clipRect) if(clipRect.isValid()) { glEnable(GL_SCISSOR_TEST); glScissor(clipRect.left(), g_graphics.getViewportSize().height() - clipRect.bottom() - 1, clipRect.width(), clipRect.height()); - m_clipRect = clipRect; } else { glDisable(GL_SCISSOR_TEST); } + m_clipRect = clipRect; } void Painter::saveAndResetState() diff --git a/src/framework/platform/win32window.cpp b/src/framework/platform/win32window.cpp index 5368fab9..e03576bd 100644 --- a/src/framework/platform/win32window.cpp +++ b/src/framework/platform/win32window.cpp @@ -687,16 +687,12 @@ void WIN32Window::setMouseCursor(const std::string& file, const Point& hotSpot) std::vector xorMask(numbytes, 0); for(int i=0;i black } free_apng(&apng); diff --git a/src/framework/platform/x11window.cpp b/src/framework/platform/x11window.cpp index 892df0ad..b08ef1a3 100644 --- a/src/framework/platform/x11window.cpp +++ b/src/framework/platform/x11window.cpp @@ -632,7 +632,7 @@ void X11Window::poll() XFree(propertyValue); } } - + // updates window pos if(m_visible) m_position = newPos; @@ -794,6 +794,7 @@ void X11Window::poll() void X11Window::swapBuffers() { #ifndef OPENGL_ES2 + glFinish(); glXSwapBuffers(m_display, m_window); #else eglSwapBuffers(m_eglDisplay, m_eglSurface); @@ -872,17 +873,13 @@ void X11Window::setMouseCursor(const std::string& file, const Point& hotSpot) std::vector maskBits(numbytes, 0); for(int i=0;i alpha } free_apng(&apng);