From a39f8d1767b7eecd90ef198332f3344d9ef591ea9fe3c8e72979a4a98aad2b3a Mon Sep 17 00:00:00 2001 From: Gabriel Lorenzo Date: Mon, 7 Oct 2002 16:11:40 +0000 Subject: [PATCH] el mouse ya no peta pero no se ve --- ediv/src/dlls/dlls.suo | Bin 20480 -> 18944 bytes ediv/src/dlls/graphics/main.c | 3 +-- ediv/src/dlls/input/input.c | 17 ++++++++++++----- ediv/src/ediv/ediv.c | 2 +- ediv/src/visual c/ediv_ws.suo | Bin 25600 -> 25600 bytes 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ediv/src/dlls/dlls.suo b/ediv/src/dlls/dlls.suo index 6a115d7179e808f57d09537eeca7e8b31970d30bd339ee9cca675b9f33194e67..f0b1814bc2c35acb9c9e921ee4652875f4a8d9e988b8b88c8acaf60d251ac815 100644 GIT binary patch delta 1102 zcmaJ=TS!z<6y4|EJEM*>qs~Le2Q=lKM{4AYKoSwJGo~qyB_;SZ>ZC*Su<;UNQWIi9 zNR&JJ2}BM03R9;SNg+KKb9wQpjlUeek9@@|KAJ5U;^8snr0vluHzQ^k8158@Hv?_)b@ajhPaTYT}wo zDgv?^Gv;b#{VvJg6T!dOsNI%$lBmx(#WXU}&G_AWSi?s^;z?$!$fU$hb_>HwNy0LH zJ;n_=OxoD(}kB(3! zKtXeADPAL$5DO+rgTCq8m&p6y- zcPgKCR^zHHrQsg&RI1kIDoe|q_|@q==&|l{r!04%R;ftMQ;Ii~>I2O!uVvY-WF`-u zTDhSwrnPY=xYx+{O|9BsPtj9-GmjrQ9?z-#g5o9qs4ix^ce@I5KM-7__(-u%f%X~; zuY6vvRdoBk8+`g~s&Hfe_0}vBn8cliPX=b8)RtDuenud~PY`umI=Yg0RqkcpEJ9MV zU-ffZ*VEB%KifYP2q&STIp_~X2koALpc;*FLDu;|pWPdch51H;PKkzxqme*F#c-4T zkWmQ*hx?-b*ns^^Ffzy$87+ZGAm-=01vuGs5|?EQ1H9xYM_*Y9&MW!2CL5RCAtCYD z)6KB6$b-K-&DiTQvvHhjDa0vRhixt!THDSYuc-wnfP*{d{@ NG~r%*A1bY{{{k=}M{@uG delta 2212 zcmb7FZ%kWN6hE(j5NJz*!sy0GU{L7BK%hWy5=07xZm7-tu$d9C&^j?KkF^iR>KwS4 z_+>L2XCD`Xnivyf#MSu+6TvZc@y`Tx{@Wk*n;%S^3m=9b#NU1NO)wjl`|^A5p5Hz1 z-gE9f=iIT=(%6JFd0fZGQ_NiJ`r_2%XT}Yoj2kacS)K`>m-Ix`+`ut|*CJ)2Zvd9i zI4jl3w+y>1QdWXd*?B_=H>VnS#5k7IjRDdA#)!ZL^x2%^G=GfFMc}$1np18WenuzW zcu$8^z8gI^?Vv6SP>`bJrwAUILU?4bgQ|20V}0>AQ@wiWW_;1qE^%gBGmlxUElzz{ zmo6-H=t$o+Az?bTP41hJE<)Cbozm0vAk~n^2#+*2Td4B9#g?}GQ$iZg7}33AJ#zMp{mG{JMBE5~~Y!dJi?Fb{kUd;@$7Tn4@az6X8)egu93t^ikoYk)TK zFI??9cDB}?Zjo|8Zvg%^yvb+Qfe_K7k;X{~=XkN{Gj&H*jwn4BjM%$-Ew$P9taL7K~=Ww=^qHl2cxP6?`_H86D_XX zJC-yxUYp8l))C#~Wywc(@mXg`$05&YeFdr6WE0ktnt4y*D+*&L|5=jDzO)@%qu~2c zoBYVmC~`4^T&x7sh&&yHJU~sTQRx)m2ON1GQ3r;ocSSAhQS)~Y+IRa?ti8H^@L_Kc z>Uhj{hsF7~j(yzjeLoweW0+RWj-kgYi1MgFKP};emzK(OB&|{UeZ0Nn+2X$czhu-C z>2~DgJxZ-0}$k;^~b#Gn$siO#Cg0utTE*4E( zQLf6AWkGv?`Fd^kA0NJP9lP446>K-%M^)reA2+%9lzl57E#6+aQs;J2@1iyQtf;FO zJHLD@B<`%4<^0kNpxYLRs3^)&Z<4!Mz&F}A7j3~6-T1J`ZneE?r^6GFwJTaD@!Y0P IZfm#w1K0*Z*Z=?k diff --git a/ediv/src/dlls/graphics/main.c b/ediv/src/dlls/graphics/main.c index fc7b1f8..92e1d71 100644 --- a/ediv/src/dlls/graphics/main.c +++ b/ediv/src/dlls/graphics/main.c @@ -1326,7 +1326,7 @@ int eDIV_FADE(FUNCTION_PARAMS2) return 1 ; } -#include + //*********************************** Entry Points **********************************************// FILE * fichero ; @@ -1465,7 +1465,6 @@ void frame(FUNCTION_PARAMS) //if ( last_map >= 2 ) // Mapa[2]->flags |= SDL_SRCALPHA ; - assert(0); // Volcamos la pila de bliteos for ( i = 0 ; i <= last_blit ; i++ ) { diff --git a/ediv/src/dlls/input/input.c b/ediv/src/dlls/input/input.c index 13f8275..ce36bfb 100644 --- a/ediv/src/dlls/input/input.c +++ b/ediv/src/dlls/input/input.c @@ -531,6 +531,8 @@ void frame(FUNCTION_PARAMS) keys = SDL_GetKeyState(&numkeys ) ; + /* MOUSE */ + mbuttons = SDL_GetMouseState(&fp->mem[_mouse],&fp->mem[_mouse+1]); /* Ponemos los 5 botones a 0 */ @@ -551,12 +553,17 @@ void frame(FUNCTION_PARAMS) if(mbuttons&SDL_BUTTON(5)) /* podria no funcionar ¿necesario sdl_event? */ fp->mem[_mouse+13]=1; - srcrect.x=srcrect.y=srcrect.w=srcrect.h=dstrect.w=dstrect.h=0; - dstrect.x=fp->mem[_mouse]; - dstrect.y=fp->mem[_mouse+1]; + /* si mouse.graph!=0 */ + if(fp->mem[_mouse+2]!=0) { + srcrect.x=srcrect.y=srcrect.w=srcrect.h=dstrect.w=dstrect.h=0; + dstrect.x=fp->mem[_mouse]; + dstrect.y=fp->mem[_mouse+1]; - // TODO: añadir chequeo de error si no existe file o mapa - fp->Dibuja(fp->files[fp->mem[_mouse+3]].mapa[fp->mem[_mouse+2]].Surface,srcrect,dstrect,fp->mem[_mouse+4],0); + // TODO: añadir chequeo de error si no existe file o mapa + fp->Dibuja(fp->files[fp->mem[_mouse+3]].mapa[fp->mem[_mouse+2]].Surface,srcrect,dstrect,fp->mem[_mouse+4],0); + } + + /* FIN DE MOUSE */ //FILE* fichero ; //fichero = fopen( "input.txt" , "w+" ) ; diff --git a/ediv/src/ediv/ediv.c b/ediv/src/ediv/ediv.c index 6f9e2de..8d16263 100644 --- a/ediv/src/ediv/ediv.c +++ b/ediv/src/ediv/ediv.c @@ -55,7 +55,7 @@ void conecta(char *servidor, char *archivo); int main(int argc, char *argv[]) { - FILE *fp; /* stream del PRG /* + FILE *fp; /* stream del PRG */ char *p; char libmagic[14]; /* cabecera "magic" de EDIVRUN.LIB */ diff --git a/ediv/src/visual c/ediv_ws.suo b/ediv/src/visual c/ediv_ws.suo index 194fcd2dbad34f766073726fd969f1a1e36480af659821a5b2b04e6c23e1bb19..c67675e6282ed13c9946f920bb4b262690b640eca95f6234cd5d6a9a0637aea9 100644 GIT binary patch delta 720 zcmZoT!PszuaYG9eqtfI?Ch5%!n9eZrIhc1Hk^j%H}Vu7g#1A5i{8Qh3gzMBlqOPd{YD`a{*PPFyu32Gn4{Zt0gA?HIvr44H8WS zif1yE0a?E}fJ7355kne~UJQ~eW+(xwPXe+&Z(h&u$;8CZyZM)39Sftyt$7x{!I-?923rifM5~dCie2ii$*yZBvlNcEpCLeTY7E@(nV8jwkQI0^}YS`uK zoPf5fW0zay%)~g^#-4{=10p|pzl-eT2Yf6RM!>+a17c7_fxy|-CPMG`t-WW&pvz#w yU=9&vV1PywG(4FYK0w3MZ}NS+*vXr`r6y~+iERoxz_|H<+a1oyMFA>{f`kBQNX!)g delta 631 zcmZoT!PszuaYG9e8!pfV6q?G$D)c_s$toDE>#0Oc5#Nifu$$l0(tPv44} z^&e3Gzm0*xjFU_jZC(@_$2iIC1P33A5oR5X3JO?_U}glF2L%5n`v>?=erd5^OcATX z&HF657#US3U*r>>e8=jCf)Z9$P~(^wzCew0o6K#&H+iZ}vY0Yf4V(FF#Tdm@u*+H5 z@iB_2Vwa1vPhw