diff options
Diffstat (limited to 'engines/sludge/backdrop.cpp')
| -rw-r--r-- | engines/sludge/backdrop.cpp | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/engines/sludge/backdrop.cpp b/engines/sludge/backdrop.cpp index ed7177035e..bb840b3497 100644 --- a/engines/sludge/backdrop.cpp +++ b/engines/sludge/backdrop.cpp @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ - #if 0 #if defined __unix__ && !(defined __APPLE__) #include <png.h> @@ -54,11 +53,12 @@ #include "talk.h" #include "sludger.h" #include "statusba.h" - +#include "variable.h" #include "CommonCode/version.h" -extern inputType input; +namespace Sludge { +extern inputType input; bool freeze(); void unfreeze(bool); // Because FREEZE.H needs a load of other includes @@ -96,7 +96,7 @@ void nosnapshot() { #endif } -#if ALLOW_FILE +#if 0 void saveSnapshot(FILE *fp) { if (snapshotTextureName) { fputc(1, fp); // 1 for snapshot follows @@ -157,7 +157,7 @@ bool snapshot() { return true; } -#if ALLOW_FILE +#if 0 bool restoreSnapshot(FILE *fp) { unsigned int picWidth = get2bytes(fp); unsigned int picHeight = get2bytes(fp); @@ -304,7 +304,7 @@ bool resizeBackdrop(int x, int y) { void loadBackDrop(int fileNum, int x, int y) { setResourceForFatal(fileNum); -#if ALLOW_FILE +#if 0 if (! openFileFromNum(fileNum)) { fatal("Can't load overlay image"); return; @@ -322,7 +322,7 @@ void loadBackDrop(int fileNum, int x, int y) { } void mixBackDrop(int fileNum, int x, int y) { -#if ALLOW_FILE +#if 0 setResourceForFatal(fileNum); if (! openFileFromNum(fileNum)) { fatal("Can't load overlay image"); @@ -623,7 +623,7 @@ void drawBackDrop() { bool loadLightMap(int v) { int newPicWidth, newPicHeight; -#if ALLOW_FILE +#if 0 setResourceForFatal(v); if (! openFileFromNum(v)) return fatal("Can't open light map."); long file_pointer = ftell(bigDataFile); @@ -764,9 +764,9 @@ bool loadLightMap(int v) { glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); -#endif - texImage2D(GL_TEXTURE_2D, 0, GL_RGBA, newPicWidth, newPicHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, lightMap.data, lightMap.name); + texImage2D(GL_TEXTURE_2D, 0, GL_RGBA, newPicWidth, newPicHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, lightMap.data, lightMap.name); +#endif finishAccess(); #endif @@ -816,7 +816,7 @@ void reloadParallaxTextures() { bool loadParallax(unsigned short v, unsigned short fracX, unsigned short fracY) { -#if ALLOW_FILE +#if 0 setResourceForFatal(v); if (! openFileFromNum(v)) return fatal("Can't open parallax image"); @@ -1004,7 +1004,7 @@ bool loadParallax(unsigned short v, unsigned short fracX, unsigned short fracY) extern int viewportOffsetX, viewportOffsetY; -#if ALLOW_FILE +#if 0 bool loadHSI(FILE *fp, int x, int y, bool reserve) { int t1, t2, n; @@ -1751,3 +1751,5 @@ bool getRGBIntoStack(unsigned int x, unsigned int y, stackHandler *sH) { #endif return true; } + +} // End of namespace Sludge |