mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-27 07:59:00 +02:00
Code Issues Projects Releases Wiki Activity

- bugfix to allow headless server to load a texture for new tilesets where they must read it to determine parts.

Browse Source 
- converted asserts to exceptions
This commit is contained in:
Mark Vejvoda
2013-06-23 04:17:25 +00:00
parent 4764da0e50
commit d46479df95
19 changed files with 140 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
source/shared_lib/sources/graphics/pixmap.cpp
View File

@@ -759,7 +759,10 @@ void PixmapIoJpg::write(uint8 *pixels) {
// ===================== PUBLIC ========================
Pixmap1D::Pixmap1D() {
assert(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == false);
if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) {
throw megaglest_runtime_error("Loading graphics in headless server mode not allowed!");
}
w= -1;
components= -1;
@@ -767,13 +770,19 @@ Pixmap1D::Pixmap1D() {
}
Pixmap1D::Pixmap1D(int components) {
assert(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == false);
if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) {
throw megaglest_runtime_error("Loading graphics in headless server mode not allowed!");
}
init(components);
}
Pixmap1D::Pixmap1D(int w, int components) {
assert(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == false);
if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) {
throw megaglest_runtime_error("Loading graphics in headless server mode not allowed!");
}
init(w, components);
}
@@ -885,7 +894,10 @@ void Pixmap1D::loadTga(const string &path) {
// ===================== PUBLIC ========================
Pixmap2D::Pixmap2D() {
assert(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == false);
if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) {
throw megaglest_runtime_error("Loading graphics in headless server mode not allowed!");
}
h= -1;
w= -1;
components= -1;
@@ -893,7 +905,10 @@ Pixmap2D::Pixmap2D() {
}
Pixmap2D::Pixmap2D(int components) {
assert(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == false);
if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) {
throw megaglest_runtime_error("Loading graphics in headless server mode not allowed!");
}
h= -1;
w= -1;
this->components= -1;
@@ -903,7 +918,10 @@ Pixmap2D::Pixmap2D(int components) {
}
Pixmap2D::Pixmap2D(int w, int h, int components) {
assert(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == false);
if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) {
throw megaglest_runtime_error("Loading graphics in headless server mode not allowed!");
}
this->h= 0;
this->w= -1;
this->components= -1;
@@ -1323,7 +1341,10 @@ bool Pixmap2D::doDimensionsAgree(const Pixmap2D *pixmap){
// =====================================================
Pixmap3D::Pixmap3D() {
assert(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == false);
if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) {
throw megaglest_runtime_error("Loading graphics in headless server mode not allowed!");
}
w= -1;
h= -1;
@@ -1334,14 +1355,20 @@ Pixmap3D::Pixmap3D() {
}
Pixmap3D::Pixmap3D(int w, int h, int d, int components) {
assert(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == false);
if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) {
throw megaglest_runtime_error("Loading graphics in headless server mode not allowed!");
}
pixels = NULL;
slice=0;
init(w, h, d, components);
}
Pixmap3D::Pixmap3D(int d, int components) {
assert(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == false);
if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) {
throw megaglest_runtime_error("Loading graphics in headless server mode not allowed!");
}
pixels = NULL;
slice=0;
init(d, components);
@@ -1468,7 +1495,10 @@ void Pixmap3D::loadSliceTga(const string &path, int slice){
// class PixmapCube
// =====================================================
PixmapCube::PixmapCube() {
assert(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == false);
if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) {
throw megaglest_runtime_error("Loading graphics in headless server mode not allowed!");
}
}
PixmapCube::~PixmapCube() {