arreglado transparency y flags

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

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="..\.."
+	SccLocalPath=""
-	SccProvider="MSSCCI:Microsoft Visual SourceSafe">
+	SccProvider="">
 	<Platforms>
 		<Platform
 			Name="Win32"/>
@@ -24,6 +24,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
+				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories=".."
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EDIVSTD_EXPORTS"
 				StringPooling="TRUE"
@@ -44,10 +45,10 @@
 				IgnoreImportLibrary="TRUE"
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="..\..\..\bin\dll\edivstd.dll"
+				OutputFile="..\..\..\bin\dll\dinmem.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				ModuleDefinitionFile=".\edivstd.def"
+				ModuleDefinitionFile=".\dinmem.def"
 				ProgramDatabaseFile=".\Release/edivstd.pdb"
 				ImportLibrary=".\Release/edivstd.lib"/>
 			<Tool

ediv/src/dlls/dlls.sln

@@ -18,29 +18,6 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "math", "math\math.vcproj", "{5F3C5CEB-002A-4132-BCA3-65CE524A23E9}"
 EndProject
 Global
-	GlobalSection(SourceCodeControl) = preSolution
-		SccNumberOfProjects = 4
-		SccProjectUniqueName0 = dinmem\\dinmem.vcproj
-		SccProjectName0 = \u0022$/dlls\u0022,\u0020YCAAAAAA
-		SccLocalPath0 = ..
-		SccProvider0 = MSSCCI:Microsoft\u0020Visual\u0020SourceSafe
-		SccProjectFilePathRelativizedFromConnection0 = dlls\\dinmem\\
-		SccProjectUniqueName1 = file\\file.vcproj
-		SccProjectName1 = \u0022$/dlls\u0022,\u0020YCAAAAAA
-		SccLocalPath1 = ..
-		SccProvider1 = MSSCCI:Microsoft\u0020Visual\u0020SourceSafe
-		SccProjectFilePathRelativizedFromConnection1 = dlls\\file\\
-		SccProjectUniqueName2 = input\\input.vcproj
-		SccProjectName2 = \u0022$/dlls\u0022,\u0020YCAAAAAA
-		SccLocalPath2 = ..
-		SccProvider2 = MSSCCI:Microsoft\u0020Visual\u0020SourceSafe
-		SccProjectFilePathRelativizedFromConnection2 = dlls\\input\\
-		SccProjectUniqueName3 = text\\text.vcproj
-		SccProjectName3 = \u0022$/dlls\u0022,\u0020YCAAAAAA
-		SccLocalPath3 = ..
-		SccProvider3 = MSSCCI:Microsoft\u0020Visual\u0020SourceSafe
-		SccProjectFilePathRelativizedFromConnection3 = dlls\\text\\
-	EndGlobalSection
 	GlobalSection(SolutionConfiguration) = preSolution
 		ConfigName.0 = Debug
 		ConfigName.1 = Release

ediv/src/dlls/edivstd/edivstd.c

@@ -162,6 +162,7 @@ int ExportaFuncs(EXPORTAFUNCS_PARAMS)
 	FUNCTION("get_id",1,eDiv_GetId) ;
 	FUNCTION("define_region",5,eDiv_DefineRegion) ;
 	FUNCTION("signal",2,eDIV_Signal);
+	FUNCTION("let_me_alone",0,eDIV_Let_Me_Alone);
 
 	ENTRYPOINT( first_load ) ;
 	ENTRYPOINT(frame);
@@ -248,11 +249,11 @@ void signal_tree(int proc, int signal, FUNCTION_PARAMS)
 	int id2;
 	if(id2=local("son",proc)) {
 		signal_tree(id2,signal,fp);
-		reserved("status",proc)=signal;
+		reserved("status",id2)=signal;
 	}
-	while(local("bigbro",proc)) {
+	while(local("bigbro",id2)) {
-		proc=local("bigbro",proc);
+		proc=local("bigbro",id2);
-		reserved("status",proc)=signal;
+		reserved("status",id2)=signal;
 	}
 	/*while(local("smallbro",proc)) {
 		proc=local("smallbro",proc);
@@ -291,6 +292,20 @@ int eDIV_Signal(FUNCTION_PARAMS)
 			}
 		}
 	}
+	return 0;
+}
+
+int eDIV_Let_Me_Alone(FUNCTION_PARAMS)
+{
+	int i;
+	int _status=reservedptr("status");
+
+	for(i=0;i<*fp->num_procs;i++) {
+		if(i!=*fp->proceso_actual) {
+			fp->mem[fp->procs_s[fp->proc_orden[i]].id+_status]=1; /* s_kill */
+		}
+	}
+	return 0;
 }
 
 

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);

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="..\.."
+	SccLocalPath=""
-	SccProvider="MSSCCI:Microsoft Visual SourceSafe">
+	SccProvider="">
 	<Platforms>
 		<Platform
 			Name="Win32"/>
@@ -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"/>
 			<Tool

ediv/src/dlls/graphics/SDL_rotozoom.c

@@ -819,7 +819,6 @@ zoomSurface (SDL_Surface * src, double zoomx, double zoomy, int smooth)
       zoomy = VALUE_LIMIT;
     }
 
- 
   dstwidth = (int) ((double) rz_src->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)

ediv/src/dlls/graphics/graphics.h

@@ -1,5 +1,7 @@
 // GRAPHICS.H
 
+#include <SDL/SDL.h>
+
 #define PIOVER180	0.017453292519943295769236907684886
 
 SDL_Surface *screen;

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;i<blits[last_blit].src->h*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;
+	if(size==1 && angle ==0)s=0;    
-    tmp= zoomSurface (src, size, size,s);
+	tmp= zoomSurface (src, size, size,s);
 	dst=rotozoomSurface (tmp, angle, 1,s);
 	SDL_FreeSurface (tmp);
 	

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="..\.."
+	SccLocalPath=""
-	SccProvider="MSSCCI:Microsoft Visual SourceSafe">
+	SccProvider="">
 	<Platforms>
 		<Platform
 			Name="Win32"/>
@@ -43,11 +43,11 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="TRUE"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib"
+				AdditionalDependencies="sdlmain.lib sdl.lib"
-				OutputFile="..\..\..\bin\dll\edivstd.dll"
+				OutputFile="..\..\..\bin\dll\input.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				ModuleDefinitionFile=".\edivstd.def"
+				ModuleDefinitionFile=".\input.def"
 				ProgramDatabaseFile=".\Release/edivstd.pdb"
 				ImportLibrary=".\Release/edivstd.lib"/>
 			<Tool

ediv/src/dlls/math/math.vcproj

@@ -67,6 +67,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
+				AdditionalIncludeDirectories="..;..\..\shared"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MATH_EXPORTS"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -79,8 +80,9 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/math.dll"
+				OutputFile="..\..\..\bin\dll\math.dll"
 				LinkIncremental="1"
+				ModuleDefinitionFile=".\math.def"
 				GenerateDebugInformation="TRUE"
 				SubSystem="2"
 				OptimizeReferences="2"

ediv/src/dlls/scroll/scroll.vcproj

@@ -66,6 +66,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
+				AdditionalIncludeDirectories="..;..\..\shared"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SCROLL_EXPORTS"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -78,7 +79,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/scroll.dll"
+				OutputFile="..\..\..\bin\dll\scroll.dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
 				SubSystem="2"

ediv/src/dlls/strings/strings.vcproj

@@ -84,6 +84,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..;..\..\shared"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;STRINGS_EXPORTS"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -101,7 +102,6 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="TRUE"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib"
 				OutputFile="..\..\..\bin\dll\strings.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"

ediv/src/dlls/text/text.vcproj

@@ -4,10 +4,10 @@
 	Version="7.00"
 	Name="text"
 	ProjectGUID="{6994F9CD-63ED-425D-879C-678D1706F4AE}"
-	SccProjectName=""$/dlls", YCAAAAAA"
+	SccProjectName=""
 	SccAuxPath=""
-	SccLocalPath="..\.."
+	SccLocalPath=""
-	SccProvider="MSSCCI:Microsoft Visual SourceSafe">
+	SccProvider="">
 	<Platforms>
 		<Platform
 			Name="Win32"/>
@@ -43,11 +43,11 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="TRUE"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib"
+				AdditionalDependencies="sdlmain.lib sdl.lib"
-				OutputFile="..\..\..\bin\dll\edivstd.dll"
+				OutputFile="..\..\..\bin\dll\text.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				ModuleDefinitionFile=".\edivstd.def"
+				ModuleDefinitionFile=".\text.def"
 				ProgramDatabaseFile=".\Release/edivstd.pdb"
 				ImportLibrary=".\Release/edivstd.lib"/>
 			<Tool

ediv/src/stub/inte.c

@@ -152,9 +152,17 @@ int interprete()
 				proceso( proc_orden[ proceso_actual ], -1 ) ;
 		}
 		Call_Entrypoint(EDIV_frame);
+
+		for ( proceso_actual = 0 ; proceso_actual < num_proc_orden ; proceso_actual++ )
+		{
+			if(mem[procs_s[proc_orden[proceso_actual]].id+_status]==1) {
+				//mem[procs_s[num].id+_status=0;
+				lista_quita(proceso_actual);
+			}
+		}
 		
-	}else
+	}
-	{
+	else {
 		stub_quit(0) ;
 	}
 	
@@ -557,11 +565,6 @@ int proceso( int num, int padre )
 		#endif /* DBG */
 	}
 
-	if(mem[procs_s[num].id+_status]==1) {
-		//mem[procs_s[num].id+_status=0;
-		lista_quita(num_proc);
-	}
-
 	if ( devolver > 0 && no_devuelve == 0 )
 	{
 		//pila[++sp] = 0 ;// AQUI SE DEBERA DEVOLVER EL ID

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"/>

ediv/src/visual c/ediv/ediv.vcproj

@@ -74,7 +74,7 @@
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
+				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>

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"/>
 			<Tool
 				Name="VCCustomBuildTool"/>