[Cine-cvs] cruisE/src mainDraw.c,1.31,1.32

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/cine/cruisE/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30337/src

Modified Files:
	mainDraw.c 
Log Message:
some readability improvments;
renamed var6 to spriteHeight

Index: mainDraw.c
===================================================================
RCS file: /cvsroot/cine/cruisE/src/mainDraw.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** mainDraw.c	20 Oct 2005 22:31:03 -0000	1.31
--- mainDraw.c	29 Oct 2005 17:21:03 -0000	1.32
***************
*** 466,470 ****
  	index = *(si++);
  
! 	polySize1 = polySize2 = pBufferDest[0] = pBufferDest[cx*2] = polyBuffer2[index*2];
  	polySize1 = polySize2 = pBufferDest[1] = pBufferDest[cx*2+1] = polyBuffer2[(index*2)+1];
  
--- 466,470 ----
  	index = *(si++);
  
! 	polySize1 = polySize2 = pBufferDest[0] = pBufferDest[cx*2]   = polyBuffer2[index*2];
  	polySize1 = polySize2 = pBufferDest[1] = pBufferDest[cx*2+1] = polyBuffer2[(index*2)+1];
  
***************
*** 731,740 ****
  void mainDrawSub1(int fileIndex, objectStruct* pObject, int X, int param1, int Y, char* destBuffer, char* dataPtr)
  {
! 	int var_12;
! 	int var_14;
! 	int var_16;
  	char* var_1A;
  	char* ptr2;
! 	int var_8;
  
  	int sizeTable[4];
--- 731,740 ----
  void mainDrawSub1(int fileIndex, objectStruct* pObject, int X, int param1, int Y, char* destBuffer, char* dataPtr)
  {
! 	int   var_12;
! 	int   var_14;
! 	int   var_16;
  	char* var_1A;
  	char* ptr2;
! 	int   var_8;
  
  	int sizeTable[4];
***************
*** 832,836 ****
      {
        output = initialOuput + 320*i;
!       for(j=0;j<width;j++)
        {
          u8 color = *(ptr++);
--- 832,836 ----
      {
        output = initialOuput + 320*i;
!       for(j = 0; j < width; j++)
        {
          u8 color = *(ptr++);
***************
*** 859,876 ****
  void mainDrawSub4(int objX1, int var_6, objectStruct* currentObjPtr, char* data1, int objY2, int objX2, char* output, char* data2)
  {
- 
    int x = 0;
    int y = 0;
  
!   for(y=0;y<var_6;y++)
    {
!     for(x=0;x<objX1*8;x++)
      {
        u8 color = (data1[0]);
        data1++;
  
!       if((x+objX2)>=0&&(x+objX2)<320 && (y+objY2)>=0&&(y+objY2)<200)
!         if(color!=currentTransparent)
!           output[320*(y+objY2)+x+objX2] = color;
      }
    }
--- 859,879 ----
  void mainDrawSub4(int objX1, int var_6, objectStruct* currentObjPtr, char* data1, int objY2, int objX2, char* output, char* data2)
  {
    int x = 0;
    int y = 0;
  
!   for(y = 0; y < var_6; y++)
    {
!     for(x = 0; x < objX1*8; x++)
      {
        u8 color = (data1[0]);
        data1++;
  
!       if((x + objX2) >= 0 && (x + objX2) < 320 && (y + objY2) >= 0 && (y + objY2) < 200)
! 	  {
!         if(color != currentTransparent)
! 		{
!           output[320 * (y + objY2) + x + objX2] = color;
! 		}
! 	  }
      }
    }
***************
*** 978,982 ****
      var_6 = (80 * (bx-1)) + x;
  
!     if(var_6<=320)
      {
        mainSprite(var_6, y - height, pMenu->gfx, gfxModuleData.pPage10, video4, 320);
--- 981,985 ----
      var_6 = (80 * (bx-1)) + x;
  
!     if(var_6 <= 320)
      {
        mainSprite(var_6, y - height, pMenu->gfx, gfxModuleData.pPage10, video4, 320);
***************
*** 1000,1004 ****
          si->y = currentY;
          si->varA = 320;
!         if(si->varC)
          {
            color = video3;
--- 1003,1008 ----
          si->y = currentY;
          si->varA = 320;
!         
! 		if(si->varC)
          {
            color = video3;
***************
*** 1032,1036 ****
  
          si = si->next;
!       }while(si);
      }
    }
--- 1036,1040 ----
  
          si = si->next;
!       } while(si);
      }
    }
***************
*** 1068,1080 ****
    u8* bgPtr;
    objectStruct* currentObjPtr;
! 	s16 currentObjIdx;
! 	s16 objX1=0;
! 	s16 objY1=0;
! 	s16 objZ1=0;
! 
! 	s16 objX2;
! 	s16 objY2;
! 
!   s16 var_6;
  
  
--- 1072,1082 ----
    u8* bgPtr;
    objectStruct* currentObjPtr;
!   s16 currentObjIdx;
!   s16 objX1 = 0;
!   s16 objY1 = 0;
!   s16 objZ1 = 0;
!   s16 objX2;
!   s16 objY2;
!   s16 spriteHeight;
  
  
***************
*** 1113,1177 ****
  			}
  			else
! 			{
! 				objectParamsQuery params;
  
  				getMultipleObjectParam(currentObjPtr->followObjectOverlayIdx, currentObjPtr->followObjectIdx, &params);
  
!         objX1 = params.X;
  				objY1 = params.Y;
!         objZ1 = params.fileIdx;
  			}
  
  			getMultipleObjectParam(currentObjPtr->overlay, currentObjIdx, &params);
  
!       objX2 = objX1 + params.X;
  			objY2 = objY1 + params.Y;
  
!       fileIdx = params.fileIdx;
  
! 			if(fileIdx>=0)
  			{
  				fileIdx += objZ1;
  			}
  
!       if((params.var5 >= 0) && (fileIdx >= 0) && filesDatabase[fileIdx].subData.ptr)
  			{
  				if(filesDatabase[fileIdx].subData.resourceType == 8)
  				{
!           mainDrawSub1(fileIdx, currentObjPtr, objX2, params.scale, objY2, gfxModuleData.pPage10, filesDatabase[fileIdx].subData.ptr); // poly
  				}
  				else if(filesDatabase[fileIdx].subData.resourceType == 6)
!         {
!         }
!         else if(filesDatabase[fileIdx].resType == 1)
!         {
!         }
!         else if(filesDatabase[fileIdx].subData.resourceType == 4)
!         {
!           objX1 = filesDatabase[fileIdx].width; // width
!           var_6 = filesDatabase[fileIdx].height; // height
  
!           if(filesDatabase[fileIdx].subData.ptr)
!           {
!             currentTransparent = filesDatabase[fileIdx].subData.transparency;
!             mainDrawSub4(objX1, var_6, currentObjPtr, filesDatabase[fileIdx].subData.ptr, objY2, objX2, gfxModuleData.pPage10, filesDatabase[fileIdx].subData.ptr);
!           }
!         }
!       }
  
  			if((currentObjPtr->field_26 !=0) && (param == 0))
  			{
!         if(currentObjPtr->currentAnimDelay<=0) 
!         {
!           int newVal;
!           objX1 = 1;
  
!           newVal = getValueFromObjectQuerry(&params,currentObjPtr->field_28) + currentObjPtr->field_26;
  
!           if(currentObjPtr->field_26>0)
            {
!             if(currentObjPtr->field_22<newVal)
              {
!               if(currentObjPtr->field_30>=0)
                {
                  s16 data2;
--- 1115,1180 ----
  			}
  			else
! 			{	
! 				// Declaring this twice ?
! 				// objectParamsQuery params;
  
  				getMultipleObjectParam(currentObjPtr->followObjectOverlayIdx, currentObjPtr->followObjectIdx, &params);
  
! 				objX1 = params.X;
  				objY1 = params.Y;
! 				objZ1 = params.fileIdx;
  			}
  
  			getMultipleObjectParam(currentObjPtr->overlay, currentObjIdx, &params);
  
! 			objX2 = objX1 + params.X;
  			objY2 = objY1 + params.Y;
  
! 			fileIdx = params.fileIdx;
  
! 			if(fileIdx >= 0)
  			{
  				fileIdx += objZ1;
  			}
  
! 			if((params.var5 >= 0) && (fileIdx >= 0) && filesDatabase[fileIdx].subData.ptr)
  			{
  				if(filesDatabase[fileIdx].subData.resourceType == 8)
  				{
! 					mainDrawSub1(fileIdx, currentObjPtr, objX2, params.scale, objY2, gfxModuleData.pPage10, filesDatabase[fileIdx].subData.ptr); // poly
  				}
  				else if(filesDatabase[fileIdx].subData.resourceType == 6)
! 				{
! 				}
! 				else if(filesDatabase[fileIdx].resType == 1)
! 				{
! 				}
! 				else if(filesDatabase[fileIdx].subData.resourceType == 4)
! 				{
! 					objX1        = filesDatabase[fileIdx].width;	// width
! 					spriteHeight = filesDatabase[fileIdx].height;	// height
  
! 					if(filesDatabase[fileIdx].subData.ptr)
! 					{
! 						currentTransparent = filesDatabase[fileIdx].subData.transparency;
! 						mainDrawSub4(objX1, spriteHeight, currentObjPtr, filesDatabase[fileIdx].subData.ptr, objY2, objX2, gfxModuleData.pPage10, filesDatabase[fileIdx].subData.ptr);
! 					}
! 				}
! 			}
  
  			if((currentObjPtr->field_26 !=0) && (param == 0))
  			{
! 				if(currentObjPtr->currentAnimDelay<=0) 
! 				{
! 					int newVal;
! 					objX1 = 1;
  
! 					newVal = getValueFromObjectQuerry(&params,currentObjPtr->field_28) + currentObjPtr->field_26;
  
!           if(currentObjPtr->field_26 > 0)
            {
!             if(currentObjPtr->field_22 < newVal)
              {
!               if(currentObjPtr->field_30 >= 0)
                {
                  s16 data2;