mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-24 21:11:39 +00:00
- added missing return to translation code.
- a bit of header cleanup. * moved <zlib.h> and <bzlib.h> from files.h to files_decompress.cpp because they are no longer needed for defining the interface. * added <functional> to the precompiled header
This commit is contained in:
parent
5a4e9decd9
commit
5fccdd9acd
6 changed files with 5 additions and 3 deletions
|
@ -37,9 +37,7 @@
|
||||||
#define FILES_H
|
#define FILES_H
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <zlib.h>
|
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include "bzlib.h"
|
|
||||||
#include "doomtype.h"
|
#include "doomtype.h"
|
||||||
#include "m_swap.h"
|
#include "m_swap.h"
|
||||||
|
|
||||||
|
|
|
@ -35,6 +35,8 @@
|
||||||
|
|
||||||
// This also pulls in windows.h
|
// This also pulls in windows.h
|
||||||
#include "LzmaDec.h"
|
#include "LzmaDec.h"
|
||||||
|
#include <zlib.h>
|
||||||
|
#include <bzlib.h>
|
||||||
|
|
||||||
#include "files.h"
|
#include "files.h"
|
||||||
#include "i_system.h"
|
#include "i_system.h"
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
#include <tuple>
|
#include <tuple>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
#include <functional>
|
||||||
|
|
||||||
// These two headers get included nearly everywhere so it doesn't matter if changing them forces a few more recompiles.
|
// These two headers get included nearly everywhere so it doesn't matter if changing them forces a few more recompiles.
|
||||||
// The overall savings from PCHing them are more significant.
|
// The overall savings from PCHing them are more significant.
|
||||||
|
|
|
@ -743,6 +743,7 @@ bool FRemapTable::AddToTranslation(const char *range)
|
||||||
catch (CRecoverableError &err)
|
catch (CRecoverableError &err)
|
||||||
{
|
{
|
||||||
Printf("Error in translation '%s':\n%s\n", range, err.GetMessage());
|
Printf("Error in translation '%s':\n%s\n", range, err.GetMessage());
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -29,6 +29,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include <stdint.h>
|
||||||
#include "timidity.h"
|
#include "timidity.h"
|
||||||
#include "tables.h"
|
#include "tables.h"
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
|
@ -28,7 +28,6 @@
|
||||||
#ifndef TIMIDITY_H_INCLUDED
|
#ifndef TIMIDITY_H_INCLUDED
|
||||||
#define TIMIDITY_H_INCLUDED 1
|
#define TIMIDITY_H_INCLUDED 1
|
||||||
|
|
||||||
#include "c_cvars.h"
|
|
||||||
#include "controls.h"
|
#include "controls.h"
|
||||||
#include "mblock.h"
|
#include "mblock.h"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue