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

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

Browse source
This commit is contained in:
Kp 2012-11-11 22:12:51 +00:00
parent fcf216474b
commit 320d22aae1
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SConstruct
View file

@ -925,7 +925,7 @@ class DXXProgram(DXXCommon):
'main/automap.cpp',
'main/bm.cpp',
'main/cntrlcen.cpp',
'main/collide.c',
'main/collide.cpp',
'main/config.cpp',
'main/console.cpp',
'main/controls.cpp',

7
similar/main/collide.c → similar/main/collide.cpp
View file

@ -17,6 +17,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
*
*/
#include <algorithm>
#include <stdlib.h>
#include <stdio.h>
@ -72,6 +73,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "collide.h"
#include "escort.h"
using std::min;
#define WALL_DAMAGE_SCALE (128) // Was 32 before 8:55 am on Thursday, September 15, changed by MK, walls were hurting me more than robots!
#define WALL_DAMAGE_THRESHOLD (F1_0/3)
#define WALL_LOUDNESS_SCALE (20)
@ -1570,7 +1573,7 @@ static int do_boss_weapon_collision(object *robot, object *weapon, vms_vector *c
// Cause weapon to bounce.
// Make a copy of this weapon, because the physics wants to destroy it.
if (!Weapon_info[get_weapon_id(weapon)].matter) {
new_obj = obj_create(weapon->type, get_weapon_id(weapon), weapon->segnum, &weapon->pos,
new_obj = obj_create(OBJ_WEAPON, get_weapon_id(weapon), weapon->segnum, &weapon->pos,
&weapon->orient, weapon->size, weapon->control_type, weapon->movement_type, weapon->render_type);
if (new_obj != -1) {
@ -2040,7 +2043,7 @@ void drop_player_eggs(object *playerobj)
int max_count,i;
max_count = min(Players[pnum].secondary_ammo[PROXIMITY_INDEX], 12);
max_count = min(Players[pnum].secondary_ammo[PROXIMITY_INDEX], (unsigned short) 12);
for (i=0; i<max_count; i++)
call_object_create_egg(playerobj, 1, OBJ_POWERUP, POW_HOARD_ORB);
}