Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7813/src
Modified Files:
resources.cpp title.cpp
Log Message:
-Fix bugs where resources from source directory weren't always found
-Create a complete german translation as example
Index: title.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- title.cpp 2 Dec 2004 00:25:27 -0000 1.136
+++ title.cpp 6 Dec 2004 17:47:40 -0000 1.137
@@ -347,10 +347,14 @@
context.draw_text(white_small_text, " SuperTux " PACKAGE_VERSION "\n",
Vector(0, screen->h - 70), LEFT_ALLIGN, LAYER_FOREGROUND1);
context.draw_text(white_small_text,
- _("Copyright (c) 2003 SuperTux Devel Team\n"
- "This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
- "are welcome to redistribute it under certain conditions; see the file COPYING\n"
- "for details.\n"), Vector(0, screen->h - 70 + white_small_text->get_height()), LEFT_ALLIGN, LAYER_FOREGROUND1);
+ _(
+"Copyright (c) 2003 SuperTux Devel Team\n"
+"This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
+"are welcome to redistribute it under certain conditions; see the file COPYING\n"
+"for details.\n"
+ ),
+ Vector(0, screen->h - 70 + white_small_text->get_height()),
+ LEFT_ALLIGN, LAYER_FOREGROUND1);
/* Don't draw menu, if quit is true */
Menu* menu = Menu::current();
Index: resources.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- resources.cpp 28 Nov 2004 14:56:49 -0000 1.60
+++ resources.cpp 6 Dec 2004 17:47:40 -0000 1.61
@@ -313,11 +313,11 @@
std::string get_resource_filename(const std::string& resource)
{
std::string filepath = st_dir + resource;
- if(access(filepath.c_str(), R_OK) == 0)
+ if(FileSystem::faccessible(filepath))
return filepath;
filepath = datadir + resource;
- if(access(filepath.c_str(), R_OK) == 0)
+ if(FileSystem::faccessible(filepath))
return filepath;
std::cerr << "Couldn't find resource: '" << resource << "'." << std::endl;
|
