|
|
fd59d4f |
From 0908ea1059c337e6e3a314ae46d3b0f06596a0b1 Mon Sep 17 00:00:00 2001
|
|
|
fd59d4f |
From: Lubomir Rintel <lkundrak@v3.sk>
|
|
|
fd59d4f |
Date: Sat, 14 Nov 2015 16:42:43 +0100
|
|
|
fd59d4f |
Subject: [PATCH 3/7] A bit better error handling.
|
|
|
fd59d4f |
|
|
|
fd59d4f |
---
|
|
|
fd59d4f |
src/basecode/angelcodefont.cpp | 6 +++++-
|
|
|
fd59d4f |
src/basecode/toolkit.cpp | 6 ++++++
|
|
|
fd59d4f |
src/core/fileutils.cpp | 2 ++
|
|
|
fd59d4f |
3 files changed, 13 insertions(+), 1 deletion(-)
|
|
|
fd59d4f |
|
|
|
fd59d4f |
diff --git a/src/basecode/angelcodefont.cpp b/src/basecode/angelcodefont.cpp
|
|
|
fd59d4f |
index 77d4d9a..a675f25 100644
|
|
|
fd59d4f |
--- a/src/basecode/angelcodefont.cpp
|
|
|
fd59d4f |
+++ b/src/basecode/angelcodefont.cpp
|
|
|
fd59d4f |
@@ -200,11 +200,15 @@ void ACFont::load(FILE *handle)
|
|
|
fd59d4f |
void ACFont::load(const char *filename)
|
|
|
fd59d4f |
{
|
|
|
fd59d4f |
File * f = new File(fopen(filename, "rb"));
|
|
|
fd59d4f |
- if (f)
|
|
|
fd59d4f |
+ if (f->f)
|
|
|
fd59d4f |
{
|
|
|
fd59d4f |
load(f);
|
|
|
fd59d4f |
delete f;
|
|
|
fd59d4f |
}
|
|
|
fd59d4f |
+ else
|
|
|
fd59d4f |
+ {
|
|
|
fd59d4f |
+ perror(filename);
|
|
|
fd59d4f |
+ }
|
|
|
fd59d4f |
}
|
|
|
fd59d4f |
|
|
|
fd59d4f |
void ACFont::load(File * f)
|
|
|
fd59d4f |
diff --git a/src/basecode/toolkit.cpp b/src/basecode/toolkit.cpp
|
|
|
fd59d4f |
index aa25363..7dc28eb 100644
|
|
|
fd59d4f |
--- a/src/basecode/toolkit.cpp
|
|
|
fd59d4f |
+++ b/src/basecode/toolkit.cpp
|
|
|
fd59d4f |
@@ -215,7 +215,10 @@ static void do_loadtexture(const char * aFilename, int clamp = 1)
|
|
|
fd59d4f |
unsigned char *data = stbi_load(aFilename, &x, &y, &n, 4);
|
|
|
fd59d4f |
|
|
|
fd59d4f |
if (data == NULL)
|
|
|
fd59d4f |
+ {
|
|
|
fd59d4f |
+ perror(aFilename);
|
|
|
fd59d4f |
return;
|
|
|
fd59d4f |
+ }
|
|
|
fd59d4f |
|
|
|
fd59d4f |
int l, w, h;
|
|
|
fd59d4f |
w = x;
|
|
|
fd59d4f |
@@ -409,7 +412,10 @@ SDL_Cursor *load_cursor(const char *aFilename, int hotx, int hoty)
|
|
|
fd59d4f |
unsigned char *imgdata = stbi_load(aFilename, &ix, &iy, &n, 4);
|
|
|
fd59d4f |
|
|
|
fd59d4f |
if (imgdata == NULL)
|
|
|
fd59d4f |
+ {
|
|
|
fd59d4f |
+ perror(aFilename);
|
|
|
fd59d4f |
return NULL;
|
|
|
fd59d4f |
+ }
|
|
|
fd59d4f |
|
|
|
fd59d4f |
if (ix > 32 || iy > 32)
|
|
|
fd59d4f |
{
|
|
|
fd59d4f |
diff --git a/src/core/fileutils.cpp b/src/core/fileutils.cpp
|
|
|
fd59d4f |
index e9678ea..a28b06e 100644
|
|
|
fd59d4f |
--- a/src/core/fileutils.cpp
|
|
|
fd59d4f |
+++ b/src/core/fileutils.cpp
|
|
|
fd59d4f |
@@ -38,6 +38,8 @@ File::File(FILE *aFileHandle)
|
|
|
fd59d4f |
File::File(const char *aFilename, const char *aFileOpenTypes)
|
|
|
fd59d4f |
{
|
|
|
fd59d4f |
f = fopen(aFilename, aFileOpenTypes);
|
|
|
fd59d4f |
+ if (!f)
|
|
|
fd59d4f |
+ perror(aFilename);
|
|
|
fd59d4f |
}
|
|
|
fd59d4f |
|
|
|
fd59d4f |
File::~File()
|
|
|
fd59d4f |
--
|
|
|
fd59d4f |
2.5.0
|
|
|
fd59d4f |
|