From f5932a64d87ec02fee8d6bea373fa3651c85d479b49c19b6ffbf4f92229354bf Mon Sep 17 00:00:00 2001
From: Gabriel Lorenzo <ermakina@gmail.com>
Date: Tue, 29 Oct 2002 14:02:58 +0000
Subject: [PATCH] ya rula la Z

---
 ediv/src/dlls/dlls.suo        | Bin 23040 -> 23552 bytes
 ediv/src/dlls/graphics/main.c |  43 ++++++++++++++++++++++++++--------
 ediv/src/dlls/input/input.c   |   2 +-
 ediv/src/visual c/ediv_ws.suo | Bin 22016 -> 22528 bytes
 4 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/ediv/src/dlls/dlls.suo b/ediv/src/dlls/dlls.suo
index fefd1a728d64c8246c8436aaed1b65f546ecb332be64e0dc2d88d9a813115c88..64503230ebe046ce4e663da502b878a0c0c2a16b982ae4cec4d5b90415224dbb 100644
GIT binary patch
delta 1001
zcmaizO-vI(6vy8zTkOYfX(?cVUWgU2df?N92xSQvEEKy%L*S;7ikMoltfoN{YBVwG
zLEw2X@!&^{F?vx}6QURsxJZn)oY13Z4_<lzgT*&nN_x_1-psuJ`^}p-JJaMFmRw}7
z5`uUL0B~Axv+P{hWyx;mT2_B8yl3|G%X{tNnPpZ)Q1UQNi2)fLG#AM@h)#1oZixN3
zVr@jlEMmg6B=H;{3E(3t#T)Fa-nPdo%B+e+YkuXL=ta$TgNgd4t(RegC}MxehcVgL
zRwn?9P6$LA?U@^<KatON{8DxmTA>YEO+X;2wI+ZjGQc(2WvQiw?PPV_o3|%~>jF;M
z`y>wmW-_C0+P%1hoOZz9_JC2oR-#HSlK8%P#^faD4{nz9R`4UoSNpmS+&|y{eEre2
z!R+FTAAnsBpPqEAFqu^nAQ!Aftu$mL&g4d2bE!<?nac~QOqptkdkaOaT$L(F;M?bG
z(KF>KdB(n472UGz3(aod+(<1yJ<2SENMz#>g9*3{8qI(5JBq+4iC18fq*3y*l)5p9
z!)fBqQRobX0IE65nYfW+%n*<8Yq~(BMkK&zJ9Ru;tb^1D8NeNmoFy$v0&U5WNy-_A
zizG$K>*j<;(FFCh0Ge>k>q2!v#M?oy{?2>LmizDxX{nk3Uf=FvwZ<jpNRz@}QEF#I
zrP*WoM$UIG%!MB;v~*i@IsB?*Bav5;&w&|#?gF&Vkj%;`;x35lna(dJ9Q5?yhroJG
z{lA`^00P5HCy(R7;kOIN6js#K+=AVK4phPse5_XMO0Y-3d9xc+ss|sc63%*kyYuw^
zT74@hT6E{oFE)3|`D9qA48RbafC1>CUxYr}I9*JPW^ughuS2ENY%VS+RW$xdH6uae
Rq44AJhBYJFe}pb`!(W>cQ1Ac%

delta 1079
zcmYk5OH30{6o$`jr$C*VwiM7RjUufEF&gk0W7PVHr3Gyp3~}McC<+0A$fy;KlBhAb
z^ejzWxNxnG3!_AhxK#=p-|x5hwkn{u{&y&9ldp5`fBti3?yLKP=sqvbByCD2o6Yk6
zyb9-RB9ep5*+jiKuC%%ypE&wHb>Nz?BN1B3T}nh39>fZOFUy4m6+Eoe>Y^~GSn7Zh
z<WPaaNk^~t42dh?HsDa+uy}7S$)BL;GzG#0@VCNH4~tdih#D3gj?LvZy;4l$M8xkW
z@``=5nC4NH10_Nb4WjTJaPfd%<cuNO1QK#|+?BKiH12XmwLEAAVEh$%ZVdc_M_m!_
zQ>)o<$F-7Ne%#}bGkMJ;?y#_PgQt?O21?9sPoL0fGBSG3&T@{1H)i!ok3CJJC@wTF
z9P0nBba7nsK`8oPG)m&yq?|DRYBOEZug}z=Hd7mQ&@M6%cgh8Cq^%HlQzxXY7^|EK
zOl)qE>$ih8Lu^9yOgg1wr`2FPVxsvj{K?`rI2!@cAz8K!QY!?aQt9ZVEhuY;)QXYS
z*g!UEeZo>cS?=S(pqD+h3P+<s^J1_^)rI`<QrO2Qz(!Syud7w2QQa#%caXUW`aueC
zXukj8a|Ca|U2qTF2M@qQ@CZBxPry@P9Yyqhf%qkO1zv-<AOnVgJOm%X2O#~Q@cazE
zfUh78zJc%H2T_oQ5sZLQ@Duz3zd;r#I9Vi!&(6AJUR==Q)I~9bi871d*p@GkYc>dS
z&Hjq%<uTp5BT|vSG3$yLuXa?M=@mB|9QUme`+41rIouu&^7<KNJXGH(%H;W$mr3wt
zU)?{0TdsTuwqqyOe=argyZVN6H6dYNuy7Htjx6Jr(q-&edrOpaVnaC_<x$l3*G#vX
zr)r9=<^di^OcgKrNTAHQ*Fm%g*sc4r0rTttsvPAX!)ZOO5+|ZzxxePIy4}t~dC6?R
P4y=7JMZ-sNYNPEBA~Z{`

diff --git a/ediv/src/dlls/graphics/main.c b/ediv/src/dlls/graphics/main.c
index 3cddee9..ded70cb 100644
--- a/ediv/src/dlls/graphics/main.c
+++ b/ediv/src/dlls/graphics/main.c
@@ -77,7 +77,7 @@ struct{
 
 int last_draw ;
 
-struct{
+struct _blits {
 	SDL_Surface *src ;
 	SDL_Rect srcrect ;
 	SDL_Surface *dst ;
@@ -1169,6 +1169,17 @@ int eDIV_FADE(FUNCTION_PARAMS2)
 FILE * fichero ;
 FILE * memo ;
 
+/*
+ * Función para usar con qsort() para ordenar los blits por su Z
+ */
+
+int ordena_por_z(const void* a, const void* b)
+{
+	struct _blits* aa=(struct _blits*)a;
+	struct _blits* bb=(struct _blits*)b;
+	return (aa->z>bb->z)?-1:((aa->z<bb->z)?1:0);
+}
+
 void frame(FUNCTION_PARAMS)
 {
 	static int una_vez = 1 ;
@@ -1193,7 +1204,10 @@ void frame(FUNCTION_PARAMS)
 	//SDL_FillRect( screen , NULL , 0 ) ;
 	SDL_BlitSurface( fondo , NULL , screen , NULL ) ;
 
-	// Draws
+	/*
+	 * Draws
+	 */
+
 	z = global("draw_z");
 	smooth = global("smooth");
 	for ( i = 0 ; i <= last_draw ; i++ )
@@ -1216,12 +1230,16 @@ void frame(FUNCTION_PARAMS)
 					dstrect.w = 0 ; // Se ignora
 					dstrect.h = 0 ; // Se ignora
 					//Dibuja( files[f].mapa[g].Surface , srcrect , dstrect , z , 0 ) ; 
-					Dibuja( draws[i].Surface , srcrect , dstrect , z , draws[i].t,0,0) ; 
+					Dibuja( draws[i].Surface , srcrect , dstrect , z , draws[i].t,100,0) ; 
 				}
 			}
 		}
 	}
 
+	/*
+	 * Procesos
+	 */
+
 	for ( i = 0 ; i < *fp->num_procs ; i++ )
 	{
 		id = fp->procs_s[ fp->proc_orden[i] ].id ;
@@ -1305,12 +1323,17 @@ void frame(FUNCTION_PARAMS)
 	//if ( last_map >= 2 )
 	//	Mapa[2]->flags |= SDL_SRCALPHA ;
 
-	// Volcamos la pila de bliteos
+	/*
+	 * Volcamos la pila de bliteos
+	 */
+
+	qsort(blits,last_blit+1,sizeof(struct _blits),ordena_por_z);
+
 	for ( i = 0 ; i <= last_blit ; i++ )
 	{
-		SDL_SetAlpha( orden[i]->src, SDL_SRCALPHA , orden[i]->trans ) ;
-		SDL_BlitSurface( orden[i]->src , &orden[i]->srcrect , screen , &orden[i]->dstrect ) ;
-	    SDL_FreeSurface (orden[i]->src);
+		SDL_SetAlpha( blits[i].src, SDL_SRCALPHA , blits[i].trans ) ;
+		SDL_BlitSurface( blits[i].src , &blits[i].srcrect , screen , &blits[i].dstrect ) ;
+	    SDL_FreeSurface (blits[i].src);
 	}
 	last_blit = -1 ;
 
@@ -1371,7 +1394,7 @@ void first_load(FUNCTION_PARAMS2)
 	define_region = 1 ;
 
 	SDL_WM_SetCaption(fp->nombre_program, NULL);
-//	SDL_ShowCursor(SDL_DISABLE);
+	SDL_ShowCursor(SDL_DISABLE);
 
 	//prueba = SDL_LoadBMP("prueba.bmp" );
 
@@ -1421,7 +1444,7 @@ int Dibuja(SDL_Surface *src , SDL_Rect srcrect , SDL_Rect dstrect , int z , int
 
 
 	// Buscamos su posicion
-	for ( i = 0 ; i < last_blit ; )
+/*	for ( i = 0 ; i < last_blit ; )
 	{
 		if ( orden[i]->z < z ) 
 		{
@@ -1433,7 +1456,7 @@ int Dibuja(SDL_Surface *src , SDL_Rect srcrect , SDL_Rect dstrect , int z , int
 		}
 		i++ ;
 	}
-	orden[i] = &blits[last_blit] ;
+	orden[i] = &blits[last_blit] ;*/
 
 
 
diff --git a/ediv/src/dlls/input/input.c b/ediv/src/dlls/input/input.c
index 7d93a82..ed6841b 100644
--- a/ediv/src/dlls/input/input.c
+++ b/ediv/src/dlls/input/input.c
@@ -570,7 +570,7 @@ void frame(FUNCTION_PARAMS)
 		dstrect.h=mapamouse->h;
 
 		// TODO: añadir chequeo de error si no existe file o mapa
-		fp->Dibuja(mapamouse,srcrect,dstrect,/*fp->mem[_mouse+4]*/0,255,0,0);
+		fp->Dibuja(mapamouse,srcrect,dstrect,fp->mem[_mouse+4],255,0,0);
 	}
 
 	/* FIN DE MOUSE */
diff --git a/ediv/src/visual c/ediv_ws.suo b/ediv/src/visual c/ediv_ws.suo
index 4313a5698fff561b801aace868869a793dddbcb5220ae4b0e848e072199d5e3e..6dbc14d193741a40dda93e35b6aa4ad98fbb70b091e8e01ddf79a502d8b74566 100644
GIT binary patch
delta 595
zcmb7>zb`{k6vyv*y|13S{qa=%NJ$zoplCzV1Ti#uOBoc25E~_aC1^`hiy9<0;VcG&
zU=T4h-eNE`bkIeJ!QkJhMWUR`BVlus`|I=lo_p^(H**e|EM#XD)yEhs?GE{H+wM0{
zlrh-ji>^#IGBL7o4K@;41FrLe6QuFoYWTpLFr~(X-0PO`35#kRR&d-NfP}ea?*(Ux
z9I_|LMfY@FXn94{(MFyv!)2IRbllm1;f*U&nJDx}TK4A$PM;1phf9}dguy+kA3Mk&
zXG?5>t<tKZ7T?0Y<}OL6iO;b$T0LqsOtMZkL$g<ENtPo2q?vPb5DEb&_3vx3=!uC6
z3;e*89uwjZv@a7VW9F+K<xVL7qpDs49MjbUn0JJr5nrkY(eQ*YRTC2`Y4ujXSFSbp
zUg0L<`9%XRh2Dp}qmL@{j7IS4$bgGb8^^}pDl^xUgT3&r=K2*A7T}FCgR)PuDXPsH
z)gr;txTCgXj&u1ME{l)47DT_+@cCadQQ0i$C&7;)uKrWp><*Z%(S*Z1Fye4zRDJ-o
COXcnW

delta 672
zcmYjNOK1~O6uoaU2{BIol2{t0wcSXYbeh^}HO8hIgId9ff+)B!HuYQlv`IycIxYma
z?cKNxuB5oAnT^X}yRaY<MR4Ip5O-aU8yAUZ(iHL@=gygP&*Qy&j5T4r6Kgjm(Ok~=
z$_I#uUr8}J3i3XGNvz28zN>$#Ta9NQg##Mx=g0D<mwG|HKnsh%%7a{T>WUA7zgx7N
zMN#I<t|75xzI3I;z6a<o0E<8gXyUkyhc;i%57gWn5^qFQ)AD?A2*K;VY3}h~2+Vq5
zDAGN;LuIfqSNySb$`<D!-=Zb30XNDuO44<Ff7`u9+);)^w7#%;X8Pdk+cR%}R9~EL
zepnS|-7gEy22{2Jx+1}2k7BRwae})24%dA&CWQGfcv|+h9lJYD+vN=7r;i^+W|UoE
zN>@wt^WVrhr3aF;OXgBkSArd3=Q7iZHo}UXZlKF*T0=fbLI!do&3jK|MTLKc`W+Q2
zav>CbzBBg~nx_KYr5l*EfI3GBnxzW%6Pl#sG=`e&AWj;%3dCs?I}60oo1_V-abSDr
z+R8Z8!|){ODV{Z&96L0wA=Or^Pa+|R#mE#J38SVC%jR(UyI9dax!VDDGBhnsLCm?j
z;A$dc8mH<~=hUx6jK7Txa^^^#YpTYp$IkNBQ4bpzGv?>1hRn6p9#&84Z*rmkw4~A3