Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 197755 | Differences between
and this patch

Collapse All | Expand All

(-)Sphere.cpp.old (-2 / +7 lines)
Lines 450-455 Link Here
450
450
451
void Sphere::loadTexture(char * fileName, GLuint * tId)
451
void Sphere::loadTexture(char * fileName, GLuint * tId)
452
{
452
{
453
    char tmpName[128];
454
    tmpName[127] = 0;
455
    strncpy(tmpName, "@GENTOO_DATADIR@/", 127);
456
    strncat(tmpName, fileName, 127-strlen(tmpName));
457
453
    glEnable(GL_COLOR_MATERIAL);
458
    glEnable(GL_COLOR_MATERIAL);
454
459
455
    try
460
    try
Lines 458-464 Link Here
458
463
459
        glGenTextures(1, tId);
464
        glGenTextures(1, tId);
460
465
461
    	SDL_Surface *texture = SDL_LoadBMP(fileName);
466
    	SDL_Surface *texture = SDL_LoadBMP(tmpName);
462
        if (texture)
467
        if (texture)
463
        {
468
        {
464
	        glBindTexture(GL_TEXTURE_2D, *tId);
469
	        glBindTexture(GL_TEXTURE_2D, *tId);
Lines 596-599 Link Here
596
        break;
601
        break;
597
    }
602
    }
598
    glRotatef(t, a[0], a[1], a[2]);
603
    glRotatef(t, a[0], a[1], a[2]);
599
}
604
}
(-)World.cpp.old (-10 / +10 lines)
Lines 53-68 Link Here
53
53
54
void World::loadAllSounds()
54
void World::loadAllSounds()
55
{
55
{
56
    this->loadSound("Sounds/mineexplosion.wav", SOUND_EXPLOSION_MINE);
56
    this->loadSound("@GENTOO_DATADIR@/Sounds/mineexplosion.wav", SOUND_EXPLOSION_MINE);
57
    this->loadSound("Sounds/missileexplosion.wav", SOUND_EXPLOSION_MISSILE);
57
    this->loadSound("@GENTOO_DATADIR@/Sounds/missileexplosion.wav", SOUND_EXPLOSION_MISSILE);
58
    this->loadSound("Sounds/spacejump.wav", SOUND_SPACE_JUMP);
58
    this->loadSound("@GENTOO_DATADIR@/Sounds/spacejump.wav", SOUND_SPACE_JUMP);
59
    this->loadSound("Sounds/driveby.wav", SOUND_DRIVEBY);
59
    this->loadSound("@GENTOO_DATADIR@/Sounds/driveby.wav", SOUND_DRIVEBY);
60
    this->loadSound("Sounds/missilelaunch.wav", SOUND_MISSILE_LAUNCH);
60
    this->loadSound("@GENTOO_DATADIR@/Sounds/missilelaunch.wav", SOUND_MISSILE_LAUNCH);
61
    this->loadSound("Sounds/subping.wav", SOUND_AUTODESTROY);
61
    this->loadSound("@GENTOO_DATADIR@/Sounds/subping.wav", SOUND_AUTODESTROY);
62
    this->loadSound("Sounds/splooge.wav", SOUND_SMOKE);
62
    this->loadSound("@GENTOO_DATADIR@/Sounds/splooge.wav", SOUND_SMOKE);
63
    this->loadSound("Sounds/spike.wav", SOUND_SPIKE);
63
    this->loadSound("@GENTOO_DATADIR@/Sounds/spike.wav", SOUND_SPIKE);
64
    this->loadSound("Sounds/acceleration.wav", SOUND_ACCELERATION);
64
    this->loadSound("@GENTOO_DATADIR@/Sounds/acceleration.wav", SOUND_ACCELERATION);
65
    this->loadSound("Sounds/boing.wav", SOUND_BOING);
65
    this->loadSound("@GENTOO_DATADIR@/Sounds/boing.wav", SOUND_BOING);
66
    //this->loadSound("Sounds/boing2.wav", SOUND_BOING2);
66
    //this->loadSound("Sounds/boing2.wav", SOUND_BOING2);
67
}
67
}
68
68

Return to bug 197755