|
|
|
@ -135,14 +135,14 @@ int main(int /*argc*/, char */*argv*/[]) |
|
|
|
|
|
|
|
|
|
//load some textures
|
|
|
|
|
unsigned long tw, th, error = 0; |
|
|
|
|
error |= loadImage(texture[0], tw, th, "assets/eagle.png"); |
|
|
|
|
error |= loadImage(texture[1], tw, th, "assets/redbrick.png"); |
|
|
|
|
error |= loadImage(texture[2], tw, th, "assets/purplestone.png"); |
|
|
|
|
error |= loadImage(texture[3], tw, th, "assets/greystone.png"); |
|
|
|
|
error |= loadImage(texture[4], tw, th, "assets/bluestone.png"); |
|
|
|
|
error |= loadImage(texture[5], tw, th, "assets/mossy.png"); |
|
|
|
|
error |= loadImage(texture[6], tw, th, "assets/wood.png"); |
|
|
|
|
error |= loadImage(texture[7], tw, th, "assets/colorstone.png"); |
|
|
|
|
error |= loadImage(texture[0], tw, th, "pics/eagle.png"); |
|
|
|
|
error |= loadImage(texture[1], tw, th, "pics/redbrick.png"); |
|
|
|
|
error |= loadImage(texture[2], tw, th, "pics/purplestone.png"); |
|
|
|
|
error |= loadImage(texture[3], tw, th, "pics/greystone.png"); |
|
|
|
|
error |= loadImage(texture[4], tw, th, "pics/bluestone.png"); |
|
|
|
|
error |= loadImage(texture[5], tw, th, "pics/mossy.png"); |
|
|
|
|
error |= loadImage(texture[6], tw, th, "pics/wood.png"); |
|
|
|
|
error |= loadImage(texture[7], tw, th, "pics/colorstone.png"); |
|
|
|
|
if(error) { std::cout << "error loading images" << std::endl; return 1; } |
|
|
|
|
|
|
|
|
|
//load some sprite textures
|
|
|
|
@ -335,11 +335,7 @@ int main(int /*argc*/, char */*argv*/[]) |
|
|
|
|
for(int i = 0; i < numSprites; i++) |
|
|
|
|
{ |
|
|
|
|
spriteOrder[i] = i; |
|
|
|
|
spriteDistance[i] = |
|
|
|
|
((posX - sprite[i].x) * |
|
|
|
|
(posX - sprite[i].x) + |
|
|
|
|
(posY - sprite[i].y) * |
|
|
|
|
(posY - sprite[i].y)); //sqrt not taken, unneeded
|
|
|
|
|
spriteDistance[i] = ((posX - sprite[i].x) * (posX - sprite[i].x) + (posY - sprite[i].y) * (posY - sprite[i].y)); //sqrt not taken, unneeded
|
|
|
|
|
} |
|
|
|
|
sortSprites(spriteOrder, spriteDistance, numSprites); |
|
|
|
|
|
|
|
|
|