-/*
-Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+// $Id$
+//
+// SuperTux
+// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
#include <config.h>
#include "physfs_sdl.hpp"
#include <iostream>
#include <assert.h>
-#include "msg.hpp"
+#include "log.hpp"
static int funcSeek(struct SDL_RWops* context, int offset, int whence)
{
break;
}
if(res == 0) {
- msg_warning << "Error seeking in file: " << PHYSFS_getLastError() << std::endl;
+ log_warning << "Error seeking in file: " << PHYSFS_getLastError() << std::endl;
return -1;
}
static int funcClose(struct SDL_RWops* context)
{
PHYSFS_file* file = (PHYSFS_file*) context->hidden.unknown.data1;
-
+
PHYSFS_close(file);
delete context;
SDL_RWops* get_physfs_SDLRWops(const std::string& filename)
{
+ // check this as PHYSFS seems to be buggy and still returns a
+ // valid pointer in this case
+ if(filename == "") {
+ throw std::runtime_error("Couldn't open file: empty filename");
+ }
+
PHYSFS_file* file = (PHYSFS_file*) PHYSFS_openRead(filename.c_str());
if(!file) {
std::stringstream msg;
<< PHYSFS_getLastError();
throw std::runtime_error(msg.str());
}
-
+
SDL_RWops* ops = new SDL_RWops();
ops->type = 0;
ops->hidden.unknown.data1 = file;