[Scummvm-cvs-logs] CVS: scummvm/backends/dc dc.h,1.42,1.43 dcloader.cpp,1.5,1.6 dcmain.cpp,1.33,1.34 display.cpp,1.37,1.38 icon.cpp,1.7,1.8 input.cpp,1.23,1.24 label.cpp,1.5,1.6 selector.cpp,1.28,1.29 softkbd.cpp,1.3,1.4 softkbd.h,1.3,1.4 vmsave.cpp,1.30,1.31

Eugene Sandulenko sev at users.sourceforge.net
Sat Jul 30 14:14:58 CEST 2005


Update of /cvsroot/scummvm/scummvm/backends/dc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9428/backends/dc

Modified Files:
	dc.h dcloader.cpp dcmain.cpp display.cpp icon.cpp input.cpp 
	label.cpp selector.cpp softkbd.cpp softkbd.h vmsave.cpp 
Log Message:
Remove trailing whitespaces.


Index: dc.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/dc.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- dc.h	27 Jun 2005 15:16:58 -0000	1.42
+++ dc.h	30 Jul 2005 21:10:50 -0000	1.43
@@ -87,28 +87,28 @@
 
   // Set the bitmap that's used when drawing the cursor.
   void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor, int cursorTargetScale);
-  
+
   // Shaking is used in SCUMM. Set current shake position.
   void setShakePos(int shake_pos);
 
   // Get the number of milliseconds since the program was started.
   uint32 getMillis();
-  
+
   // Delay for a specified amount of milliseconds
   void delayMillis(uint msecs);
-  
+
   // Get the next event.
-  // Returns true if an event was retrieved.	
+  // Returns true if an event was retrieved.
   bool pollEvent(Event &event);
-  
-  // Set function that generates samples 
+
+  // Set function that generates samples
   bool setSoundCallback(SoundProc proc, void *param);
   void clearSoundCallback();
 
   // Determine the output sample rate. Audio data provided by the sound
   // callback will be played using this rate.
   int getOutputSampleRate() const;
-		
+
   // Initialise the specified CD drive for audio playback.
   bool openCD(int drive);
 
@@ -118,7 +118,7 @@
 
   // Play cdrom audio track
   void playCD(int track, int num_loops, int start_frame, int duration);
-  
+
   // Stop cdrom audio track
   void stopCD();
 

Index: dcloader.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/dcloader.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- dcloader.cpp	24 Jun 2005 16:18:10 -0000	1.5
+++ dcloader.cpp	30 Jul 2005 21:10:50 -0000	1.6
@@ -181,7 +181,7 @@
   }
 
   free(rela);
-  return true;  
+  return true;
 }
 
 
@@ -233,7 +233,7 @@
      read(fd, segment, phdr.p_filesz) != phdr.p_filesz) {
     seterror("Segment load failed.");
     return false;
-  }  
+  }
 
   DBG("shoff = %d, shentsz = %d, shnum = %d\n",
       ehdr.e_shoff, ehdr.e_shentsize, ehdr.e_shnum);
@@ -309,7 +309,7 @@
 	free(shdr);
 	return false;
       }
-  
+
   free(shdr);
 
   return true;
@@ -351,7 +351,7 @@
     seterror("Missing ctors/dtors.");
     dtors_start = dtors_end = NULL;
     unload();
-    return false;    
+    return false;
   }
 
   DBG("Calling constructors.\n");
@@ -390,7 +390,7 @@
     }
 
   seterror("Symbol \"%s\" not found.", name);
-  return NULL;  
+  return NULL;
 }
 
 

Index: dcmain.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/dcmain.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- dcmain.cpp	26 Jun 2005 20:59:56 -0000	1.33
+++ dcmain.cpp	30 Jul 2005 21:10:50 -0000	1.34
@@ -136,7 +136,7 @@
 void OSystem_Dreamcast::lockMutex(MutexRef mutex)
 {
 }
- 
+
 void OSystem_Dreamcast::unlockMutex(MutexRef mutex)
 {
 }
@@ -226,7 +226,7 @@
   // Set the game path.
   if(dir != NULL)
     ConfMan.set("path", dir, Common::ConfigManager::kTransientDomain);
-  
+
   // Set the target.
   _detector.setTarget(base);
 

Index: display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/display.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- display.cpp	27 Jun 2005 15:16:58 -0000	1.37
+++ display.cpp	30 Jul 2005 21:10:50 -0000	1.38
@@ -106,7 +106,7 @@
     d[4] = *s++;
     d[5] = *s++;
     d[6] = *s++;
-    d[7] = *s++;      
+    d[7] = *s++;
     asm("pref @%0" : : "r" (d));
     d += 8;
   }
@@ -224,7 +224,7 @@
 }
 
 bool OSystem_Dreamcast::showMouse(bool visible)
-{	
+{
   bool last = _ms_visible;
   _ms_visible = visible;
 
@@ -243,12 +243,12 @@
 {
   _ms_cur_w = w;
   _ms_cur_h = h;
-  
+
   _ms_hotspot_x = hotspot_x;
   _ms_hotspot_y = hotspot_y;
 
   _ms_keycolor = keycolor;
-  
+
   if (_ms_buf)
     free(_ms_buf);
 
@@ -276,7 +276,7 @@
 
     // while((*((volatile unsigned int *)(void*)0xa05f810c) & 0x3ff) != 200);
     // *((volatile unsigned int *)(void*)0xa05f8040) = 0xff0000;
-  
+
     for( int y = 0; y<_screen_h; y++ )
     {
       texture_memcpy64_pal( dst, src, _screen_w>>5, palette );
@@ -318,11 +318,11 @@
     TA_TEXTUREMODE_STRIDE|TA_TEXTUREMODE_ADDRESS(screen_tx[_screen_buffer]);
 
   mypoly.red = mypoly.green = mypoly.blue = mypoly.alpha = 0;
-  
+
   ta_begin_frame();
   // *((volatile unsigned int *)(void*)0xa05f8040) = 0x0000ff;
   ta_commit_list(&mypoly);
-  
+
   myvertex.cmd = TA_CMD_VERTEX;
   myvertex.ocolour = 0;
   myvertex.colour = 0;
@@ -357,7 +357,7 @@
   } else {
     if(_overlay_fade > 0)
       _overlay_fade -= 0.125;
-  }   
+  }
 
   if(_overlay_fade > 0.0) {
 
@@ -372,11 +372,11 @@
       TA_POLYMODE2_U_SIZE_512|TA_POLYMODE2_V_SIZE_512;
     mypoly.texture = TA_TEXTUREMODE_ARGB4444|TA_TEXTUREMODE_NON_TWIDDLED|
       TA_TEXTUREMODE_ADDRESS(ovl_tx[_overlay_buffer]);
-    
+
     mypoly.red = mypoly.green = mypoly.blue = mypoly.alpha = 0.0;
 
     ta_commit_list(&mypoly);
-    
+
     myvertex.cmd = TA_CMD_VERTEX;
     myvertex.ocolour = 0;
     myvertex.colour = 0xffffff|(((int)(255*_overlay_fade))<<24);
@@ -398,7 +398,7 @@
     myvertex.u = 0.0;
     myvertex.v = OVL_H*(1.0/512.0);
     ta_commit_list(&myvertex);
-    
+
     myvertex.x += OVL_W*_xscale;
     myvertex.u = OVL_W*(1.0/512.0);
     myvertex.cmd |= TA_CMD_VERTEX_EOS;
@@ -453,7 +453,7 @@
     commit_dummy_transpoly();
     return;
   }
-  
+
   mypoly.cmd =
     TA_CMD_POLYGON|TA_CMD_POLYGON_TYPE_TRANSPARENT|TA_CMD_POLYGON_SUBLIST|
     TA_CMD_POLYGON_STRIPLENGTH_2|TA_CMD_POLYGON_PACKED_COLOUR|TA_CMD_POLYGON_TEXTURED;
@@ -466,9 +466,9 @@
     TA_TEXTUREMODE_ADDRESS(mouse_tx[_mouse_buffer]);
 
   mypoly.red = mypoly.green = mypoly.blue = mypoly.alpha = 0;
-  
+
   ta_commit_list(&mypoly);
-  
+
   myvertex.cmd = TA_CMD_VERTEX;
   myvertex.ocolour = 0;
   myvertex.colour = 0xffff00;
@@ -489,7 +489,7 @@
   myvertex.u = 0.0;
   myvertex.v = h*(1.0/MOUSE_H);
   ta_commit_list(&myvertex);
-    
+
   myvertex.x += w*_xscale;
   myvertex.u = w*(1.0/MOUSE_W);
   myvertex.cmd |= TA_CMD_VERTEX_EOS;

Index: icon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/icon.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- icon.cpp	26 Jun 2005 20:59:56 -0000	1.7
+++ icon.cpp	30 Jul 2005 21:10:50 -0000	1.8
@@ -32,7 +32,7 @@
 
   for(int n = 0; n<16; n++) {
     int p = palette[n];
-    pal[n] = 
+    pal[n] =
       ((p>>16)&0xf000)|
       ((p>>12)&0x0f00)|
       ((p>> 8)&0x00f0)|
@@ -114,7 +114,7 @@
   myvertex.x = x2;
   myvertex.v = 0.0;
   myvertex.cmd |= TA_CMD_VERTEX_EOS;
-  ta_commit_list(&myvertex);  
+  ta_commit_list(&myvertex);
 }
 
 int Icon::find_unused_pixel()

Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/input.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- input.cpp	26 Jun 2005 20:59:56 -0000	1.23
+++ input.cpp	30 Jul 2005 21:10:50 -0000	1.24
@@ -66,7 +66,7 @@
       if(!(buttons & 2)) rmb++;
 
       if(!(buttons & 8)) newkey = 319;
-      
+
       mouse_x += pad->cond.mouse.axis1;
       mouse_y += pad->cond.mouse.axis2;
       mouse_wheel += pad->cond.mouse.axis3;

Index: label.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/label.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- label.cpp	26 Jun 2005 20:59:56 -0000	1.5
+++ label.cpp	30 Jul 2005 21:10:50 -0000	1.6
@@ -132,6 +132,6 @@
   myvertex.x = x+u*scale;
   myvertex.u = 1.0;
   myvertex.cmd |= TA_CMD_VERTEX_EOS;
-  ta_commit_list(&myvertex);  
+  ta_commit_list(&myvertex);
 }
 

Index: selector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/selector.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- selector.cpp	26 Jun 2005 20:59:56 -0000	1.28
+++ selector.cpp	30 Jul 2005 21:10:50 -0000	1.29
@@ -79,7 +79,7 @@
   myvertex.colour = c3;
   myvertex.x = x2;
   myvertex.cmd |= TA_CMD_VERTEX_EOS;
-  ta_commit_list(&myvertex);  
+  ta_commit_list(&myvertex);
 }
 
 void draw_trans_quad(float x1, float y1, float x2, float y2,
@@ -125,7 +125,7 @@
   myvertex.colour = c3;
   myvertex.x = x2;
   myvertex.cmd |= TA_CMD_VERTEX_EOS;
-  ta_commit_list(&myvertex);  
+  ta_commit_list(&myvertex);
 }
 
 
@@ -198,7 +198,7 @@
   for(int i=0; i<num_dirs; i++)
     if(!strcmp(dirs[i].name, game.dir) &&
        dirs[i].deficon[0]) {
-      sprintf(icofn, "%s%s", game.dir, dirs[i].deficon);      
+      sprintf(icofn, "%s%s", game.dir, dirs[i].deficon);
       if(game.icon.load(icofn))
 	return true;
       break;
@@ -240,7 +240,7 @@
 	    dirs[num_dirs].node = *entry;
 	    num_dirs++;
 	  }
-	} else 
+	} else
 	  if(isIcon(*entry))
 	    strcpy(dirs[curr_dir-1].deficon, entry->displayName().c_str());
 	  else if(curr_game < max &&
@@ -303,7 +303,7 @@
       ta_txrelease(mark);
       return;
     }
-    
+
     ta_begin_frame();
 
     drawBackground();
@@ -347,11 +347,11 @@
       return -1;
 
     ta_begin_frame();
-    
+
     drawBackground();
-    
+
     ta_commit_end();
-    
+
     float y = 40.0;
     for(int i=top_game, cnt=0; cnt<10 && i<num_games; i++, cnt++) {
       int pal = 48+(i&15);
@@ -375,7 +375,7 @@
     setimask(15);
     event = handleInput(locked_get_pads(), mousex, mousey, shiftFlags);
     setimask(mask);
-    
+
     if(event==-OSystem::EVENT_LBUTTONDOWN || event==13 || event==319) {
       int selected_game = top_game + selector_pos;
 
@@ -384,15 +384,15 @@
 	unsigned int fade_colour = 0x00ffffff | ((255-fade)<<24);
 
 	ta_begin_frame();
-    
+
 	drawBackground();
-    
+
 	ta_commit_end();
-    
+
 	float y = 40.0;
 
 	if(fade < 256)
-	  for(int i=top_game, cnt=0; cnt<10 && i<num_games; 
+	  for(int i=top_game, cnt=0; cnt<10 && i<num_games;
 	      i++, cnt++, y += 40.0)
 	    if(cnt != selector_pos)
 	      drawGameLabel(games[i], 48+(i&15), 50.0, y, 0xffffff, fade);

Index: softkbd.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/softkbd.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- softkbd.cpp	26 Jun 2005 20:59:56 -0000	1.3
+++ softkbd.cpp	30 Jul 2005 21:10:50 -0000	1.4
@@ -84,7 +84,7 @@
   unsigned int bg_alpha_mask = (128-transp)<<24;
 
   draw_trans_quad(x, y, x+312.0, y+172.0,
-		  bg_alpha_mask|0x8080ff, bg_alpha_mask|0x8080ff, 
+		  bg_alpha_mask|0x8080ff, bg_alpha_mask|0x8080ff,
 		  bg_alpha_mask|0x8080ff, bg_alpha_mask|0x8080ff);
   x0 = x += 4.0;
   y += 4.0;

Index: softkbd.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/softkbd.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- softkbd.h	26 Jun 2005 20:59:56 -0000	1.3
+++ softkbd.h	30 Jul 2005 21:10:50 -0000	1.4
@@ -32,7 +32,7 @@
 class SoftKeyboard : public Interactive
 {
  private:
- 
+
   const OSystem_Dreamcast *os;
   Label labels[2][SK_NUM_KEYS];
   byte shiftState;

Index: vmsave.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/vmsave.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- vmsave.cpp	27 Jun 2005 15:16:05 -0000	1.30
+++ vmsave.cpp	30 Jul 2005 21:10:50 -0000	1.31
@@ -40,7 +40,7 @@
   VMSAVE_OK,
   VMSAVE_NOVM,
   VMSAVE_NOSPACE,
-  VMSAVE_WRITEERROR,  
+  VMSAVE_WRITEERROR,
 };
 
 
@@ -143,7 +143,7 @@
     return false;
   if(!vmsfs_open_file(&super, filename, &file))
     return false;
-  
+
   buffer = new char[size = file.size];
 
   if(vmsfs_read_file(&file, (unsigned char *)buffer, size))
@@ -225,7 +225,7 @@
   void skip(uint32 offset);
 
 public:
-  InVMSave() 
+  InVMSave()
     : pos(0), buffer(NULL)
   { }
 
@@ -264,19 +264,19 @@
   uint32 write(const void *buf, uint32 cnt);
 
 public:
-  OutVMSave(const char *_filename) 
+  OutVMSave(const char *_filename)
     : pos(0)
   {
     strncpy(filename, _filename, 16);
     buffer = new char[size = MAX_SAVE_SIZE];
   }
-  
+
   ~OutVMSave();
 };
 
 class VMSaveManager : public Common::SaveFileManager {
 public:
-  
+
   virtual Common::OutSaveFile *openForSaving(const char *filename) {
 	return new OutVMSave(filename);
   }
@@ -291,7 +291,7 @@
 	  return NULL;
 	}
   }
-  
+
   virtual void listSavefiles(const char *prefix, bool *marks, int num);
 };
 
@@ -353,7 +353,7 @@
 void VMSaveManager::listSavefiles(const char *prefix, bool *marks, int num)
 {
   memset(marks, false, num*sizeof(bool));
-  
+
   for(int i=0; i<24; i++)
     tryList(prefix, marks, num, i);
 }





More information about the Scummvm-git-logs mailing list