Made Star.cpp compile as C89 in VS2003

I hope this doesn't get *too* invasive.
This commit is contained in:
Clownacy 2020-01-06 18:39:23 +00:00
parent f36fc61de3
commit b5ad6f5154
9 changed files with 63 additions and 9 deletions

View file

@ -2,6 +2,10 @@
#include "WindowsWrapper.h"
#ifdef __cplusplus
extern "C" {
#endif
// "Arms" is a synonym of "weapon" here
// "Code" means "ID" here
// "Num" often means "ammo" here
@ -110,3 +114,7 @@ int RotationArmsRev(void);
/// Change the current weapon to be the first one and play the usual rotation animation
void ChangeToFirstArms(void);
#ifdef __cplusplus
}
#endif

View file

@ -2,7 +2,11 @@
#include "WindowsWrapper.h"
struct BULLET
#ifdef __cplusplus
extern "C" {
#endif
typedef struct BULLET
{
int flag;
int code_bullet;
@ -36,9 +40,9 @@ struct BULLET
int back;
int bottom;
} view;
};
} BULLET;
struct BULLET_TABLE
typedef struct BULLET_TABLE
{
signed char damage;
signed char life;
@ -55,7 +59,7 @@ struct BULLET_TABLE
int back;
int bottom;
} view;
};
} BULLET_TABLE;
#define BULLET_MAX 0x40
extern BULLET gBul[BULLET_MAX];
@ -69,3 +73,7 @@ void PutBullet(int fx, int fy);
void SetBullet(int no, int x, int y, int dir);
void ActBullet(void);
BOOL IsActiveSomeBullet(void);
#ifdef __cplusplus
}
#endif

View file

@ -2,6 +2,10 @@
#include "WindowsWrapper.h"
#ifdef __cplusplus
extern "C" {
#endif
#ifndef RGB
#define RGB(r,g,b) ((r) | ((g) << 8) | ((b) << 16))
#endif
@ -70,3 +74,7 @@ void InitTextObject(const char *font_name);
void PutText(int x, int y, const char *text, unsigned long color);
void PutText2(int x, int y, const char *text, unsigned long color, SurfaceID surf_no);
void EndTextObject(void);
#ifdef __cplusplus
}
#endif

View file

@ -2,6 +2,10 @@
#include "WindowsWrapper.h"
#ifdef __cplusplus
extern "C" {
#endif
enum GameFlagsValues
{
// To be continued
@ -33,3 +37,7 @@ int Random(int min, int max);
void PutNumber4(int x, int y, int value, BOOL bZero);
BOOL Game(HWND hWnd);
#ifdef __cplusplus
}
#endif

View file

@ -2,10 +2,14 @@
#include "WindowsWrapper.h"
#ifdef __cplusplus
extern "C" {
#endif
// TODO - When I add bitmask constants for gMC.flags...
// 0x100 is a 'player is underwater' flag
struct MYCHAR
typedef struct MYCHAR
{
unsigned char cond;
unsigned int flag;
@ -59,7 +63,7 @@ struct MYCHAR
signed char ques; // Same for this variable as well
signed char boost_sw;
int boost_cnt;
};
} MYCHAR;
extern MYCHAR gMC;
@ -83,3 +87,7 @@ void SetNoise(int no, int freq);
void CutNoise(void);
void ResetNoise(void);
void SleepNoise(void);
#ifdef __cplusplus
}
#endif

View file

@ -119,14 +119,14 @@ void ActStar(void)
void PutStar(int fx, int fy)
{
int i;
RECT rc[3] = {
{192, 0, 200, 8},
{192, 8, 200, 16},
{192, 16, 200, 24},
};
int i;
if (gMC.cond & 2)
return;

View file

@ -1,5 +1,13 @@
#pragma once
#ifdef __cplusplus
extern "C" {
#endif
void InitStar(void);
void ActStar(void);
void PutStar(int fx, int fy);
#ifdef __cplusplus
}
#endif

View file

@ -324,6 +324,12 @@
</File>
<File
RelativePath="..\src\Star.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
CompileAs="1"/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\TextScr.cpp">