File trophy-1.1.3.patch of Package trophy

Overview Repositories Revisions Requests Users Attributes Meta

File trophy-1.1.3.patch of Package trophy (Revision 700a2136e52a3af99f52d0c30caef204)

Currently displaying revision 700a2136e52a3af99f52d0c30caef204 , Show latest

diff -rup trophy-1.1.3-src-orig/trophy/Makefile.in trophy-1.1.3-src/trophy/Makefile.in
--- trophy-1.1.3-src-orig/trophy/Makefile.in	2002-01-17 16:43:20.000000000 +0100
+++ trophy-1.1.3-src/trophy/Makefile.in	2003-05-19 20:34:43.000000000 +0200
@@ -61,3 +61,11 @@ trophy: $(OBJF)
 doc :
 	@echo "Building documentation"
 	doxygen doxy.cfg
+
+install: trophy doc $(DATAFILES)
+	install -d -m 755 $(DESTDIR)$(bindir)
+	install -m 755 trophy $(DESTDIR)$(bindir)
+	install -d -m 755 $(DESTDIR)$(datadir)/trophy
+	install -m 644 resources.scr $(DESTDIR)$(datadir)/trophy
+	cp -a resources $(DESTDIR)$(datadir)/trophy
+
diff -rup trophy-1.1.3-src-orig/trophy/cadialog.cpp trophy-1.1.3-src/trophy/cadialog.cpp
--- trophy-1.1.3-src-orig/trophy/cadialog.cpp	2002-05-04 11:57:18.000000000 +0200
+++ trophy-1.1.3-src/trophy/cadialog.cpp	2003-05-19 20:34:43.000000000 +0200
@@ -1,3 +1,4 @@
+#include <iostream.h>
 #include "cadialog.h"
 #include "catrophy.h"
 #include "caresources.h"
diff -rup trophy-1.1.3-src-orig/trophy/camath.h trophy-1.1.3-src/trophy/camath.h
--- trophy-1.1.3-src-orig/trophy/camath.h	2002-05-04 11:55:18.000000000 +0200
+++ trophy-1.1.3-src/trophy/camath.h	2003-05-19 20:34:43.000000000 +0200
@@ -16,7 +16,7 @@
 #define CA_MAXTRACKS      64      // Max number of tracks
 #define CA_NUMCARTYPES     4      // Max number of car types
 
-#define CA_VERSION   "1.0.6"      // Trophy version
+#define CA_VERSION   "1.1.3"      // Trophy version
 
 #define CA_WIDTH         640      // Width of screen
 #define CA_HEIGHT        480      // Height      "
diff -rup trophy-1.1.3-src-orig/trophy/camenu.cpp trophy-1.1.3-src/trophy/camenu.cpp
--- trophy-1.1.3-src-orig/trophy/camenu.cpp	2002-05-04 11:57:50.000000000 +0200
+++ trophy-1.1.3-src/trophy/camenu.cpp	2003-05-19 20:34:43.000000000 +0200
@@ -122,7 +122,7 @@ CAMenu::run() {
         CASoundEffect::playBackgroundMelody();
 
         if( configureMenu && changed ) {
-            //CA_APP->reconfigure();
+            CA_APP->reconfigure();
         }
 
         changed = false;
diff -rup trophy-1.1.3-src-orig/trophy/caresources.cpp trophy-1.1.3-src/trophy/caresources.cpp
--- trophy-1.1.3-src-orig/trophy/caresources.cpp	2002-11-15 21:34:56.000000000 +0100
+++ trophy-1.1.3-src/trophy/caresources.cpp	2003-05-19 20:34:43.000000000 +0200
@@ -137,13 +137,13 @@ CAResources::load() {
     chdir(PKGDATADIR);
 
     try {
-        resources = new CL_ResourceManager( "resources.dat", true );
+        resources = new CL_ResourceManager( DATADIR"/resources.dat", true );
     }
 
     // Just use the resource config file (resources.scr) if there's no compiled .dat:
     //
     catch (CL_Error err) {
-        resources = new CL_ResourceManager( "resources.scr", false );
+        resources = new CL_ResourceManager( DATADIR"/resources.scr", false );
     }
 
     // Load info frame for showing loading status:
diff -rup trophy-1.1.3-src-orig/trophy/casignupscreen.cpp trophy-1.1.3-src/trophy/casignupscreen.cpp
--- trophy-1.1.3-src-orig/trophy/casignupscreen.cpp	2002-11-13 19:15:48.000000000 +0100
+++ trophy-1.1.3-src/trophy/casignupscreen.cpp	2003-05-19 20:34:43.000000000 +0200
@@ -62,7 +62,7 @@ CASignUpScreen::reset() {
 */
 void
 CASignUpScreen::setOffset( int o ) {
-    CL_String trackPath = "resources/tracks/";
+    CL_String trackPath = DATADIR"/resources/tracks/";
 
     offset = o;
 
@@ -72,7 +72,7 @@ CASignUpScreen::setOffset( int o ) {
         //printf( "\ni: %d", i );
 
         if( i<numTracks ) {
-            image[i] = CL_TargaProvider::create( trackPath + CA_APP->trackList.getItem(i+offset) + "/thumb.tga", NULL );
+            image[i] = CL_TargaProvider::create( trackPath + CA_APP->trackList.getItem(i+offset) + "/thumb.tga", CL_InputSourceProvider::create_file_provider("") );
             racePreview[i] = new CAImageView( CA_APP->trackList.getItem(i+offset),
                                               "",
                                               image[i], false );
diff -rup trophy-1.1.3-src-orig/trophy/catrophy.cpp trophy-1.1.3-src/trophy/catrophy.cpp
--- trophy-1.1.3-src-orig/trophy/catrophy.cpp	2003-05-06 21:50:45.000000000 +0200
+++ trophy-1.1.3-src/trophy/catrophy.cpp	2003-05-19 20:34:43.000000000 +0200
@@ -486,13 +486,13 @@ CATrophy::initTrack( CL_String trackName
 
     // Base path of track files:
     //
-    CL_String trackPath = CL_String("resources/tracks/") + trackName + "/";
+    CL_String trackPath = CL_String(DATADIR"/resources/tracks/") + trackName + "/";
 
     // Load visual map:
     //
     if( track.visualMap!=0 ) delete track.visualMap;
     CL_String vmapPath = trackPath + "vmap.tga";
-    track.visualMap = CL_TargaProvider::create( vmapPath, NULL );
+    track.visualMap = CL_TargaProvider::create( vmapPath, CL_InputSourceProvider::create_file_provider("") );
 
     loading.setProgress( 15 );
 
@@ -501,7 +501,7 @@ CATrophy::initTrack( CL_String trackName
     if( track.functionMap!=0 ) delete track.functionMap;
     CL_String fmapPath = trackPath + "fmap.tga";
     track.functionMap = new CL_Canvas( track.visualMap->get_width(), track.visualMap->get_height() );
-    CL_Surface* fs = CL_TargaProvider::create( fmapPath, NULL );
+    CL_Surface* fs = CL_TargaProvider::create( fmapPath, CL_InputSourceProvider::create_file_provider("") );
     fs->put_target( 0, 0, 0, track.functionMap );
     delete fs;
 
@@ -581,7 +581,7 @@ CATrophy::initTrack( CL_String trackName
                 else if( name=="Object" ) {
                     if( value=="bridge" ) {
                         CL_String bridgePath = trackPath + value + ".tga";
-                        track.bridge = CL_TargaProvider::create( bridgePath, NULL );
+                        track.bridge = CL_TargaProvider::create( bridgePath, CL_InputSourceProvider::create_file_provider("") );
                         track.bridgePos[0] = xv;
                         track.bridgePos[1] = yv;
                     }
diff -rup trophy-1.1.3-src-orig/trophy/catrophy.h trophy-1.1.3-src/trophy/catrophy.h
--- trophy-1.1.3-src-orig/trophy/catrophy.h	2002-01-17 16:43:20.000000000 +0100
+++ trophy-1.1.3-src/trophy/catrophy.h	2003-05-19 20:34:43.000000000 +0200
@@ -1,6 +1,8 @@
 #ifndef CATROPHY_H
 #define CATROPHY_H
 
+#define DATADIR "/usr/share/trophy"
+
 #include <ClanLib/core.h>
 #include <ClanLib/application.h>
 #include "cacartype.h"
diff -rup trophy-1.1.3-src-orig/trophy/resources.scr trophy-1.1.3-src/trophy/resources.scr
--- trophy-1.1.3-src-orig/trophy/resources.scr	2003-05-06 21:30:22.000000000 +0200
+++ trophy-1.1.3-src/trophy/resources.scr	2003-05-19 20:37:06.000000000 +0200
@@ -3,7 +3,7 @@ section resources {
   // Tracks:
   //
   section tracks {
-    directories = "Loops~Zurich~Moon~Downtown~Snake~Rally" (type=string);
+    directories = "Loops~Zurich~Moon~Downtown~Snake~Rally~ZigZag" (type=string);
   }
   
   // Cars:

Places

File trophy-1.1.3.patch of Package trophy (Revision 700a2136e52a3af99f52d0c30caef204)

Places