diff options
| author | Max Horn | 2011-12-04 15:08:17 +0100 |
|---|---|---|
| committer | Bertrand Augereau | 2011-12-04 19:28:13 +0100 |
| commit | 4506d2ac8d12c871cac0b1eb9b82a056e39e1303 (patch) | |
| tree | 09c323e1f9d048ac1dc171292fd4f5eab606ec6a | |
| parent | 3f4ec15792dd49b14295717f495aa0c4e4457d54 (diff) | |
| download | scummvm-rg350-4506d2ac8d12c871cac0b1eb9b82a056e39e1303.tar.gz scummvm-rg350-4506d2ac8d12c871cac0b1eb9b82a056e39e1303.tar.bz2 scummvm-rg350-4506d2ac8d12c871cac0b1eb9b82a056e39e1303.zip | |
DREAMWEB: Rename random -> randomSprite
| -rw-r--r-- | engines/dreamweb/runtime.h | 3 | ||||
| -rw-r--r-- | engines/dreamweb/sprite.cpp | 4 | ||||
| -rw-r--r-- | engines/dreamweb/stubs.h | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/engines/dreamweb/runtime.h b/engines/dreamweb/runtime.h index db74c19055..38599d209d 100644 --- a/engines/dreamweb/runtime.h +++ b/engines/dreamweb/runtime.h @@ -37,9 +37,6 @@ namespace DreamWeb { namespace DreamGen { -//fixme: name clash -#undef random - struct Register { union { uint16 _value; diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp index a2763aeed5..5eddb1ca57 100644 --- a/engines/dreamweb/sprite.cpp +++ b/engines/dreamweb/sprite.cpp @@ -265,7 +265,7 @@ void DreamGenContext::backObject(Sprite *sprite) { if (objData->type == 6) wideDoor(sprite, objData); else if (objData->type == 5) - random(sprite, objData); + randomSprite(sprite, objData); else if (objData->type == 4) lockedDoorway(sprite, objData); else if (objData->type == 3) @@ -288,7 +288,7 @@ void DreamGenContext::constant(Sprite *sprite, SetObject *objData) { sprite->frameNumber = frame; } -void DreamGenContext::random(Sprite *sprite, SetObject *objData) { +void DreamGenContext::randomSprite(Sprite *sprite, SetObject *objData) { uint8 r = engine->randomNumber(); sprite->frameNumber = objData->frames[r&7]; } diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h index e2edd897b6..05b3b3adbe 100644 --- a/engines/dreamweb/stubs.h +++ b/engines/dreamweb/stubs.h @@ -118,7 +118,7 @@ void backObject(); void constant(Sprite *sprite, SetObject *objData); void steady(Sprite *sprite, SetObject *objData); - void random(Sprite *sprite, SetObject *objData); + void randomSprite(Sprite *sprite, SetObject *objData); void doDoor(Sprite *sprite, SetObject *objData, Common::Rect check); void doorway(Sprite *sprite, SetObject *objData); void wideDoor(Sprite *sprite, SetObject *objData); |