diff options
author | Joost Peters | 2004-08-01 22:52:45 +0000 |
---|---|---|
committer | Joost Peters | 2004-08-01 22:52:45 +0000 |
commit | 936142bf40a75e61e629fa5370f5b83be97d62ca (patch) | |
tree | bab250ebc447716c4fae389e63b8949cfca48164 /saga | |
parent | 4aaea2131e510e635a6ff34bece7057e908cf3f0 (diff) | |
download | scummvm-rg350-936142bf40a75e61e629fa5370f5b83be97d62ca.tar.gz scummvm-rg350-936142bf40a75e61e629fa5370f5b83be97d62ca.tar.bz2 scummvm-rg350-936142bf40a75e61e629fa5370f5b83be97d62ca.zip |
rename load() to loadMap()
svn-id: r14426
Diffstat (limited to 'saga')
-rw-r--r-- | saga/actionmap.cpp | 2 | ||||
-rw-r--r-- | saga/actionmap.h | 2 | ||||
-rw-r--r-- | saga/scene.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/saga/actionmap.cpp b/saga/actionmap.cpp index e2636459d7..9aa2759f92 100644 --- a/saga/actionmap.cpp +++ b/saga/actionmap.cpp @@ -55,7 +55,7 @@ ActionMap::~ActionMap(void) { } -int ActionMap::load(const byte * exmap_res, size_t exmap_res_len) { +int ActionMap::loadMap(const byte * exmap_res, size_t exmap_res_len) { // Loads exit map data from specified exit map resource R_ACTIONMAP_ENTRY *exmap_entry; R_POINT *exmap_pt_tbl; diff --git a/saga/actionmap.h b/saga/actionmap.h index ebb2dbec8d..b15272e598 100644 --- a/saga/actionmap.h +++ b/saga/actionmap.h @@ -44,7 +44,7 @@ class ActionMap { ActionMap(SagaEngine *vm); ~ActionMap(void); - int load(const byte *exmap_res, size_t exmap_res_len); + int loadMap(const byte *exmap_res, size_t exmap_res_len); int draw(R_SURFACE *ds, int color); int freeMap(void); diff --git a/saga/scene.cpp b/saga/scene.cpp index f36d5cf5a8..97150f5699 100644 --- a/saga/scene.cpp +++ b/saga/scene.cpp @@ -623,7 +623,7 @@ int ProcessSceneResources() { break; case SAGA_ACTION_MAP: debug(0, "Loading exit map resource..."); - if (_vm->_actionMap->load(res_data, res_data_len) != R_SUCCESS) { + if (_vm->_actionMap->loadMap(res_data, res_data_len) != R_SUCCESS) { warning("ProcessSceneResources: Error loading exit map resource"); return R_FAILURE; } |