mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
Fixes Upper/Lower Casing for include paths (#487)
* Fixing upper/lower case for includes types.h, zconf.h and zlib.h were renamed so that global includes like Types.h are not used.
This commit is contained in:
@@ -8,9 +8,9 @@
|
||||
#include <windows.h>
|
||||
#include <stdio.h>
|
||||
#include <memory.h>
|
||||
#include "debug.h"
|
||||
#include "DEBUG.H"
|
||||
#include "input.h"
|
||||
#include "memman.h"
|
||||
#include "MemMan.h"
|
||||
#include "english.h"
|
||||
#include "vobject.h"
|
||||
#include "vobject_blitters.h"
|
||||
@@ -24,7 +24,7 @@
|
||||
#ifdef _JA2_RENDER_DIRTY
|
||||
#include "Font Control.h"
|
||||
#include "Render Dirty.h"
|
||||
#include "utilities.h"
|
||||
#include "Utilities.h"
|
||||
#endif
|
||||
#include <vector>
|
||||
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
#include "MemMan.h"
|
||||
#include "debug.h"
|
||||
#include "DEBUG.H"
|
||||
#include "zlib.h"
|
||||
|
||||
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
#ifndef __CURSOR_DATABASE_
|
||||
#define __CURSOR_DATABASE_
|
||||
|
||||
#include "Types.h"
|
||||
#include "types.h"
|
||||
#include "FileMan.h"
|
||||
#include "VObject.h"
|
||||
#include "VSurface.h"
|
||||
#include "vobject.h"
|
||||
#include "vsurface.h"
|
||||
|
||||
#include "Video.h"
|
||||
#include "video.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
//**************************************************************************
|
||||
//
|
||||
// Filename : debug.h
|
||||
// Filename : DEBUG.H
|
||||
//
|
||||
// Purpose : prototypes for the debug manager
|
||||
//
|
||||
|
||||
+2
-2
@@ -28,7 +28,7 @@
|
||||
#include <stdio.h>
|
||||
#include <string>
|
||||
#include <sstream>
|
||||
#include "debug.h"
|
||||
#include "DEBUG.H"
|
||||
|
||||
//Kris addition
|
||||
#include "screenids.h"
|
||||
@@ -39,7 +39,7 @@
|
||||
|
||||
// CJC added
|
||||
#ifndef _NO_DEBUG_TXT
|
||||
#include "fileman.h"
|
||||
#include "FileMan.h"
|
||||
#endif
|
||||
#include "GameSettings.h"
|
||||
#include "SaveLoadGame.h"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#include "DirectDraw Calls.h"
|
||||
|
||||
#include <ddraw.h>
|
||||
#include "debug.h"
|
||||
#include "DEBUG.H"
|
||||
#include "vobject_blitters.h"
|
||||
|
||||
// DirectDrawSurface2 Calls
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#include <ddraw.h>
|
||||
#include "DirectX Common.h"
|
||||
#include <windows.h>
|
||||
#include "debug.h"
|
||||
#include "DEBUG.H"
|
||||
|
||||
void DirectXZeroMem ( void* pMemory, int nSize )
|
||||
{
|
||||
|
||||
+2
-2
@@ -24,7 +24,7 @@
|
||||
// Includes
|
||||
//
|
||||
//**************************************************************************
|
||||
#include "Types.h"
|
||||
#include "types.h"
|
||||
#include <stdlib.h>
|
||||
#include <malloc.h>
|
||||
#include <stdio.h>
|
||||
@@ -34,7 +34,7 @@
|
||||
#include "windows.h"
|
||||
#include "FileMan.h"
|
||||
#include "MemMan.h"
|
||||
#include "Debug.h"
|
||||
#include "DEBUG.H"
|
||||
#include "LibraryDataBase.h"
|
||||
#include "io.h"
|
||||
#include "sgp_logger.h"
|
||||
|
||||
+1
-1
@@ -20,7 +20,7 @@
|
||||
//**************************************************************************
|
||||
|
||||
#include "types.h"
|
||||
#include "Windows.h"
|
||||
#include "windows.h"
|
||||
|
||||
|
||||
|
||||
|
||||
+3
-3
@@ -8,10 +8,10 @@
|
||||
#include <wchar.h>
|
||||
#include "sgp.h"
|
||||
#include "pcx.h"
|
||||
#include "memman.h"
|
||||
#include "fileman.h"
|
||||
#include "MemMan.h"
|
||||
#include "FileMan.h"
|
||||
#include "Font.h"
|
||||
#include "Debug.h"
|
||||
#include "DEBUG.H"
|
||||
|
||||
#include "video.h"
|
||||
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
#ifndef __FONT_H_
|
||||
#define __FONT_H_
|
||||
|
||||
#include "Types.h"
|
||||
#include "types.h"
|
||||
#include "himage.h"
|
||||
#include "vobject.h"
|
||||
//#ifdef WINFONTS
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
#include "Types.h"
|
||||
#include "types.h"
|
||||
#include "windows.h"
|
||||
#include "FileMan.h"
|
||||
#include "LibraryDataBase.h"
|
||||
#include "MemMan.h"
|
||||
#include "stdio.h"
|
||||
#include "WCheck.h"
|
||||
#include "Debug.h"
|
||||
#include "DEBUG.H"
|
||||
|
||||
#include "video.h"
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef _LIBRARY_DATABASE_H
|
||||
#define _LIBRARY_DATABASE_H
|
||||
|
||||
#include "Types.h"
|
||||
#include "types.h"
|
||||
#include "windows.h"
|
||||
#include "FileMan.h"
|
||||
|
||||
|
||||
+1
-1
@@ -24,7 +24,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include "MemMan.h"
|
||||
#include "Debug.h"
|
||||
#include "DEBUG.H"
|
||||
#include <stdio.h>
|
||||
#include "sgp_logger.h"
|
||||
#ifdef _DEBUG
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#include <stdio.h>
|
||||
#include "pcx.h"
|
||||
#include "memman.h"
|
||||
#include "fileman.h"
|
||||
#include "MemMan.h"
|
||||
#include "FileMan.h"
|
||||
|
||||
// Local typedefs
|
||||
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
#include "Random.h"
|
||||
#include "debug control.h"
|
||||
#include "random.h"
|
||||
#include "Debug Control.h"
|
||||
|
||||
extern bool is_client;
|
||||
extern bool is_server;
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
|
||||
#ifndef __RADRES__
|
||||
|
||||
#include "rad.h"
|
||||
#include "RAD.H"
|
||||
|
||||
RADDEFSTART
|
||||
|
||||
|
||||
+2
-2
@@ -3,8 +3,8 @@
|
||||
#include "FileMan.h"
|
||||
#include "imgfmt.h"
|
||||
#include "himage.h"
|
||||
#include "Types.h"
|
||||
#include "Debug.h"
|
||||
#include "types.h"
|
||||
#include "DEBUG.H"
|
||||
#include "WCheck.h"
|
||||
|
||||
BOOLEAN STCILoadRGB( HIMAGE hImage, UINT16 fContents, HWFILE hFile, STCIHeader * pHeader );
|
||||
|
||||
+4
-4
@@ -10,16 +10,16 @@
|
||||
#include <wchar.h>
|
||||
#include <string.h>
|
||||
#include "sgp.h"
|
||||
#include "memman.h"
|
||||
#include "fileman.h"
|
||||
#include "MemMan.h"
|
||||
#include "FileMan.h"
|
||||
#include "Font.h"
|
||||
#include "Debug.h"
|
||||
#include "DEBUG.H"
|
||||
#include "vsurface.h"
|
||||
#include "vsurface_private.h"
|
||||
#include "DirectX Common.h"
|
||||
#include <ddraw.h>
|
||||
#include "winfont.h"
|
||||
#include "font.h"
|
||||
#include "Font.h"
|
||||
#include "Font Control.h"
|
||||
#include "GameSettings.h"
|
||||
#include <language.hpp>
|
||||
|
||||
+3
-3
@@ -3,14 +3,14 @@
|
||||
#include <stdlib.h>
|
||||
#include "types.h"
|
||||
#include "string.h"
|
||||
#include "debug.h"
|
||||
#include "fileman.h"
|
||||
#include "DEBUG.H"
|
||||
#include "FileMan.h"
|
||||
#include "himage.h"
|
||||
#include "impTGA.h"
|
||||
#include "pcx.h"
|
||||
#include "STCI.h"
|
||||
#include "PngLoader.h"
|
||||
#include "wcheck.h"
|
||||
#include "WCheck.h"
|
||||
#include "Compression.h"
|
||||
#include "vobject.h"
|
||||
#include "vobject_blitters.h"
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
// * SubRectInfo's (usNumberOfRects > 0, size = usNumberOfSubRects * sizeof(SubRectInfo) ), uncompressed
|
||||
// * Bytes of image data, possibly compressed
|
||||
|
||||
#include "Types.h"
|
||||
#include "types.h"
|
||||
|
||||
#define STCI_ID_STRING "STCI"
|
||||
#define STCI_ID_LEN 4
|
||||
|
||||
+3
-3
@@ -17,12 +17,12 @@
|
||||
//**************************************************************************
|
||||
|
||||
#include "types.h"
|
||||
#include "Fileman.h"
|
||||
#include "memman.h"
|
||||
#include "FileMan.h"
|
||||
#include "MemMan.h"
|
||||
#include "WCheck.h"
|
||||
#include "himage.h"
|
||||
#include "string.h"
|
||||
#include "debug.h"
|
||||
#include "DEBUG.H"
|
||||
#include "video.h"
|
||||
#include "impTGA.h"
|
||||
|
||||
|
||||
+2
-2
@@ -11,9 +11,9 @@
|
||||
#include <windows.h>
|
||||
#include <stdio.h>
|
||||
#include <memory.h>
|
||||
#include "debug.h"
|
||||
#include "DEBUG.H"
|
||||
#include "input.h"
|
||||
#include "memman.h"
|
||||
#include "MemMan.h"
|
||||
#include "english.h"
|
||||
#include "video.h"
|
||||
#include "local.h"
|
||||
|
||||
+3
-3
@@ -15,14 +15,14 @@
|
||||
#include <windows.h>
|
||||
#include <stdio.h>
|
||||
#include <memory.h>
|
||||
#include "debug.h"
|
||||
#include "DEBUG.H"
|
||||
#include "input.h"
|
||||
#include "memman.h"
|
||||
#include "MemMan.h"
|
||||
#include "line.h"
|
||||
#include "video.h"
|
||||
#define BASE_REGION_FLAGS (MSYS_REGION_ENABLED | MSYS_SET_CURSOR)
|
||||
#ifdef _JA2_RENDER_DIRTY
|
||||
#include "render dirty.h"
|
||||
#include "Render Dirty.h"
|
||||
#include "Font Control.h"
|
||||
#endif
|
||||
#include "english.h"
|
||||
|
||||
+2
-2
@@ -3,8 +3,8 @@
|
||||
|
||||
#define BMP_RANDOM
|
||||
|
||||
#include "Types.h"
|
||||
#include "Debug.h"
|
||||
#include "types.h"
|
||||
#include "DEBUG.H"
|
||||
#include "GameSettings.h"
|
||||
|
||||
//IMPORTANT: Changing this define will invalidate the JA2 save. If this is necessary, please ifdef your own value.
|
||||
|
||||
+5
-5
@@ -7,17 +7,17 @@
|
||||
#include <string.h>
|
||||
#include "sgp.h"
|
||||
#include "vobject.h"
|
||||
#include "font.h"
|
||||
#include "Font.h"
|
||||
#include "local.h"
|
||||
#include "Fileman.h"
|
||||
#include "FileMan.h"
|
||||
#include "input.h"
|
||||
#include "Random.h"
|
||||
#include "random.h"
|
||||
#include "gameloop.h"
|
||||
#include "soundman.h"
|
||||
#include "JA2 Splash.h"
|
||||
#include "Timer Control.h"
|
||||
#include "LibraryDataBase.h"
|
||||
#include "utilities.h"
|
||||
#include "Utilities.h"
|
||||
|
||||
#include "GameSettings.h"
|
||||
#include "input.h"
|
||||
@@ -51,7 +51,7 @@
|
||||
#include "english.h"
|
||||
#include "wine.h"
|
||||
|
||||
#include "BuildDefines.h"
|
||||
#include "builddefines.h"
|
||||
#include "Intro.h"
|
||||
|
||||
#ifndef WIN32_LEAN_AND_MEAN
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include "local.h"
|
||||
#include "types.h"
|
||||
#include "timer.h"
|
||||
#include "debug.h"
|
||||
#include "DEBUG.H"
|
||||
|
||||
#include "video.h"
|
||||
|
||||
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
#include "sgp_logger.h"
|
||||
#include "Debug.h"
|
||||
#include "DEBUG.H"
|
||||
#include "Font Control.h"
|
||||
|
||||
#include "Message.h"
|
||||
#include "message.h"
|
||||
#include <iostream>
|
||||
|
||||
static inline void flush_screen(std::wstringstream& stream)
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
#include "DirectDraw Calls.h"
|
||||
#include <stdio.h>
|
||||
#include "debug.h"
|
||||
#include "DEBUG.H"
|
||||
#include "video.h"
|
||||
#include "himage.h"
|
||||
#include "vobject.h"
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#include <string.h>
|
||||
#include "soundman.h"
|
||||
#include "FileMan.h"
|
||||
#include "debug.h"
|
||||
#include "DEBUG.H"
|
||||
#include "MemMan.h"
|
||||
#include "random.h"
|
||||
#include "fmod.h"
|
||||
|
||||
+7
-7
@@ -1,16 +1,16 @@
|
||||
#include "types.h"
|
||||
#include "Video.h"
|
||||
#include "video.h"
|
||||
#include "vobject_blitters.h"
|
||||
#include "sgp.h"
|
||||
#include <stdio.h>
|
||||
#include <io.h>
|
||||
#include "renderworld.h"
|
||||
#include "Render Dirty.h"
|
||||
#include "fade screen.h"
|
||||
#include "Fade Screen.h"
|
||||
#include "impTGA.h"
|
||||
#include "timer control.h"
|
||||
#include "Fileman.h"
|
||||
#include "Input.h"
|
||||
#include "Timer Control.h"
|
||||
#include "FileMan.h"
|
||||
#include "input.h"
|
||||
#include "GameSettings.h"
|
||||
#include "sgp_logger.h"
|
||||
|
||||
@@ -18,8 +18,8 @@
|
||||
#include <vfs/Core/vfs.h>
|
||||
#include <vfs/Core/vfs_file_raii.h>
|
||||
|
||||
#include "Local.h"
|
||||
#include "text.h"
|
||||
#include "local.h"
|
||||
#include "Text.h"
|
||||
|
||||
|
||||
#ifndef _MT
|
||||
|
||||
+4
-4
@@ -5,11 +5,11 @@
|
||||
#include <ddraw.h>
|
||||
#include <process.h>
|
||||
|
||||
#include "Local.h"
|
||||
#include "Debug.h"
|
||||
#include "Types.h"
|
||||
#include "local.h"
|
||||
#include "DEBUG.H"
|
||||
#include "types.h"
|
||||
#include "DirectDraw Calls.h"
|
||||
#include "VSurface.h"
|
||||
#include "vsurface.h"
|
||||
|
||||
#define BUFFER_READY 0x00
|
||||
#define BUFFER_BUSY 0x01
|
||||
|
||||
+2
-2
@@ -1,10 +1,10 @@
|
||||
#include "DirectDraw Calls.h"
|
||||
#include <stdio.h>
|
||||
#include "debug.h"
|
||||
#include "DEBUG.H"
|
||||
#include "video.h"
|
||||
#include "himage.h"
|
||||
#include "vobject.h"
|
||||
#include "wcheck.h"
|
||||
#include "WCheck.h"
|
||||
#include "vobject_blitters.h"
|
||||
#include "sgp.h"
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
#include "DirectDraw Calls.h"
|
||||
#include <stdio.h>
|
||||
#include "debug.h"
|
||||
#include "DEBUG.H"
|
||||
#include "video.h" // JA2
|
||||
#include "himage.h"
|
||||
#include "vobject.h"
|
||||
#include "wcheck.h"
|
||||
#include "WCheck.h"
|
||||
#include "vobject.h"
|
||||
#include "vobject_blitters.h"
|
||||
#include "shading.h"
|
||||
|
||||
+2
-2
@@ -1,12 +1,12 @@
|
||||
#include "DirectDraw Calls.h"
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include "debug.h"
|
||||
#include "DEBUG.H"
|
||||
#include "video.h"
|
||||
#include "himage.h"
|
||||
#include "vsurface.h"
|
||||
#include "vsurface_private.h"
|
||||
#include "wcheck.h"
|
||||
#include "WCheck.h"
|
||||
#include "vobject_blitters.h"
|
||||
|
||||
extern void SetClippingRect(SGPRect *clip);
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
||||
*/
|
||||
|
||||
/* $Id: ZCONF.H,v 1.2 2004/03/16 02:00:39 digicrab Exp $ */
|
||||
/* $Id: zconf.h,v 1.2 2004/03/16 02:00:39 digicrab Exp $ */
|
||||
|
||||
#ifndef _ZCONF_H
|
||||
#define _ZCONF_H
|
||||
Reference in New Issue
Block a user