diff --git a/ediv/propuestas.txt b/ediv/propuestas.txt index f6fce0e..1fd66f4 100644 --- a/ediv/propuestas.txt +++ b/ediv/propuestas.txt @@ -304,3 +304,14 @@ joysticks... controladores.. force feedback.. (kien tiene uno de estos trastos? drag&drop graficos mediante beziers!! http://www.newimage.com/~rhk/roaddemo/ + +[20:07] > en el caso de ediv +[20:07] [Xtrai2] igual vosotros incrementais antes ip +[20:07] > hacemos ip++ nada más leer el opcode +[20:07] > es decir +[20:07] [Xtrai2] ah +[20:07] [Xtrai2] ok ok +[20:07] > en el switch +[20:07] > ponemos +[20:07] > switch(mem[ip++]) { +[20:07] > etc \ No newline at end of file diff --git a/ediv/src/dlls/dinmem/dinmem.vcproj b/ediv/src/dlls/dinmem/dinmem.vcproj index d2dca49..7f81757 100644 --- a/ediv/src/dlls/dinmem/dinmem.vcproj +++ b/ediv/src/dlls/dinmem/dinmem.vcproj @@ -4,10 +4,10 @@ Version="7.00" Name="dinmem" ProjectGUID="{6994F9CD-63ED-425D-879C-678D1706F4AE}" - SccProjectName=""$/dlls", YCAAAAAA" + SccProjectName="" SccAuxPath="" - SccLocalPath="..\.." - SccProvider="MSSCCI:Microsoft Visual SourceSafe"> + SccLocalPath="" + SccProvider=""> @@ -24,6 +24,7 @@ num_procs;i++) { + if(i!=*fp->proceso_actual) { + fp->mem[fp->procs_s[fp->proc_orden[i]].id+_status]=1; /* s_kill */ + } + } + return 0; } diff --git a/ediv/src/dlls/edivstd/main.h b/ediv/src/dlls/edivstd/main.h index 1125e90..2393629 100644 --- a/ediv/src/dlls/edivstd/main.h +++ b/ediv/src/dlls/edivstd/main.h @@ -8,3 +8,4 @@ int eDIV_Exit(FUNCTION_PARAMS); int eDiv_GetId(FUNCTION_PARAMS) ; int eDiv_DefineRegion(FUNCTION_PARAMS) ; int eDIV_Signal(FUNCTION_PARAMS); +int eDIV_Let_Me_Alone(FUNCTION_PARAMS); \ No newline at end of file diff --git a/ediv/src/dlls/file/file.vcproj b/ediv/src/dlls/file/file.vcproj index a913540..662ceb2 100644 --- a/ediv/src/dlls/file/file.vcproj +++ b/ediv/src/dlls/file/file.vcproj @@ -4,10 +4,10 @@ Version="7.00" Name="file" ProjectGUID="{6994F9CD-63ED-425D-879C-678D1706F4AE}" - SccProjectName=""$/dlls", YCAAAAAA" + SccProjectName="" SccAuxPath="" - SccLocalPath="..\.." - SccProvider="MSSCCI:Microsoft Visual SourceSafe"> + SccLocalPath="" + SccProvider=""> @@ -44,10 +44,10 @@ IgnoreImportLibrary="TRUE" AdditionalOptions="/MACHINE:I386" AdditionalDependencies="odbc32.lib odbccp32.lib" - OutputFile="..\..\..\bin\dll\edivstd.dll" + OutputFile="..\..\..\bin\dll\file.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" - ModuleDefinitionFile=".\edivstd.def" + ModuleDefinitionFile=".\file.def" ProgramDatabaseFile=".\Release/edivstd.pdb" ImportLibrary=".\Release/edivstd.lib"/> w * zoomx); dstheight = (int) ((double) rz_src->h * zoomy); if (dstwidth < 1) @@ -884,7 +883,7 @@ zoomSurface (SDL_Surface * src, double zoomx, double zoomy, int smooth) return (rz_dst); } -#ifdef WIN32 +#ifdef NORL_WIN32 /* For DLL building under VC6 */ BOOL APIENTRY DllMain (HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) diff --git a/ediv/src/dlls/graphics/graphics.h b/ediv/src/dlls/graphics/graphics.h index 2ee7bb7..f4e555b 100644 --- a/ediv/src/dlls/graphics/graphics.h +++ b/ediv/src/dlls/graphics/graphics.h @@ -1,5 +1,7 @@ // GRAPHICS.H +#include + #define PIOVER180 0.017453292519943295769236907684886 SDL_Surface *screen; diff --git a/ediv/src/dlls/graphics/main.c b/ediv/src/dlls/graphics/main.c index 2fa2747..5a9e257 100644 --- a/ediv/src/dlls/graphics/main.c +++ b/ediv/src/dlls/graphics/main.c @@ -1167,7 +1167,7 @@ int eDIV_FADE(FUNCTION_PARAMS2) return 1 ; } -int eDIV_SETMODE(FUNCTION_PARAMS) +/*int eDIV_SETMODE(FUNCTION_PARAMS) { int x,y,bpp,full; full = getparm(); @@ -1181,7 +1181,7 @@ int eDIV_SETMODE(FUNCTION_PARAMS) else screen = SDL_SetVideoMode(x, y, bpp, SDL_SWSURFACE ); return; -} +}*/ //*********************************** Entry Points **********************************************// @@ -1361,7 +1361,7 @@ void frame(FUNCTION_PARAMS) for ( i = 0 ; i <= last_blit ; i++ ) { - SDL_SetAlpha( blits[i].src, SDL_SRCALPHA , blits[i].trans ) ; + //SDL_SetAlpha( blits[i].src, SDL_SRCALPHA , /*blits[i].trans*/128 ) ; SDL_BlitSurface( blits[i].src , &blits[i].srcrect , screen , &blits[i].dstrect ) ; SDL_FreeSurface (blits[i].src); } @@ -1462,6 +1462,20 @@ int Dibuja(SDL_Surface *src , SDL_Rect srcrect , SDL_Rect dstrect , int z , int //blits[last_blit].src = src; blits[last_blit].src =xput(src, zoom,angulo); + + /* PEKEÑO HACK PARA ARREGLAR TRANSPARENCY + * Debería limpiarse y revisarse un poco :P + */ + if(blits[last_blit].src->flags & SDL_SRCALPHA) { + for(i=0;ih*blits[last_blit].src->w*blits[last_blit].src->format->BytesPerPixel;i+=blits[last_blit].src->format->BytesPerPixel) { + if(*((int*)&((unsigned char*)blits[last_blit].src->pixels)[i])!=color_transparente) + ((unsigned char*)blits[last_blit].src->pixels)[i+3]=trans; + } + } + else { + SDL_SetAlpha(blits[last_blit].src,SDL_SRCALPHA,trans); + } + blits[last_blit].srcrect.x = srcrect.x ; blits[last_blit].srcrect.y = srcrect.y ; blits[last_blit].srcrect.w = blits[last_blit].src->w;//srcrect.w ; @@ -1472,7 +1486,7 @@ int Dibuja(SDL_Surface *src , SDL_Rect srcrect , SDL_Rect dstrect , int z , int blits[last_blit].dstrect.h = dstrect.h ; blits[last_blit].z = z ; blits[last_blit].trans = trans ; - + // Buscamos su posicion @@ -1505,8 +1519,8 @@ SDL_Surface *xput(SDL_Surface *src,double size,double angle) SDL_Surface *tmp; s=smooth; - if(size==1 && angle ==0)s=0; - tmp= zoomSurface (src, size, size,s); + if(size==1 && angle ==0)s=0; + tmp= zoomSurface (src, size, size,s); dst=rotozoomSurface (tmp, angle, 1,s); SDL_FreeSurface (tmp); diff --git a/ediv/src/dlls/input/input.vcproj b/ediv/src/dlls/input/input.vcproj index d9c388e..f347844 100644 --- a/ediv/src/dlls/input/input.vcproj +++ b/ediv/src/dlls/input/input.vcproj @@ -4,10 +4,10 @@ Version="7.00" Name="input" ProjectGUID="{6994F9CD-63ED-425D-879C-678D1706F4AE}" - SccProjectName=""$/dlls", YCAAAAAA" + SccProjectName="" SccAuxPath="" - SccLocalPath="..\.." - SccProvider="MSSCCI:Microsoft Visual SourceSafe"> + SccLocalPath="" + SccProvider=""> @@ -43,11 +43,11 @@ Name="VCLinkerTool" IgnoreImportLibrary="TRUE" AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="odbc32.lib odbccp32.lib" - OutputFile="..\..\..\bin\dll\edivstd.dll" + AdditionalDependencies="sdlmain.lib sdl.lib" + OutputFile="..\..\..\bin\dll\input.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" - ModuleDefinitionFile=".\edivstd.def" + ModuleDefinitionFile=".\input.def" ProgramDatabaseFile=".\Release/edivstd.pdb" ImportLibrary=".\Release/edivstd.lib"/> + SccLocalPath="" + SccProvider=""> @@ -43,11 +43,11 @@ Name="VCLinkerTool" IgnoreImportLibrary="TRUE" AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="odbc32.lib odbccp32.lib" - OutputFile="..\..\..\bin\dll\edivstd.dll" + AdditionalDependencies="sdlmain.lib sdl.lib" + OutputFile="..\..\..\bin\dll\text.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" - ModuleDefinitionFile=".\edivstd.def" + ModuleDefinitionFile=".\text.def" ProgramDatabaseFile=".\Release/edivstd.pdb" ImportLibrary=".\Release/edivstd.lib"/> 0 && no_devuelve == 0 ) { //pila[++sp] = 0 ;// AQUI SE DEBERA DEVOLVER EL ID diff --git a/ediv/src/visual c/doku/doku.vcproj b/ediv/src/visual c/doku/doku.vcproj index 0751cdc..3d60f74 100644 --- a/ediv/src/visual c/doku/doku.vcproj +++ b/ediv/src/visual c/doku/doku.vcproj @@ -78,7 +78,7 @@ OutputFile="$(OutDir)/doku.exe" LinkIncremental="1" GenerateDebugInformation="TRUE" - SubSystem="2" + SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1"/> diff --git a/ediv/src/visual c/ediv/ediv.vcproj b/ediv/src/visual c/ediv/ediv.vcproj index 7c3a284..25c65ca 100644 --- a/ediv/src/visual c/ediv/ediv.vcproj +++ b/ediv/src/visual c/ediv/ediv.vcproj @@ -74,7 +74,7 @@ EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="TRUE" + Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="3"/> diff --git a/ediv/src/visual c/ediv_ws.suo b/ediv/src/visual c/ediv_ws.suo index 4a8e55c..a1be842 100644 Binary files a/ediv/src/visual c/ediv_ws.suo and b/ediv/src/visual c/ediv_ws.suo differ diff --git a/ediv/src/visual c/stub/stub.vcproj b/ediv/src/visual c/stub/stub.vcproj index a08ba95..ae22661 100644 --- a/ediv/src/visual c/stub/stub.vcproj +++ b/ediv/src/visual c/stub/stub.vcproj @@ -89,7 +89,7 @@ makelib.bat win32.rel OutputFile="$(OutDir)/stub.exe" LinkIncremental="1" GenerateDebugInformation="TRUE" - SubSystem="1" + SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1"/> @@ -173,7 +173,7 @@ makelib.bat win32.dbg EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="TRUE" + Detect64BitPortabilityProblems="FALSE" DebugInformationFormat="3"/>