Changeset 2306Tweet

Timestamp:

Jan 31, 2013, 6:55:52 PM (10 years ago)

Author:

sam

Message:

ps3: use network fallback for image files.

Location:

trunk/src

Files:

• image/codec/ps3-image.cpp (modified) (5 diffs)
• lol/sys/init.h (modified) (1 diff)
• sys/init.cpp (modified) (1 diff)

trunk/src/image/codec/ps3-image.cpp

@@ -2 +2 @@
 // Lol Engine
 //
-// Copyright: (c) 2010-2011 Sam Hocevar <sam@hocevar.net>
+// Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net>
 //   This program is free software; you can redistribute it and/or
 //   modify it under the terms of the Do What The Fuck You Want To
@@ -94 +94 @@
     CellPngDecSubHandle hsub;
 
-    char file[1024];
-    sprintf(file, "/app_home/c:/Users/s.hocevar/le/%s", path);
+    String fullpath = String("/app_home/") + String(System::GetDataDir()) + String(path);
 
     CellPngDecSrc dec_src;
     dec_src.srcSelect = CELL_PNGDEC_FILE;
-    dec_src.fileName = file;
+    dec_src.fileName = &fullpath[0];
     dec_src.fileOffset = 0;
     dec_src.fileSize = 0;
@@ -110 +109 @@
     {
 #if !LOL_RELEASE
-        Log::Error("could not open %s for decoding\n", file);
+        Log::Error("could not open %s for decoding\n", &fullpath[0]);
 #endif
         return false;
@@ -120 +119 @@
     {
 #if !LOL_RELEASE
-        Log::Error("could not read image header\n");
+        Log::Error("could not read image header in %s\n", &fullpath[0]);
 #endif
         return false;
@@ -155 +154 @@
     {
 #if !LOL_RELEASE
-        Log::Error("could not run PngDec decoder\n");
+        Log::Error("could not run PngDec decoder on %s\n", &fullpath[0]);
 #endif
         return false;

trunk/src/lol/sys/init.h

@@ -44 +44 @@
 
 extern void Init(int argc, char *argv[],
-                 String const projectdir = LOL_CONFIG_PROJECTDIR,
-                 String const solutiondir = LOL_CONFIG_SOLUTIONDIR);
+                 String const &projectdir = LOL_CONFIG_PROJECTDIR,
+                 String const &solutiondir = LOL_CONFIG_SOLUTIONDIR);
 
 extern void SetDataDir(char const *dir);

trunk/src/sys/init.cpp

@@ -37 +37 @@
 
 void Init(int argc, char *argv[],
-          String const projectdir, String const solutiondir)
+          String const &projectdir, String const &solutiondir)
 {
     using namespace std;