aboutsummaryrefslogtreecommitdiff
path: root/engines/drascula
diff options
context:
space:
mode:
authorPaweł Kołodziejski2008-05-11 09:51:30 +0000
committerPaweł Kołodziejski2008-05-11 09:51:30 +0000
commit098d9c81a16b777c998e1828df2444c51ad24d3c (patch)
treed8b80ff4b738b803e3f5376daf00c981cbf56b71 /engines/drascula
parent6d6846fb1a1f84c518e3f856ca276166e6ac3cb7 (diff)
downloadscummvm-rg350-098d9c81a16b777c998e1828df2444c51ad24d3c.tar.gz
scummvm-rg350-098d9c81a16b777c998e1828df2444c51ad24d3c.tar.bz2
scummvm-rg350-098d9c81a16b777c998e1828df2444c51ad24d3c.zip
libera_memoria -> freeMemory
update_events -> updateEvents svn-id: r32004
Diffstat (limited to 'engines/drascula')
-rw-r--r--engines/drascula/drascula.cpp14
-rw-r--r--engines/drascula/drascula.h4
2 files changed, 9 insertions, 9 deletions
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index a81b865c3a..cba0e8ddb6 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -256,7 +256,7 @@ void DrasculaEngine::salir_al_dos(int r) {
Negro();
MusicFadeout();
stopmusic();
- libera_memoria();
+ freeMemory();
free(VGA);
}
@@ -279,7 +279,7 @@ void DrasculaEngine::allocMemory() {
assert(dir_hare_frente);
}
-void DrasculaEngine::libera_memoria() {
+void DrasculaEngine::freeMemory() {
free(dir_zona_pantalla);
free(dir_dibujo1);
free(dir_hare_fondo);
@@ -1244,11 +1244,11 @@ void DrasculaEngine::comprueba_objetos() {
}
void DrasculaEngine::espera_soltar() {
- update_events();
+ updateEvents();
}
void DrasculaEngine::MirarRaton() {
- update_events();
+ updateEvents();
}
void DrasculaEngine::elige_en_barra() {
@@ -1347,12 +1347,12 @@ bool DrasculaEngine::comprueba2() {
}
Common::KeyCode DrasculaEngine::getscan() {
- update_events();
+ updateEvents();
return _keyPressed.keycode;
}
-void DrasculaEngine::update_events() {
+void DrasculaEngine::updateEvents() {
Common::Event event;
Common::EventManager *eventMan = _system->getEventManager();
@@ -4247,7 +4247,7 @@ void DrasculaEngine::MusicFadeout() {
_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, vol);
if (vol == 0)
break;
- update_events();
+ updateEvents();
_system->updateScreen();
_system->delayMillis(50);
}
diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h
index 1a0378fca0..0281753cea 100644
--- a/engines/drascula/drascula.h
+++ b/engines/drascula/drascula.h
@@ -349,12 +349,12 @@ public:
uint32 getFeatures() const;
uint16 getVersion() const;
Common::Platform getPlatform() const;
- void update_events();
+ void updateEvents();
Audio::SoundHandle _soundHandle;
void allocMemory();
- void libera_memoria();
+ void freeMemory();
void salir_al_dos(int r);
void loadPic(const char *);