[Pingus-CVS] [pingus] 2 new revisions pushed by address@hidden on 2011-10-04 12:23 GMT

[pingus]

2 new revisions:

Revision: 82990792c9ec
Author:   Ingo Ruhnke <address@hidden>
Date:     Tue Oct  4 05:23:30 2011
Log:      Fixed 'make install'
http://code.google.com/p/pingus/source/detail?r=82990792c9ec

Revision: fe5eee0a8178
Author:   Ingo Ruhnke <address@hidden>
Date:     Tue Oct  4 05:23:43 2011
Log:      give error message when credits file is not found
http://code.google.com/p/pingus/source/detail?r=fe5eee0a8178

==============================================================================
Revision: 82990792c9ec
Author:   Ingo Ruhnke <address@hidden>
Date:     Tue Oct  4 05:23:30 2011
Log:      Fixed 'make install'

http://code.google.com/p/pingus/source/detail?r=82990792c9ec

Modified:
 /Makefile

=======================================
--- /Makefile   Thu Sep 15 04:44:19 2011
+++ /Makefile   Tue Oct  4 05:23:30 2011
@@ -17,6 +17,7 @@
 DESTDIR =
 PREFIX  = /usr/local
 DATADIR = $(PREFIX)/share/pingus
+MANDIR  = $(PREFIX)/share/man
 BINDIR  = $(PREFIX)/bin

 build/pingus:
@@ -32,7 +33,7 @@
        rm -rf build/
        rm -f pingus

-install: install-exec install-data
+install: install-exec install-data install-man

 install-exec: build/pingus
        install -d "$(DESTDIR)$(BINDIR)"
@@ -50,6 +51,8 @@
         -name "*.wav" -o \
         -name "*.scm" -o \
         -name "*.font" -o \
+        -name "*.story" -o \
+        -name "*.credits" -o \
         -name "*.it" -o \
         -name "*.ogg" -o \
         -name "*.s3m" -o \
@@ -61,6 +64,9 @@
         -name "*.sprite" \
         \) -exec install -D {} $(DESTDIR)$(DATADIR)/{} \;

-.PHONY : clean install install-exec install-data
+install-man:
+       install -D doc/man/pingus.6 "$(DESTDIR)$(MANDIR)/man1/pingus.6"
+
+.PHONY : clean install install-exec install-data install-man

 # EOF #

==============================================================================
Revision: fe5eee0a8178
Author:   Ingo Ruhnke <address@hidden>
Date:     Tue Oct  4 05:23:43 2011
Log:      give error message when credits file is not found

http://code.google.com/p/pingus/source/detail?r=fe5eee0a8178

Modified:
 /src/pingus/screens/credits.cpp

=======================================
--- /src/pingus/screens/credits.cpp     Mon Oct  3 05:23:38 2011
+++ /src/pingus/screens/credits.cpp     Tue Oct  4 05:23:43 2011
@@ -88,10 +88,21 @@

   { // read credit information from filename
     std::ifstream in(filename.get_sys_path());
-    std::string line;
-    while(std::getline(in, line))
-    {
-      credits.push_back(line);
+    if (!in)
+    {
+      log_error("couldn't open " << filename);
+
+      std::ostringstream out;
+      out << "couldn't open " << filename;
+      credits.push_back(out.str());
+    }
+    else
+    {
+      std::string line;
+      while(std::getline(in, line))
+      {
+        credits.push_back(line);
+      }
     }
   }