From e8aa4b485a38ecdd06d491091b641908fd24ae46412e6d94ae9f394f3375790d Mon Sep 17 00:00:00 2001
From: Gabriel Lorenzo <ermakina@gmail.com>
Date: Fri, 13 Dec 2002 22:25:15 +0000
Subject: [PATCH] nueva funcion en la graphics.dll: get_rgb

---
 ediv/CHANGE_LOG.txt               |   8 ++++++++
 ediv/src/dlls/dlls.suo            | Bin 23552 -> 23552 bytes
 ediv/src/dlls/graphics/graphics.h |   1 +
 ediv/src/dlls/graphics/main.c     |  27 +++++++++++++++++++++++++++
 4 files changed, 36 insertions(+)

diff --git a/ediv/CHANGE_LOG.txt b/ediv/CHANGE_LOG.txt
index b777301..06fc88d 100644
--- a/ediv/CHANGE_LOG.txt
+++ b/ediv/CHANGE_LOG.txt
@@ -1,3 +1,11 @@
+13/12/2002
+----------
+ * Nueva funcion en la graphics.dll: get_rgb(color,&r,&g,&b). obtiene las
+   componentes RGB de un color dado. naturalmente es similar a la funcion
+   homonima que hice en su dia para div2 ;) ojo, no esta preparada para
+   8 bpp (en esta profundidad debera devolver valores de 0..63, ademas de
+   diferenciar la paleta activa de la paleta cargada) (Er_Makina)
+
 12/12/2002
 ----------
  * Corregido fallo en la math.c... el seno de 90º no es infinito, sino 1 ¬¬
diff --git a/ediv/src/dlls/dlls.suo b/ediv/src/dlls/dlls.suo
index aa530d5a683e4bef871b7083cd1cc04e7cc4fc67caa1575b44296daa6e5d407e..2b45314f25af87542920360a2bdfcb763ee33624a08a76fd0565c28882785724 100644
GIT binary patch
delta 517
zcmZ9IJ4*vW6ot=hW-*Uh^Dt|aU{Fb6BbdrAv5)8mD`O=Z9~fWBAcCL~|AF&Igh5Cv
zDJ_x|*7nvbq!9E@Okj23UWV_SIdi$KHfy!nQ=QxM3#+A1b;-9x8~~^KrlXSKB{kq>
zhs8!@Nc%jm*1}v}+v_6nPk3~=9@wuD)rl6gANMRVNe*WmNKds)^_Z9=!U9yuv?olu
z8-)G{W`a<<o|q<(3_$I>@6KJvOjE-?j&X%1B;9~!irOI>*u@2oNZKO_I5A%1X%IRi
zgMqOqwNr9Rasp*DyGc7ESfc{6#&JNXP5{_3jwVGmaE^&OQQ$^z=Raa*0ZOj)M3#^l
zVZ1sm3tjQ67Cm8+A_A)Ni(QAMiOdA3_DgS0$U;gbHlOwV#+SvQZY#Nn8v>T8;;Qdt
e>>NE=)Gw8Xupl=4ar~>2RZmP2oc$A973>H3iL258

delta 522
zcmY+BJ4*vW6ov1syRb=S%)`V7qE!k(MAO(P(LSOZtV|~{J|Mo5K?FhKKak9?5DSGt
zNN*!pBmu4M?Sw5-2zn;T$~tg|neUuAcXp@IVvQDitlG})*NeNL&h2eJLqsE}9}Jar
z=Ty%w2#SGB1+;5t)w*k|OJ{@IL)f=NXbM~RoY#n8h6F=F(SF>sxCMVA6r^RU!?*y6
zhp3WikEZ}KVdw)+0*r;B%y@ia2u!;{tIUU3EtozP+M^@7pgKvch{`7QfNHc$XLJau
z42kF}is=|o0>ahIrk7Vnu`;Jmpj1#q_r|slR0SZKH;y_YYIF)z#jc=tvY)ZR*H2>~
zTuI5L4iA1u0JY4uxnODd#{YTqUf*lt1F!P)ZS@?@X@Biq;DJ&qvGt^HHoq-qsq5lw
i<jx^_KqXXHEb6!7nakPm{9lGFc{~ZoL&4fFarO(BF2g4P

diff --git a/ediv/src/dlls/graphics/graphics.h b/ediv/src/dlls/graphics/graphics.h
index f4e555b..5c84211 100644
--- a/ediv/src/dlls/graphics/graphics.h
+++ b/ediv/src/dlls/graphics/graphics.h
@@ -28,6 +28,7 @@ int eDIV_COLLISION(FUNCTION_PARAMS);
 int eDIV_SET_TRANSPARENT_COLOR(FUNCTION_PARAMS);
 int eDIV_GET_TRANSPARENT_COLOR(FUNCTION_PARAMS);
 int eDIV_RGB(FUNCTION_PARAMS);
+int eDIV_GET_RGB(FUNCTION_PARAMS);
 int eDIV_ADVANCE(FUNCTION_PARAMS);
 int eDIV_XADVANCE(FUNCTION_PARAMS) ;
 int eDIV_MAP_BLOCK_COPY(FUNCION_PARMAS) ;
diff --git a/ediv/src/dlls/graphics/main.c b/ediv/src/dlls/graphics/main.c
index 8bac2f2..26d45e7 100644
--- a/ediv/src/dlls/graphics/main.c
+++ b/ediv/src/dlls/graphics/main.c
@@ -173,6 +173,7 @@ int ExportaFuncs(EXPORTAFUNCS_PARAMS)
 	FUNCTION("graphic_info",3,eDIV_GRAPHIC_INFO) ;
 	FUNCTION("fade",4,eDIV_FADE) ;
 	FUNCTION("xput",6,eDIV_XPUT);
+	FUNCTION("get_rgb",4,eDIV_GET_RGB);
 //	FUNCTION("setmode",4,eDIV_SETMODE);
 
 	ENTRYPOINT( frame ) ;
@@ -388,6 +389,32 @@ int eDIV_RGB(FUNCTION_PARAMS)
 	return ( b + g*256 + r*65536 ) ;
 }
 
+/*****************************************************************/
+/*                                                               */
+/* eDIV_GET_RGB(color, offset r, offset g, offset b);            */
+/*                                                               */
+/* Obtiene las componentes RGB de un color dado.                 */
+/*                                                               */
+/* r=Rojo (Red) g=Verde (Green) b=Blue (Azul)                    */
+/*                                                               */
+/* Retorna: 1                                                    */
+/*                                                               */
+/*****************************************************************/
+int eDIV_GET_RGB(FUNCTION_PARAMS)
+{
+	unsigned int color,roff,goff,boff;
+	unsigned char r,g,b;
+	boff=getparm();
+	goff=getparm();
+	roff=getparm();
+	color=getparm();
+	SDL_GetRGB(color,fp->screen->format,&r,&g,&b);
+	if(roff) fp->mem[roff]=(int)r;
+	if(goff) fp->mem[goff]=(int)g;
+	if(boff) fp->mem[boff]=(int)b;
+	return 1;
+}
+
 /*****************************************************************/
 /*                                                               */
 /* eDIV_ADVANCE(a);                                              */