Move similar/main/morph.c -> similar/main/morph.cpp
This commit is contained in:
parent
3693743d41
commit
a5f95cab76
|
@ -779,7 +779,7 @@ class DXXProgram(DXXCommon):
|
||||||
'main/menu.cpp',
|
'main/menu.cpp',
|
||||||
'main/mglobal.cpp',
|
'main/mglobal.cpp',
|
||||||
'main/mission.cpp',
|
'main/mission.cpp',
|
||||||
'main/morph.c',
|
'main/morph.cpp',
|
||||||
'main/multi.c',
|
'main/multi.c',
|
||||||
'main/multibot.c',
|
'main/multibot.c',
|
||||||
'main/newdemo.c',
|
'main/newdemo.c',
|
||||||
|
|
|
@ -17,6 +17,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <algorithm>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
@ -33,6 +34,8 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
||||||
#include "bm.h"
|
#include "bm.h"
|
||||||
#include "interp.h"
|
#include "interp.h"
|
||||||
|
|
||||||
|
using std::max;
|
||||||
|
|
||||||
morph_data morph_objects[MAX_MORPH_OBJECTS];
|
morph_data morph_objects[MAX_MORPH_OBJECTS];
|
||||||
|
|
||||||
//returns ptr to data for this object, or NULL if none
|
//returns ptr to data for this object, or NULL if none
|
Loading…
Reference in a new issue