small oopsies

[voidz0r]

Hi, I just noticed some weird patchwork

Code: Select all

    {
        printf("%s can't be made... And doesn't exist ! Exitting ...", dir);
        exit(1);
    }
<<<<<<< main.cpp
    sprintf(dir, "%s/.manaworld/tmw.conf", userHome);
=======
    sprintf(dir, "%s/.manaworld/config.xml", userHome);
>>>>>>> 1.73
#endif

<<<<<<< main.cpp
    // Checking if the tmw.conf file exists... otherwise creates it with
=======
    // Checking if the configuration file exists... otherwise creates it with
>>>>>>> 1.73
    // default options !
    FILE *tmwFile = 0;
    tmwFile = fopen(dir, "r");

So I removed a few lines

Code: Select all

    }
    sprintf(dir, "%s/.manaworld/config.xml", userHome);
#endif

    // Checking if the configuration file exists... otherwise creates it with
    // default options !

And it compiled, but didn't link, so I changed the following line in makefile.opengl:

Code: Select all

LIBS := `sdl-config --libs` -lguichan_sdl -lguichan_opengl -lguichan \
        -lSDL_mixer -lSDL_image `pkg-config --libs libxml-2.0` -lGL

into

Code: Select all

LIBS := `sdl-config --libs` -lguichan_sdl -lguichan_opengl -lguichan \
        -lSDL_mixer -lSDL_image `pkg-config --libs libxml-2.0` -lGL -lphysfs

But somehow I only get a black window with opengl. Will try to fix that later.

[Bjørn]

The "wierd patch work" is a conflict handed to you by CVS. You had changed "tmw.ini" to "tmw.conf" and I had changed "tmw.ini" to "config.xml", and CVS allows you to decide which change should be final.

I've added the -lphysfs to makefile.opengl in CVS now, so maybe people stop complaining about it. Actually the correct way would be to call configure as "./configure CXXFLAGS=-DUSE_OPENGL", but it seems that this still doesn't work for some people.

About the black screen, I can only say make sure you do a make clean to completely rebuild the source when you try the OpenGL version. Other than that I'm not familiar with this problem.

[voidz0r]

The "wierd patch work" is a conflict handed to you by CVS. You had changed "tmw.ini" to "tmw.conf" and I had changed "tmw.ini" to "config.xml", and CVS allows you to decide which change should be final.

I didn't know CVS could do that. I just thought it would override all my changes (this isn't my only change so I guess I've been very lucky so far)

make clean doesn't work here, so I just cd obj; tree -fix|grep "\.o"|xargs rm -f
but the black window stayed. I've tried a thing or 2 but I have no luck yet.