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

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

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

2
SConstruct
View file

@ -836,7 +836,7 @@ class DXXProgram(DXXCommon):
'main/gamerend.cpp',
'main/gamesave.cpp',
'main/gameseg.cpp',
'main/gameseq.c',
'main/gameseq.cpp',
'main/gauges.cpp',
'main/hostage.cpp',
'main/hud.cpp',

11
similar/main/gameseq.c → similar/main/gameseq.cpp
View file

@ -1775,7 +1775,7 @@ void StartNewLevelSub(int level_num, int page_in_textures, int secret_flag)
void bash_to_shield (int i,const char *s)
{
enum powerup_type_t type = get_powerup_id(&Objects[i]);
enum powerup_type_t type = (enum powerup_type_t) get_powerup_id(&Objects[i]);
PowerupsInMine[type]=MaxPowerupsAllowed[type]=0;
@ -1799,10 +1799,13 @@ static void filter_objects_from_level()
}
struct {
struct intro_movie_t {
int level_num;
char movie_name[FILENAME_LEN];
} intro_movie[] = { { 1,"pla"},
char movie_name[4];
};
static const intro_movie_t intro_movie[] = {
{ 1,"pla"},
{ 5,"plb"},
{ 9,"plc"},
{13,"pld"},