X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGraphic%2FSprite.cpp;h=3f582f95f9b2e724b72a96b8d5eeea75293c7d62;hb=3f8ee86c6085b5d6c7ee31b916d0e022239750ab;hp=8cd5c7fdead2763feaf923fced6a5ab11c2df507;hpb=ed3662c0852c4312a612b4fc35bd03aba8d13db7;p=lugaru.git diff --git a/Source/Graphic/Sprite.cpp b/Source/Graphic/Sprite.cpp index 8cd5c7f..3f582f9 100644 --- a/Source/Graphic/Sprite.cpp +++ b/Source/Graphic/Sprite.cpp @@ -32,7 +32,6 @@ extern Light light; extern float multiplier; extern float gravity; extern Terrain terrain; -extern Objects objects; extern int detail; extern XYZ viewerfacing; extern int bloodtoggle; @@ -358,9 +357,9 @@ void Sprite::Draw() start = sprites[i]->oldposition; end = sprites[i]->position; if (!spritehit) - if (objects.model[k].LineCheck(&start, &end, &colpoint, &objects.position[k], &objects.yaw[k]) != -1) { + if (Object::objects[k]->model.LineCheck(&start, &end, &colpoint, &Object::objects[k]->position, &Object::objects[k]->yaw) != -1) { if (detail == 2 || (detail == 1 && abs(Random() % 4) == 0) || (detail == 0 && abs(Random() % 8) == 0)) - objects.model[k].MakeDecal(blooddecalfast, DoRotation(colpoint - objects.position[k], 0, -objects.yaw[k], 0), sprites[i]->size * 1.6, .5, Random() % 360); + Object::objects[k]->model.MakeDecal(blooddecalfast, DoRotation(colpoint - Object::objects[k]->position, 0, -Object::objects[k]->yaw, 0), sprites[i]->size * 1.6, .5, Random() % 360); DeleteSprite(i); spritehit = 1; }