diff --git a/ediv/src/dlls/dlls.suo b/ediv/src/dlls/dlls.suo index 6a115d7..f0b1814 100644 Binary files a/ediv/src/dlls/dlls.suo and b/ediv/src/dlls/dlls.suo differ 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 194fcd2..c67675e 100644 Binary files a/ediv/src/visual c/ediv_ws.suo and b/ediv/src/visual c/ediv_ws.suo differ