diff options
| author | Max Horn | 2010-11-17 12:22:08 +0000 |
|---|---|---|
| committer | Max Horn | 2010-11-17 12:22:08 +0000 |
| commit | ee4770ffb6be50008d129ba52a5dd6f46a7d16cd (patch) | |
| tree | 45be60c3403525d32f633745800c77e6afed9ca1 /engines/kyra | |
| parent | dbddd758d1494f52c96b959b3d03f8e0156fb7cf (diff) | |
| download | scummvm-rg350-ee4770ffb6be50008d129ba52a5dd6f46a7d16cd.tar.gz scummvm-rg350-ee4770ffb6be50008d129ba52a5dd6f46a7d16cd.tar.bz2 scummvm-rg350-ee4770ffb6be50008d129ba52a5dd6f46a7d16cd.zip | |
ENGINES: Change 'colour' to 'color'
Only changed this in engines where 'color' was/is already used
almost exclusively
svn-id: r54288
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/items_lol.cpp | 4 | ||||
| -rw-r--r-- | engines/kyra/lol.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/items_lol.cpp b/engines/kyra/items_lol.cpp index e99f3bf701..d4567ad737 100644 --- a/engines/kyra/items_lol.cpp +++ b/engines/kyra/items_lol.cpp @@ -521,10 +521,10 @@ int LoLEngine::checkDrawObjectSpace(int itemX, int itemY, int partyX, int partyY return a + b; } -int LoLEngine::checkSceneForItems(uint16 *blockDrawObjects, int colour) { +int LoLEngine::checkSceneForItems(uint16 *blockDrawObjects, int color) { while (*blockDrawObjects) { if (!(*blockDrawObjects & 0x8000)) { - if (!--colour) + if (!--color) return *blockDrawObjects; } diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h index f2c93f83fc..d24f3b427f 100644 --- a/engines/kyra/lol.h +++ b/engines/kyra/lol.h @@ -1223,7 +1223,7 @@ private: void assignItemToBlock(uint16 *assignedBlockObjects, int id); int checkDrawObjectSpace(int itemX, int itemY, int partyX, int partyY); - int checkSceneForItems(uint16 *blockDrawObjects, int colour); + int checkSceneForItems(uint16 *blockDrawObjects, int color); uint8 _moneyColumnHeight[5]; uint16 _credits; |