DREAMWEB: Rename random -> randomSprite

This commit is contained in:
Max Horn 2011-12-04 15:08:17 +01:00 committed by Bertrand Augereau
parent 3f4ec15792
commit 4506d2ac8d
3 changed files with 3 additions and 6 deletions

View File

@ -37,9 +37,6 @@ namespace DreamWeb {
namespace DreamGen {
//fixme: name clash
#undef random
struct Register {
union {
uint16 _value;

View File

@ -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];
}

View File

@ -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);