r504 - in packages/cube/trunk/debian: . patches

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2006-04-15 02:12:27 +0000 (Sat, 15 Apr 2006)
New Revision: 504

Modified:
   packages/cube/trunk/debian/README.Debian
   packages/cube/trunk/debian/patches/04_load_personal_setting.patch
Log:
add .cube/autoexec.cfg


Modified: packages/cube/trunk/debian/README.Debian
===================================================================
--- packages/cube/trunk/debian/README.Debian	2006-04-15 01:48:00 UTC (rev 503)
+++ packages/cube/trunk/debian/README.Debian	2006-04-15 02:12:27 UTC (rev 504)
@@ -1,2 +1,5 @@
 Personal setting:
-If you want to create your own setting file, you can store it in $HOME/.cube/config.cfg
+If you want to create your own setting file, you can store it in 
+	$HOME/.cube/config.cfg
+or
+	$HOME/.cube/autoexec.cfg

Modified: packages/cube/trunk/debian/patches/04_load_personal_setting.patch
===================================================================
--- packages/cube/trunk/debian/patches/04_load_personal_setting.patch	2006-04-15 01:48:00 UTC (rev 503)
+++ packages/cube/trunk/debian/patches/04_load_personal_setting.patch	2006-04-15 02:12:27 UTC (rev 504)
@@ -1,37 +1,46 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Gonéri Le Bouder <goneri at rulezlan.org>
-## DP: cube try to load $HOME/.cube/config.cfg 
+## DP: cube try to load $HOME/.cube/config.cfg and  
+## DP: $HOME/.cube/autoexec.cfg 
 
+ at DPATCH@
+
 diff -ru cube-2005.08.29.orig/src/main.cpp cube-2005.08.29/src/main.cpp
---- cube-2005.08.29.orig/src/main.cpp	2006-04-15 03:31:35.000000000 +0200
-+++ cube-2005.08.29/src/main.cpp	2006-04-15 03:40:44.000000000 +0200
-@@ -161,6 +161,14 @@
+--- cube-2005.08.29.orig/src/main.cpp	2006-04-15 03:53:13.000000000 +0200
++++ cube-2005.08.29/src/main.cpp	2006-04-15 04:08:55.000000000 +0200
+@@ -161,6 +161,19 @@
      log("sound");
      initsound();
  
 +
 +// i try to load cfg from user home directory
 +    char *homedir = getenv("HOME");
-+    char *personnalcfgpath;
-+    personnalcfgpath = (char*)malloc(sizeof(char)*strlen(homedir)+30);
-+    strcpy(personnalcfgpath,homedir);
-+    strcat(personnalcfgpath,"/.cube/config.cfg");
++    char *personalconfigcfg;
++    char *personalautoexeccfg;
++    personalconfigcfg = (char*)malloc(sizeof(char)*strlen(homedir)+30);
++    personalautoexeccfg = (char*)malloc(sizeof(char)*strlen(homedir)+30);
++    strcpy(personalconfigcfg,homedir);
++    strcat(personalconfigcfg,"/.cube/config.cfg");
++    strcpy(personalautoexeccfg,homedir);
++    strcat(personalautoexeccfg,"/.cube/autoexec.cfg");
++
 +    
      log("cfg");
      newmenu("frags\tpj\tping\tteam\tname");
      newmenu("ping\tplr\tserver");
-@@ -169,9 +177,12 @@
+@@ -169,8 +182,13 @@
      exec("data/prefabs.cfg");
      exec("data/sounds.cfg");
      exec("servers.cfg");
 -    if(!execfile("config.cfg")) execfile("data/defaults.cfg");
-+    if(!execfile(personnalcfgpath))
++    if(!execfile(personalconfigcfg))
 +      if(!execfile("config.cfg")) execfile("data/defaults.cfg");
      exec("autoexec.cfg");
++    exec(personalautoexeccfg);
++    delete (personalconfigcfg);
++    delete (personalautoexeccfg);
++
  
-+
-+
      log("localconnect");
      localconnect();
-     changemap("metl3");		// if this map is changed, also change depthcorrect()