[Scummvm-cvs-logs] CVS: scummvm/backends/dc dc.h,1.19,1.20 dcmain.cpp,1.20,1.21 display.cpp,1.16,1.17 icon.cpp,1.5,1.6 icon.h,1.4,1.5 selector.cpp,1.20,1.21
Max Horn
fingolfin at users.sourceforge.net
Sat Feb 28 05:16:12 CET 2004
Update of /cvsroot/scummvm/scummvm/backends/dc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32588/backends/dc
Modified Files:
dc.h dcmain.cpp display.cpp icon.cpp icon.h selector.cpp
Log Message:
renamed more OSystem methods to follow our naming scheme; renamed NewGuiColor to OverlayColor; fixed some calls to error() in the SDL backend
Index: dc.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/dc.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- dc.h 24 Feb 2004 22:39:36 -0000 1.19
+++ dc.h 28 Feb 2004 12:57:50 -0000 1.20
@@ -31,7 +31,7 @@
OSystem_Dreamcast();
// Set colors of the palette
- void set_palette(const byte *colors, uint start, uint num);
+ void setPalette(const byte *colors, uint start, uint num);
// Set the size of the video bitmap.
// Typically, 320x200
@@ -45,7 +45,7 @@
void move_screen(int dx, int dy, int height);
// Update the dirty areas of the screen
- void update_screen();
+ void updateScreen();
// Either show or hide the mouse cursor
bool show_mouse(bool visible);
@@ -104,10 +104,10 @@
virtual void set_timer(TimerProc callback, int timer);
// Mutex handling
- virtual MutexRef create_mutex();
- virtual void lock_mutex(MutexRef mutex);
- virtual void unlock_mutex(MutexRef mutex);
- virtual void delete_mutex(MutexRef mutex);
+ virtual MutexRef createMutex();
+ virtual void lockMutex(MutexRef mutex);
+ virtual void unlockMutex(MutexRef mutex);
+ virtual void deleteMutex(MutexRef mutex);
// Savefile handling
virtual SaveFileManager *get_savefile_manager();
Index: dcmain.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/dcmain.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- dcmain.cpp 6 Jan 2004 12:45:26 -0000 1.20
+++ dcmain.cpp 28 Feb 2004 12:57:51 -0000 1.21
@@ -130,20 +130,20 @@
}
/* Mutex handling */
-OSystem::MutexRef OSystem_Dreamcast::create_mutex()
+OSystem::MutexRef OSystem_Dreamcast::createMutex()
{
return NULL;
}
-void OSystem_Dreamcast::lock_mutex(MutexRef mutex)
+void OSystem_Dreamcast::lockMutex(MutexRef mutex)
{
}
-void OSystem_Dreamcast::unlock_mutex(MutexRef mutex)
+void OSystem_Dreamcast::unlockMutex(MutexRef mutex)
{
}
-void OSystem_Dreamcast::delete_mutex(MutexRef mutex)
+void OSystem_Dreamcast::deleteMutex(MutexRef mutex)
{
}
Index: display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/display.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- display.cpp 24 Feb 2004 22:39:36 -0000 1.16
+++ display.cpp 28 Feb 2004 12:57:51 -0000 1.17
@@ -128,7 +128,7 @@
}
-void OSystem_Dreamcast::set_palette(const byte *colors, uint start, uint num)
+void OSystem_Dreamcast::setPalette(const byte *colors, uint start, uint num)
{
unsigned short *dst = palette + start;
if(num>0)
@@ -270,7 +270,7 @@
_current_shake_pos = shake_pos;
}
-void OSystem_Dreamcast::update_screen(void)
+void OSystem_Dreamcast::updateScreen(void)
{
struct polygon_list mypoly;
struct packed_colour_vertex_list myvertex;
Index: icon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/icon.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- icon.cpp 6 Jan 2004 12:45:26 -0000 1.5
+++ icon.cpp 28 Feb 2004 12:57:51 -0000 1.6
@@ -61,7 +61,7 @@
texture = tex;
}
-void Icon::set_palette(int pal)
+void Icon::setPalette(int pal)
{
unsigned int (*hwpal)[64][16] = (unsigned int (*)[64][16])0xa05f9000;
for(int n = 0; n<16; n++)
Index: icon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/icon.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- icon.h 6 Jan 2004 12:45:26 -0000 1.4
+++ icon.h 28 Feb 2004 12:57:51 -0000 1.5
@@ -35,7 +35,7 @@
bool load(const void *data, int len, int offs = 0);
bool load(const char *filename);
void create_texture();
- void set_palette(int pal);
+ void setPalette(int pal);
void draw(float x1, float y1, float x2, float y2, int pal,
unsigned argb = 0xffffffff);
void create_vmicon(void *buffer);
Index: selector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/selector.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- selector.cpp 5 Feb 2004 00:19:43 -0000 1.20
+++ selector.cpp 28 Feb 2004 12:57:51 -0000 1.21
@@ -426,7 +426,7 @@
draw_trans_quad(100.0, y, 590.0, y+32.0,
0x7000ff00, 0x7000ff00, 0x7000ff00, 0x7000ff00);
- games[i].icon.set_palette(pal);
+ games[i].icon.setPalette(pal);
drawGameLabel(games[i], pal, 50.0, y, (cnt == selector_pos?
0xffff00 : 0xffffff));
y += 40.0;
More information about the Scummvm-git-logs
mailing list