duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove all the C-compatibility stuff

Browse source
This commit is contained in:
Clownacy 2020-01-07 04:46:58 +00:00
parent 7f953924eb
commit 30968a626c
30 changed files with 0 additions and 240 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ArmsItem.h
View file

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

8
src/Back.h
View file

@ -2,10 +2,6 @@
#include "WindowsWrapper.h" #include "WindowsWrapper.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct BACK typedef struct BACK
{ {
BOOL flag; // Basically unused BOOL flag; // Basically unused
@ -24,7 +20,3 @@ BOOL InitBack(const char *fName, int type);
void ActBack(void); void ActBack(void);
void PutBack(int fx, int fy); void PutBack(int fx, int fy);
void PutFront(int fx, int fy); void PutFront(int fx, int fy);
#ifdef __cplusplus
}
#endif

8
src/Boss.h
View file

@ -2,10 +2,6 @@
#include "NpChar.h" #include "NpChar.h"
#ifdef __cplusplus
extern "C" {
#endif
#define BOSS_MAX 20 #define BOSS_MAX 20
extern NPCHAR gBoss[BOSS_MAX]; extern NPCHAR gBoss[BOSS_MAX];
@ -18,7 +14,3 @@ void SetBossCharActNo(int a);
void HitBossBullet(void); void HitBossBullet(void);
void ActBossChar(void); void ActBossChar(void);
void HitBossMap(void); void HitBossMap(void);
#ifdef __cplusplus
}
#endif

8
src/Bullet.h
View file

@ -2,10 +2,6 @@
#include "WindowsWrapper.h" #include "WindowsWrapper.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct BULLET typedef struct BULLET
{ {
int flag; int flag;
@ -73,7 +69,3 @@ void PutBullet(int fx, int fy);
void SetBullet(int no, int x, int y, int dir); void SetBullet(int no, int x, int y, int dir);
void ActBullet(void); void ActBullet(void);
BOOL IsActiveSomeBullet(void); BOOL IsActiveSomeBullet(void);
#ifdef __cplusplus
}
#endif

8
src/Caret.h
View file

@ -2,10 +2,6 @@
#include "WindowsWrapper.h" #include "WindowsWrapper.h"
#ifdef __cplusplus
extern "C" {
#endif
struct CARET_TABLE struct CARET_TABLE
{ {
int view_left; int view_left;
@ -34,7 +30,3 @@ void InitCaret(void);
void ActCaret(void); void ActCaret(void);
void PutCaret(int fx, int fy); void PutCaret(int fx, int fy);
void SetCaret(int x, int y, int code, int dir); void SetCaret(int x, int y, int code, int dir);
#ifdef __cplusplus
}
#endif

8
src/Dialog.h
View file

@ -2,15 +2,7 @@
#include "WindowsWrapper.h" #include "WindowsWrapper.h"
#ifdef __cplusplus
extern "C" {
#endif
INT_PTR __stdcall VersionDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); INT_PTR __stdcall VersionDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
INT_PTR __stdcall DebugMuteDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); INT_PTR __stdcall DebugMuteDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
INT_PTR __stdcall DebugSaveDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); INT_PTR __stdcall DebugSaveDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
INT_PTR __stdcall QuitDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); INT_PTR __stdcall QuitDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
#ifdef __cplusplus
}
#endif

8
src/Draw.h
View file

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

8
src/Ending.h
View file

@ -4,10 +4,6 @@
#include "CommonDefines.h" #include "CommonDefines.h"
#ifdef __cplusplus
extern "C" {
#endif
struct CREDIT struct CREDIT
{ {
long size; long size;
@ -57,7 +53,3 @@ int GetScriptNumber(const char *text);
void SetCreditIllust(int a); void SetCreditIllust(int a);
void CutCreditIllust(void); void CutCreditIllust(void);
int Scene_DownIsland(HWND hWnd, int mode); int Scene_DownIsland(HWND hWnd, int mode);
#ifdef __cplusplus
}
#endif

8
src/Fade.h
View file

@ -2,10 +2,6 @@
#include "WindowsWrapper.h" #include "WindowsWrapper.h"
#ifdef __cplusplus
extern "C" {
#endif
void InitFade(void); void InitFade(void);
void SetFadeMask(void); void SetFadeMask(void);
void ClearFade(void); void ClearFade(void);
@ -14,7 +10,3 @@ void StartFadeIn(signed char dir);
void ProcFade(void); void ProcFade(void);
void PutFade(void); void PutFade(void);
BOOL GetFadeActive(void); BOOL GetFadeActive(void);
#ifdef __cplusplus
}
#endif

8
src/Flags.h
View file

@ -2,10 +2,6 @@
#include "WindowsWrapper.h" #include "WindowsWrapper.h"
#ifdef __cplusplus
extern "C" {
#endif
extern unsigned char gFlagNPC[1000]; extern unsigned char gFlagNPC[1000];
extern unsigned char gSkipFlag[8]; extern unsigned char gSkipFlag[8];
@ -17,7 +13,3 @@ BOOL GetNPCFlag(long a);
void SetSkipFlag(long a); void SetSkipFlag(long a);
void CutSkipFlag(long a); void CutSkipFlag(long a);
BOOL GetSkipFlag(long a); BOOL GetSkipFlag(long a);
#ifdef __cplusplus
}
#endif

8
src/Flash.h
View file

@ -1,9 +1,5 @@
#pragma once #pragma once
#ifdef __cplusplus
extern "C" {
#endif
void InitFlash(void); void InitFlash(void);
void SetFlash(int x, int y, int mode); void SetFlash(int x, int y, int mode);
void ActFlash_Explosion(int flx, int fly); void ActFlash_Explosion(int flx, int fly);
@ -11,7 +7,3 @@ void ActFlash_Flash(void);
void ActFlash(int flx, int fly); void ActFlash(int flx, int fly);
void PutFlash(void); void PutFlash(void);
void ResetFlash(void); void ResetFlash(void);
#ifdef __cplusplus
}
#endif

8
src/Frame.h
View file

@ -1,9 +1,5 @@
#pragma once #pragma once
#ifdef __cplusplus
extern "C" {
#endif
typedef struct FRAME typedef struct FRAME
{ {
int x; int x;
@ -27,7 +23,3 @@ void SetFrameTargetBoss(int no, int wait);
void SetQuake(int time); void SetQuake(int time);
void SetQuake2(int time); void SetQuake2(int time);
void ResetQuake(void); void ResetQuake(void);
#ifdef __cplusplus
}
#endif

8
src/Game.h
View file

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

8
src/Generic.h
View file

@ -2,10 +2,6 @@
#include "WindowsWrapper.h" #include "WindowsWrapper.h"
#ifdef __cplusplus
extern "C" {
#endif
void GetCompileDate(int *year, int *month, int *day); void GetCompileDate(int *year, int *month, int *day);
BOOL GetCompileVersion(int *v1, int *v2, int *v3, int *v4); BOOL GetCompileVersion(int *v1, int *v2, int *v3, int *v4);
BOOL OpenVolumeConfiguration(HWND hWnd); BOOL OpenVolumeConfiguration(HWND hWnd);
@ -20,7 +16,3 @@ BOOL CenterWindow(HWND hWnd);
BOOL LoadWindowRect(HWND hWnd, const char *filename, BOOL unknown); BOOL LoadWindowRect(HWND hWnd, const char *filename, BOOL unknown);
BOOL SaveWindowRect(HWND hWnd, const char *filename); BOOL SaveWindowRect(HWND hWnd, const char *filename);
BOOL IsEnableBitmap(const char *path); BOOL IsEnableBitmap(const char *path);
#ifdef __cplusplus
}
#endif

8
src/KeyControl.h
View file

@ -1,9 +1,5 @@
#pragma once #pragma once
#ifdef __cplusplus
extern "C" {
#endif
enum KeyBind enum KeyBind
{ {
//The movement keys go in the order of left, right, up and down //The movement keys go in the order of left, right, up and down
@ -57,7 +53,3 @@ extern long gKeyRight;
extern long gKeyDown; extern long gKeyDown;
void GetTrg(void); void GetTrg(void);
#ifdef __cplusplus
}
#endif

8
src/Main.h
View file

@ -2,10 +2,6 @@
#include "WindowsWrapper.h" #include "WindowsWrapper.h"
#ifdef __cplusplus
extern "C" {
#endif
extern char gModulePath[MAX_PATH]; extern char gModulePath[MAX_PATH];
extern char gDataPath[MAX_PATH]; extern char gDataPath[MAX_PATH];
@ -16,7 +12,3 @@ void PutFramePerSecound(void);
unsigned long GetFramePerSecound(void); unsigned long GetFramePerSecound(void);
BOOL SystemTask(void); BOOL SystemTask(void);
#ifdef __cplusplus
}
#endif

8
src/Map.h
View file

@ -2,10 +2,6 @@
#include "WindowsWrapper.h" #include "WindowsWrapper.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct MAP_DATA typedef struct MAP_DATA
{ {
unsigned char *data; unsigned char *data;
@ -29,7 +25,3 @@ BOOL ChangeMapParts(int x, int y, unsigned char no);
void PutStage_Back(int fx, int fy); void PutStage_Back(int fx, int fy);
void PutStage_Front(int fx, int fy); void PutStage_Front(int fx, int fy);
void PutMapDataVector(int fx, int fy); void PutMapDataVector(int fx, int fy);
#ifdef __cplusplus
}
#endif

8
src/MapName.h
View file

@ -2,15 +2,7 @@
#include "WindowsWrapper.h" #include "WindowsWrapper.h"
#ifdef __cplusplus
extern "C" {
#endif
void ReadyMapName(const char *str); void ReadyMapName(const char *str);
void PutMapName(BOOL bMini); void PutMapName(BOOL bMini);
void StartMapName(void); void StartMapName(void);
void RestoreMapName(void); void RestoreMapName(void);
#ifdef __cplusplus
}
#endif

8
src/MiniMap.h
View file

@ -2,17 +2,9 @@
#include "WindowsWrapper.h" #include "WindowsWrapper.h"
#ifdef __cplusplus
extern "C" {
#endif
extern char gMapping[0x80]; extern char gMapping[0x80];
int MiniMapLoop(void); int MiniMapLoop(void);
BOOL IsMapping(void); BOOL IsMapping(void);
void StartMapping(void); void StartMapping(void);
void SetMapping(int a); void SetMapping(int a);
#ifdef __cplusplus
}
#endif

8
src/MyChar.h
View file

@ -2,10 +2,6 @@
#include "WindowsWrapper.h" #include "WindowsWrapper.h"
#ifdef __cplusplus
extern "C" {
#endif
// TODO - When I add bitmask constants for gMC.flags... // TODO - When I add bitmask constants for gMC.flags...
// 0x100 is a 'player is underwater' flag // 0x100 is a 'player is underwater' flag
@ -87,7 +83,3 @@ void SetNoise(int no, int freq);
void CutNoise(void); void CutNoise(void);
void ResetNoise(void); void ResetNoise(void);
void SleepNoise(void); void SleepNoise(void);
#ifdef __cplusplus
}
#endif

8
src/MycParam.h
View file

@ -2,10 +2,6 @@
#include "WindowsWrapper.h" #include "WindowsWrapper.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct ARMS_LEVEL typedef struct ARMS_LEVEL
{ {
int exp[3]; int exp[3];
@ -34,7 +30,3 @@ void PutMyAir(int x, int y);
void PutTimeCounter(int x, int y); void PutTimeCounter(int x, int y);
BOOL SaveTimeCounter(void); BOOL SaveTimeCounter(void);
int LoadTimeCounter(void); int LoadTimeCounter(void);
#ifdef __cplusplus
}
#endif

8
src/NpChar.h
View file

@ -5,10 +5,6 @@
#include "Draw.h" #include "Draw.h"
#ifdef __cplusplus
extern "C" {
#endif
#define NPC_MAX 0x200 #define NPC_MAX 0x200
enum NPCCond enum NPCCond
@ -144,7 +140,3 @@ void GetNpCharPosition(int *x, int *y, int i);
BOOL IsNpCharCode(int code); BOOL IsNpCharCode(int code);
BOOL GetNpCharAlive(int code_event); BOOL GetNpCharAlive(int code_event);
int CountAliveNpChar(void); int CountAliveNpChar(void);
#ifdef __cplusplus
}
#endif

8
src/Organya.h
View file

@ -9,10 +9,6 @@
#include "WindowsWrapper.h" #include "WindowsWrapper.h"
#ifdef __cplusplus
extern "C" {
#endif
#define MAXTRACK 16 #define MAXTRACK 16
#define MAXMELODY 8 #define MAXMELODY 8
#define MAXDRAM 8 #define MAXDRAM 8
@ -31,7 +27,3 @@ void StopOrganyaMusic(void);
void SetOrganyaFadeout(void); void SetOrganyaFadeout(void);
BOOL StartOrganya(LPDIRECTSOUND lpDS, const char *wave_filename); BOOL StartOrganya(LPDIRECTSOUND lpDS, const char *wave_filename);
void EndOrganya(void); void EndOrganya(void);
#ifdef __cplusplus
}
#endif

8
src/PixTone.h
View file

@ -2,10 +2,6 @@
#include "WindowsWrapper.h" #include "WindowsWrapper.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct PIXTONEPARAMETER2 typedef struct PIXTONEPARAMETER2
{ {
int model; int model;
@ -32,7 +28,3 @@ typedef struct PIXTONEPARAMETER
void MakeWaveTables(void); void MakeWaveTables(void);
BOOL MakePixelWaveData(const PIXTONEPARAMETER *ptp, unsigned char *pData); BOOL MakePixelWaveData(const PIXTONEPARAMETER *ptp, unsigned char *pData);
#ifdef __cplusplus
}
#endif

8
src/Profile.h
View file

@ -6,10 +6,6 @@
#include "SelStage.h" #include "SelStage.h"
#include "Stage.h" #include "Stage.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct PROFILE typedef struct PROFILE
{ {
char code[8]; char code[8];
@ -39,7 +35,3 @@ BOOL IsProfile(void);
BOOL SaveProfile(const char *name); BOOL SaveProfile(const char *name);
BOOL LoadProfile(const char *name); BOOL LoadProfile(const char *name);
BOOL InitializeGame(HWND hWnd); BOOL InitializeGame(HWND hWnd);
#ifdef __cplusplus
}
#endif

8
src/SelStage.h
View file

@ -2,10 +2,6 @@
#include "WindowsWrapper.h" #include "WindowsWrapper.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct PERMIT_STAGE typedef struct PERMIT_STAGE
{ {
int index; int index;
@ -20,7 +16,3 @@ BOOL SubPermitStage(int index);
void MoveStageSelectCursor(void); void MoveStageSelectCursor(void);
void PutStageSelectObject(void); void PutStageSelectObject(void);
int StageSelectLoop(int *p_event); int StageSelectLoop(int *p_event);
#ifdef __cplusplus
}
#endif

8
src/Sound.h
View file

@ -11,10 +11,6 @@
#include "PixTone.h" #include "PixTone.h"
#ifdef __cplusplus
extern "C" {
#endif
#define SE_MAX 160 // According to the Organya source code release, this is the real name for this constant #define SE_MAX 160 // According to the Organya source code release, this is the real name for this constant
enum SoundEffectNames enum SoundEffectNames
@ -46,7 +42,3 @@ void ChangeSoundFrequency(int no, DWORD rate);
void ChangeSoundVolume(int no, long volume); void ChangeSoundVolume(int no, long volume);
void ChangeSoundPan(int no, long pan); void ChangeSoundPan(int no, long pan);
int MakePixToneObject(const PIXTONEPARAMETER *ptp, int ptp_num, int no); int MakePixToneObject(const PIXTONEPARAMETER *ptp, int ptp_num, int no);
#ifdef __cplusplus
}
#endif

8
src/Stage.h
View file

@ -2,10 +2,6 @@
#include "WindowsWrapper.h" #include "WindowsWrapper.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef enum MusicID typedef enum MusicID
{ {
MUS_SILENCE = 0x0, MUS_SILENCE = 0x0,
@ -70,7 +66,3 @@ extern MusicID gMusicNo;
BOOL TransferStage(int no, int w, int x, int y); BOOL TransferStage(int no, int w, int x, int y);
void ChangeMusic(MusicID no); void ChangeMusic(MusicID no);
void ReCallMusic(void); void ReCallMusic(void);
#ifdef __cplusplus
}
#endif

8
src/Star.h
View file

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

8
src/TextScr.h
View file

@ -2,10 +2,6 @@
#include "WindowsWrapper.h" #include "WindowsWrapper.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct TEXT_SCRIPT typedef struct TEXT_SCRIPT
{ {
// Path (reload when exit teleporter menu/inventory) // Path (reload when exit teleporter menu/inventory)
@ -68,7 +64,3 @@ void StopTextScript(void);
void PutTextScript(void); void PutTextScript(void);
int TextScriptProc(void); int TextScriptProc(void);
void RestoreTextScript(void); void RestoreTextScript(void);
#ifdef __cplusplus
}
#endif