aboutsummaryrefslogtreecommitdiff
path: root/backends/dc
diff options
context:
space:
mode:
authorMax Horn2004-02-28 12:58:13 +0000
committerMax Horn2004-02-28 12:58:13 +0000
commitc6752cccf5186fb04c97e2bb4a64c52fc9447073 (patch)
tree91f3f0264b1542a839cc3504b52603a8034547cb /backends/dc
parent56102a1d02925abbe9fc0504751de1a270a34ff3 (diff)
downloadscummvm-rg350-c6752cccf5186fb04c97e2bb4a64c52fc9447073.tar.gz
scummvm-rg350-c6752cccf5186fb04c97e2bb4a64c52fc9447073.tar.bz2
scummvm-rg350-c6752cccf5186fb04c97e2bb4a64c52fc9447073.zip
renamed more OSystem methods to follow our naming scheme; renamed NewGuiColor to OverlayColor; fixed some calls to error() in the SDL backend
svn-id: r13087
Diffstat (limited to 'backends/dc')
-rw-r--r--backends/dc/dc.h12
-rw-r--r--backends/dc/dcmain.cpp8
-rw-r--r--backends/dc/display.cpp4
-rw-r--r--backends/dc/icon.cpp2
-rw-r--r--backends/dc/icon.h2
-rw-r--r--backends/dc/selector.cpp2
6 files changed, 15 insertions, 15 deletions
diff --git a/backends/dc/dc.h b/backends/dc/dc.h
index b39d442856..a72ecc252b 100644
--- a/backends/dc/dc.h
+++ b/backends/dc/dc.h
@@ -31,7 +31,7 @@ class OSystem_Dreamcast : public OSystem {
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 @@ class OSystem_Dreamcast : public OSystem {
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 @@ class OSystem_Dreamcast : public OSystem {
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();
diff --git a/backends/dc/dcmain.cpp b/backends/dc/dcmain.cpp
index 999f8906f7..10970122b3 100644
--- a/backends/dc/dcmain.cpp
+++ b/backends/dc/dcmain.cpp
@@ -130,20 +130,20 @@ void OSystem_Dreamcast::quit() {
}
/* 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)
{
}
diff --git a/backends/dc/display.cpp b/backends/dc/display.cpp
index 13d23d6eb1..840454d51b 100644
--- a/backends/dc/display.cpp
+++ b/backends/dc/display.cpp
@@ -128,7 +128,7 @@ void commit_dummy_transpoly()
}
-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 @@ void OSystem_Dreamcast::set_shake_pos(int shake_pos)
_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;
diff --git a/backends/dc/icon.cpp b/backends/dc/icon.cpp
index 2aca27c601..95176763e6 100644
--- a/backends/dc/icon.cpp
+++ b/backends/dc/icon.cpp
@@ -61,7 +61,7 @@ void Icon::create_texture()
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++)
diff --git a/backends/dc/icon.h b/backends/dc/icon.h
index b5a3b14fbe..dea8d0e7a5 100644
--- a/backends/dc/icon.h
+++ b/backends/dc/icon.h
@@ -35,7 +35,7 @@ class Icon
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);
diff --git a/backends/dc/selector.cpp b/backends/dc/selector.cpp
index 38f7ebf024..05af35d1c8 100644
--- a/backends/dc/selector.cpp
+++ b/backends/dc/selector.cpp
@@ -426,7 +426,7 @@ int gameMenu(Game *games, int num_games)
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;