diff options
| author | Torbjörn Andersson | 2005-01-02 14:52:11 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2005-01-02 14:52:11 +0000 |
| commit | 5f6108052e24fbf4a309ae5c315278b992d76ede (patch) | |
| tree | d25d5d688dfe3f767f9ffb40469153662444278c /saga/scene.cpp | |
| parent | 1bc636aaa676839c6e8fe2d8cc1405f2c3b2393c (diff) | |
| download | scummvm-rg350-5f6108052e24fbf4a309ae5c315278b992d76ede.tar.gz scummvm-rg350-5f6108052e24fbf4a309ae5c315278b992d76ede.tar.bz2 scummvm-rg350-5f6108052e24fbf4a309ae5c315278b992d76ede.zip | |
Changed "sizeof x" to "sizeof(x)" for consistency with the rest of ScummVM,
and used ARRAYSIZE() instead in two cases.
svn-id: r16408
Diffstat (limited to 'saga/scene.cpp')
| -rw-r--r-- | saga/scene.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/saga/scene.cpp b/saga/scene.cpp index db224eff79..68cfb0c24e 100644 --- a/saga/scene.cpp +++ b/saga/scene.cpp @@ -77,7 +77,7 @@ Scene::Scene(SagaEngine *vm) : _vm(vm), _initialized(false) { } _sceneCount = scene_lut_len / 2; _sceneMax = _sceneCount - 1; - _sceneLUT = (int *)malloc(_sceneMax * sizeof *_sceneLUT); + _sceneLUT = (int *)malloc(_sceneMax * sizeof(*_sceneLUT)); if (_sceneLUT == NULL) { warning("Scene::Scene(): Memory allocation failed"); return; @@ -708,7 +708,7 @@ int Scene::loadSceneResourceList(uint32 reslist_rn) { // Allocate memory for scene resource list _resListEntries = resource_list_len / SAGA_RESLIST_ENTRY_LEN; debug(0, "Scene resource list contains %d entries.", _resListEntries); - _resList = (SCENE_RESLIST *)calloc(_resListEntries, sizeof *_resList); + _resList = (SCENE_RESLIST *)calloc(_resListEntries, sizeof(*_resList)); if (_resList == NULL) { warning("Scene::loadSceneResourceList(): Error: Memory allocation failed"); @@ -764,7 +764,7 @@ int Scene::processSceneResources() { } pal_p = _vm->getImagePal(_bg.res_buf, _bg.res_len); - memcpy(_bg.pal, pal_p, sizeof _bg.pal); + memcpy(_bg.pal, pal_p, sizeof(_bg.pal)); _sceneMode = SCENE_MODE_NORMAL; break; case SAGA_BG_MASK: // Scene background mask resource |