TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Move similar/main/fireball.c -> similar/main/fireball.cpp

Browse source
This commit is contained in:
Kp 2012-11-11 22:12:51 +00:00
parent bd4029c922
commit 517a8c1e37
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SConstruct
View file

@ -932,7 +932,7 @@ class DXXProgram(DXXCommon):
'main/digiobj.cpp',
'main/effects.cpp',
'main/endlevel.cpp',
'main/fireball.c',
'main/fireball.cpp',
'main/fuelcen.cpp',
'main/fvi.cpp',
'main/game.cpp',

5
similar/main/fireball.c → similar/main/fireball.cpp
View file

@ -17,6 +17,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
*
*/
#include <algorithm>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@ -56,6 +57,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "automap.h"
#include "byteswap.h"
using std::min;
#define EXPLOSION_SCALE (F1_0*5/2) //explosion is the obj size times this
//--unused-- ubyte Frame_processed[MAX_OBJECTS];
@ -840,7 +843,7 @@ int drop_powerup(int type, int id, int num, vms_vector *init_vel, vms_vector *po
return (-1);
#endif
}
objnum = obj_create( type, id, segnum, &new_pos, &vmd_identity_matrix, Powerup_info[id].size, CT_POWERUP, MT_PHYSICS, RT_POWERUP);
objnum = obj_create( OBJ_POWERUP, id, segnum, &new_pos, &vmd_identity_matrix, Powerup_info[id].size, CT_POWERUP, MT_PHYSICS, RT_POWERUP);
if (objnum < 0 ) {
Int3();