summaryrefslogtreecommitdiff
path: root/src/win95/chnktexi.cpp
diff options
context:
space:
mode:
authorSteven Fuller <relnev@icculus.org>2001-07-29 20:57:33 +0000
committerPatryk Obara <dreamer.tan@gmail.com>2019-08-20 02:22:36 +0200
commit4db15e7459ab06860cb7a7e162ca6d2b52a68b9c (patch)
treed26b85d52ff351d029f8138b58fbebee3464c1e1 /src/win95/chnktexi.cpp
parent5c497c61a656f338eb9599fb5f364ad853d0eccf (diff)
More compiling. Things are starting to get hacky (adding stubs, commenting
out unimplemented windows stuff, and so on).
Diffstat (limited to 'src/win95/chnktexi.cpp')
-rw-r--r--src/win95/chnktexi.cpp28
1 files changed, 18 insertions, 10 deletions
diff --git a/src/win95/chnktexi.cpp b/src/win95/chnktexi.cpp
index 7dad3d9..8fe0345 100644
--- a/src/win95/chnktexi.cpp
+++ b/src/win95/chnktexi.cpp
@@ -1,11 +1,15 @@
-#include <windows.h>
#include <string.h>
+
+#include "fixer.h"
+
#include "string.hpp"
#ifndef DB_LEVEL
#define DB_LEVEL 4
#endif
#include "db.h"
-#include "awTexLd.h"
+
+#include "awtexld.h"
+
#include "chnkload.hpp"
#include "chunkpal.hpp"
@@ -16,12 +20,12 @@
#include "ffstdio.h"
#endif
-#ifndef CL_SUPPORT_ALTTAB
- #error "Please #define CL_SUPPORT_ALTTAB to 0 or 1 in projload.hpp"
-#endif
-#if CL_SUPPORT_ALTTAB
- #include "alt_tab.h"
-#endif
+//#ifndef CL_SUPPORT_ALTTAB
+// #error "Please #define CL_SUPPORT_ALTTAB to 0 or 1 in projload.hpp"
+//#endif
+//#if CL_SUPPORT_ALTTAB
+// #include "alt_tab.h"
+//#endif
#include "chnktexi.h"
@@ -36,7 +40,9 @@ char const * cl_pszGameMode = NULL;
// used to determine if the display is palettized
// currently assuming that if this is <= 8 then all
// surfaces et. except d3d textures have a global palette
-extern "C" extern int VideoModeColourDepth;
+extern "C" {
+ extern int VideoModeColourDepth;
+};
// useful filename handling functions
@@ -649,7 +655,9 @@ char * CL_GetImageFileName(char * pszDestBuf, unsigned nBufSize, char const * ps
}
}
-extern "C" extern void CheckForWindowsMessages(void);
+extern "C" {
+ extern void CheckForWindowsMessages(void);
+};
int CL_LoadImageOnce(char const * pszFileName, unsigned fFlagsEtc)
{