Move d2x-rebirth/main/bmread.c -> d2x-rebirth/main/bmread.cpp
This commit is contained in:
parent
de366b12ee
commit
1b59de804b
|
@ -1293,7 +1293,7 @@ class D2XProgram(DXXProgram):
|
||||||
# for editor
|
# for editor
|
||||||
__objects_editor = DXXCommon.create_lazy_object_property([{
|
__objects_editor = DXXCommon.create_lazy_object_property([{
|
||||||
'source':[os.path.join(srcdir, f) for f in [
|
'source':[os.path.join(srcdir, f) for f in [
|
||||||
'main/bmread.c',
|
'main/bmread.cpp',
|
||||||
]
|
]
|
||||||
],
|
],
|
||||||
}])
|
}])
|
||||||
|
|
|
@ -18,6 +18,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <algorithm>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
@ -58,6 +59,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
||||||
#include "strutil.h"
|
#include "strutil.h"
|
||||||
#include "editor/texpage.h"
|
#include "editor/texpage.h"
|
||||||
|
|
||||||
|
using std::min;
|
||||||
|
|
||||||
#define BM_NONE -1
|
#define BM_NONE -1
|
||||||
#define BM_COCKPIT 0
|
#define BM_COCKPIT 0
|
||||||
#define BM_TEXTURES 2
|
#define BM_TEXTURES 2
|
Loading…
Reference in a new issue