diff -Naur orig/goonies_r1-0-1/build/linux/Makefile new/goonies_r1-0-1/build/linux/Makefile --- orig/goonies_r1-0-1/build/linux/Makefile 2006-08-28 07:10:27.000000000 -0400 +++ new/goonies_r1-0-1/build/linux/Makefile 2008-06-03 13:31:36.000000000 -0400 @@ -30,8 +30,8 @@ DATA = ../graphics ../maps ../sound CC = c++ -CFLAGS = -g3 -O3 -Wall `sdl-config --cflags` -I/usr/local/include/SDL -I/usr/X11R6/include -LDFLAGS = `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lSDL_sound -lGL -lGLU +CFLAGS = -O2 -Wall -march=i586 -mtune=i686 `sdl-config --cflags` +LDFLAGS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lGL -lGLU RM = rm -f CP = cp -r LN = ln -s diff -Naur orig/goonies_r1-0-1/src/GLTManager.cpp new/goonies_r1-0-1/src/GLTManager.cpp --- orig/goonies_r1-0-1/src/GLTManager.cpp 2006-08-29 17:20:12.000000000 -0400 +++ new/goonies_r1-0-1/src/GLTManager.cpp 2008-06-03 13:06:04.000000000 -0400 @@ -64,7 +64,7 @@ char filename[256]; GLTile *t; - sprintf(filename,"graphics/%s.png",name->get()); + sprintf(filename,"/usr/share/goonies/graphics/%s.png",name->get()); t=new GLTile(filename); t->set_clamp(); n=new GLTManagerNode(); @@ -153,7 +153,7 @@ n->m_tile=t=new GLTile(s); } // if - sprintf(filename,"graphics/%s.nfo",name->get()); + sprintf(filename,"/usr/share/goonies/graphics/%s.nfo",name->get()); { FILE *fp; fp=fopen(filename,"r"); @@ -210,7 +210,7 @@ char filename[256]; GLTile *t; - sprintf(filename,"graphics/%s.png",name->get()); + sprintf(filename,"/usr/share/goonies/graphics/%s.png",name->get()); t=new GLTile(filename); t->set_smooth(); // t->set_clamp(); diff -Naur orig/goonies_r1-0-1/src/SFXManager.cpp new/goonies_r1-0-1/src/SFXManager.cpp --- orig/goonies_r1-0-1/src/SFXManager.cpp 2006-08-28 06:41:42.000000000 -0400 +++ new/goonies_r1-0-1/src/SFXManager.cpp 2008-06-03 13:06:34.000000000 -0400 @@ -69,7 +69,7 @@ char filename[256]; Mix_Chunk *t; - sprintf(filename,"sound/%s",name->get()); + sprintf(filename,"/usr/share/goonies/sound/%s",name->get()); t=Sound_create_sound(filename); n=new SFXManagerNode(); n->m_sfx=t; @@ -124,7 +124,7 @@ // FIXME: unfortunately the entire game has a hardcoded use of the sound/ dir... char path[256]; char *filename; - sprintf(path, "sound/%s", localpath); + sprintf(path, "/usr/share/goonies/sound/%s", localpath); #ifdef _WIN32 WIN32_FIND_DATA finfo; diff -Naur orig/goonies_r1-0-1/src/TheGoonies.cpp new/goonies_r1-0-1/src/TheGoonies.cpp --- orig/goonies_r1-0-1/src/TheGoonies.cpp 2006-08-31 12:49:54.000000000 -0400 +++ new/goonies_r1-0-1/src/TheGoonies.cpp 2008-06-03 13:06:19.000000000 -0400 @@ -100,7 +100,7 @@ // Load the room/music table: { FILE *fp; - fp=fopen("maps/musics.txt","r"); + fp=fopen("/usr/share/goonies/maps/musics.txt","r"); if (fp!=0) { int n; char tmp[80],tmp2[80],tmp3[80]; @@ -127,7 +127,7 @@ // Load the room/fratelli table: { FILE *fp; - fp=fopen("maps/fratellies.txt","r"); + fp=fopen("/usr/share/goonies/maps/fratellies.txt","r"); if (fp!=0) { int n; char tmp[80],tmp2[80]; @@ -235,7 +235,7 @@ // Load the room/fratelli table: { FILE *fp; - fp=fopen("maps/fratellies.txt","r"); + fp=fopen("/usr/share/goonies/maps/fratellies.txt","r"); if (fp!=0) { int n; char tmp[80],tmp2[80]; @@ -284,7 +284,7 @@ void TheGoonies::map_filename(char *fn,int level,int roomx,int roomy) { - sprintf(fn,"maps/level%i-%i-%i.gmp",level,roomx,roomy); + sprintf(fn,"/usr/share/goonies/maps/level%i-%i-%i.gmp",level,roomx,roomy); } /* TheGoonies::map_filename */ diff -Naur orig/goonies_r1-0-1/src/TheGooniesApp.cpp new/goonies_r1-0-1/src/TheGooniesApp.cpp --- orig/goonies_r1-0-1/src/TheGooniesApp.cpp 2006-08-30 17:18:25.000000000 -0400 +++ new/goonies_r1-0-1/src/TheGooniesApp.cpp 2008-06-03 13:06:04.000000000 -0400 @@ -109,9 +109,9 @@ // m_sfx_menu_select=Sound_create_sound("sound/sfx/cursor_select"); // m_sfx_menu_move=Sound_create_sound("sound/sfx/cursor_move"); - font_extract("font","graphics/font.png",10+13+13+10+14+8,"1234567890abcdefghijklmnopqrstuvwxyzXXXXXXXXXX-./:\"#$%!?:;.,'`[]{|}ñ"); - font_extract("font_hl","graphics/font_highlighted.png",10+13+13+10+14+8,"1234567890abcdefghijklmnopqrstuvwxyzXXXXXXXXXX-./:\"#$%!?:;.,'`[]{|}ñ"); - font_extract("font_hud","graphics/font_hud.png",11,"0123456789-"); + font_extract("font","/usr/share/goonies/graphics/font.png",10+13+13+10+14+8,"1234567890abcdefghijklmnopqrstuvwxyzXXXXXXXXXX-./:\"#$%!?:;.,'`[]{|}ñ"); + font_extract("font_hl","/usr/share/goonies/graphics/font_highlighted.png",10+13+13+10+14+8,"1234567890abcdefghijklmnopqrstuvwxyzXXXXXXXXXX-./:\"#$%!?:;.,'`[]{|}ñ"); + font_extract("font_hud","/usr/share/goonies/graphics/font_hud.png",11,"0123456789-"); m_test_game=0; load_configuration(); diff -Naur orig/goonies_r1-0-1/src/state_splash.cpp new/goonies_r1-0-1/src/state_splash.cpp --- orig/goonies_r1-0-1/src/state_splash.cpp 2006-08-31 13:44:07.000000000 -0400 +++ new/goonies_r1-0-1/src/state_splash.cpp 2008-06-03 13:42:02.000000000 -0400 @@ -52,7 +52,9 @@ // return THEGOONIES_STATE_MSX; } /* if */ - return THEGOONIES_STATE_SPLASH; +/* The intro slash was way to long 20 seconds or so, let's skip it and a couple others -exeterdad- */ +/* return THEGOONIES_STATE_SPLASH;*/ + return THEGOONIES_STATE_TITLE; } /* TheGooniesApp::splash_cycle */