shithub: cstory

Info  •  Files  •  Log  •  Branches

Merge branch 'accurate' into portable

--- a/src/BossFrog.cpp

+++ b/src/BossFrog.cpp

@@ -1,5 +1,7 @@

 #include "BossFrog.h"

+#include <stddef.h>

+

 #include "WindowsWrapper.h"

 #include "Boss.h"

--- a/src/BossIronH.cpp

+++ b/src/BossIronH.cpp

@@ -1,5 +1,7 @@

 #include "BossIronH.h"

+#include <stddef.h>

+

 #include "WindowsWrapper.h"

 #include "Boss.h"

--- a/src/BossPress.cpp

+++ b/src/BossPress.cpp

@@ -1,5 +1,7 @@

 #include "BossPress.h"

+#include <stddef.h>

+

 #include "WindowsWrapper.h"

 #include "Boss.h"

--- a/src/BossTwinD.cpp

+++ b/src/BossTwinD.cpp

@@ -1,5 +1,7 @@

 #include "BossTwinD.h"

+#include <stddef.h>

+

 #include "WindowsWrapper.h"

 #include "Boss.h"

--- a/src/BulHit.cpp

+++ b/src/BulHit.cpp

@@ -1,5 +1,7 @@

 #include "BulHit.h"

+#include <stddef.h>

+

 #include "Bullet.h"

 #include "Caret.h"

 #include "Game.h"

--- a/src/Bullet.cpp

+++ b/src/Bullet.cpp

@@ -1,5 +1,6 @@

 #include "Bullet.h"

+#include <stddef.h>

 #include <string.h>

 #include "WindowsWrapper.h"

--- a/src/Draw.cpp

+++ b/src/Draw.cpp

@@ -569,7 +569,7 @@

 // Dummied-out log function

 // According to the Mac port, its name really is just "out".

-static BOOL out(int unknown)

+BOOL out(int unknown)

 {

 	char unknown2[0x100];

 	int unknown3;

--- a/src/Ending.cpp

+++ b/src/Ending.cpp

@@ -1,5 +1,6 @@

 #include "Ending.h"

+#include <stddef.h>

 #include <stdio.h>

 #include <stdlib.h>

 #include <string.h>

--- a/src/MyChar.cpp

+++ b/src/MyChar.cpp

@@ -1,5 +1,6 @@

 #include "MyChar.h"

+#include <stddef.h>

 #include <string.h>

 #include "WindowsWrapper.h"

--- a/src/MycParam.cpp

+++ b/src/MycParam.cpp

@@ -1,5 +1,6 @@

 #include "MycParam.h"

+#include <stddef.h>

 #include <stdio.h>

 #include <string>

--- a/src/NpcAct120.cpp

+++ b/src/NpcAct120.cpp

@@ -1,5 +1,6 @@

 #include "NpcAct.h"

+#include <stddef.h>

 #include <stdio.h>

 #include "WindowsWrapper.h"

--- a/src/NpcAct240.cpp

+++ b/src/NpcAct240.cpp

@@ -1,5 +1,7 @@

 #include "NpcAct.h"

+#include <stddef.h>

+

 #include "WindowsWrapper.h"

 #include "Caret.h"

--- a/src/TextScr.cpp

+++ b/src/TextScr.cpp

@@ -1,5 +1,6 @@

 #include "TextScr.h"

+#include <stddef.h>

 #include <stdio.h>

 #include <stdlib.h>

 #include <string.h>

-- 

⑨