The following commit has been merged in the master branch:
commit d614a4ceddc0f77c848bbb1533090dd03d9423fc
Author: Stephen M. Webb <[email protected]>
Date: Fri Dec 2 14:37:31 2011 -0500
Fixed startup problems from too few directories in $HOME (Closes: #628166)
(LP: #502978).
diff --git a/debian/changelog b/debian/changelog
index 167fec9..106dada 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ viruskiller (1.0-1.dfsg.1-2) UNRELEASED; urgency=low
* Bump standards to 3.9.2 (no changes needed).
* Fixed FTBFS with ld --as-needed (Closes: #641328) (LP: #832825).
* Fixed reference in missing-pak-file error message (Closes: #329734).
+ * Fixed startup problems from too few directories in $HOME
+ (Closes: #628166) (LP: #502978).
- -- Stephen M. Webb <[email protected]> Fri, 02 Dec 2011 13:21:14
-0500
+ -- Stephen M. Webb <[email protected]> Fri, 02 Dec 2011 14:14:01
-0500
viruskiller (1.0-1.dfsg.1-1) unstable; urgency=low
diff --git a/debian/patches/0009-start-with-fewer-directories.patch
b/debian/patches/0009-start-with-fewer-directories.patch
new file mode 100644
index 0000000..1dba547
--- /dev/null
+++ b/debian/patches/0009-start-with-fewer-directories.patch
@@ -0,0 +1,31 @@
+Description: Fixed a startup problem if there were too few directories in
+ $(HOME).
+Author: Stephen M. Webb <[email protected]>
+
+--- a/src/CGameData.cpp
++++ b/src/CGameData.cpp
+@@ -255,10 +255,9 @@
+
+ sanity++;
+
+- if (sanity == 10000)
++ if (sanity == maxDirectories)
+ {
+- printf("Made 10,000 unsuccessful attempts to grab %d
inactives directories!!\n", amount);
+- exit(1);
++ printf("Made >%d unsuccessful attempts to grab %d
inactives directories!!\n", maxDirectories, amount);
+ }
+ }
+ }
+--- a/src/CDirectory.cpp
++++ b/src/CDirectory.cpp
+@@ -58,9 +58,6 @@
+
+ bool Directory::addFile(GameObject *file)
+ {
+- if (realFileCount == 50)
+- return false;
+-
+ fileList.add(file);
+ fileCount++;
+ realFileCount++;
diff --git a/debian/patches/series b/debian/patches/series
index 0e9c23f..79321ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ link-libz.patch
0006-fix-pak-segfault.patch
0007-link-as-needed.patch
0008-missing-pak-error-fix.patch
+0009-start-with-fewer-directories.patch
--
game about viruses invading your computer
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
