Commit graph

86 commits

Author SHA1 Message Date
Clownacy
7b1661dcf9 Merge branch 'accurate' into portable 2020-09-04 01:00:17 +01:00
Clownacy
5579c57738 Remove some explicit array sizes
These are just annoying, and chances are the source code never did
this.

I might just remove *all* of these at some point.
2020-09-04 00:54:23 +01:00
Clownacy
9cbaa0be00 Merge branch 'accurate' into portable 2020-01-08 13:16:21 +00:00
Clownacy
718cb714ee More-accurate NpcTbl.cpp variable arrangement
For some reason, the Linux debug data notes a 2000-line gap before
any declarations. Might be the SDL header or something.
2020-01-07 20:58:46 +00:00
Clownacy
0ec5d85d56 Merge branch 'accurate' into portable 2019-11-17 18:30:44 +00:00
Clownacy
262fcfbaa3 Clean-up Generic.cpp
Also applied some windows.h constants over raw values
2019-11-15 19:44:44 +00:00
Clownacy
696df90d19 Clean-up NpcTbl.cpp
Also added a TODO
2019-11-14 02:04:03 +00:00
Clownacy
4e50046d4b Remove WINDOWS and NONPORTABLE
Now that the portable stuff gets its own branch, these are unneeded
2019-09-04 02:14:15 +01:00
Clownacy
73e18b4610 Removed the WINDOWS and NONPORTABLE stuff
Now that all the ASM-accurate stuff is in its own branch, we don't
need these anymore.
2019-09-04 00:54:11 +01:00
Clownacy
5ea356a3bd Weed out a lot of the Windows dependency
Storytime: Cucky's original SDL2 port work involved using SDL2's
threading API to emulate the original WinAPI threading.

I can't be assed with that stuff, so I used the same trick Cucky did
for the Wii port, and hooked Organya up to the SDL2 audio callback.
This actually opens up the possibility for perfectly-synchronised
Organya playback. By that I mean, instead of needing a super
low-latency audio callback, I can have the callback synchronise its
audio mixing with Organya itself. I haven't done it yet, I plan to
soon.
2019-09-04 00:28:23 +01:00
Clownacy
35344c5f4f Fixes
What is it with Pixel's official code, and relying on non-standard
stuff? Even his PxTone library had portability issues.
2019-09-02 02:02:25 +01:00
Clownacy
42765792bc Shut up some warnings 2019-07-31 04:41:46 +00:00
Gabriel Ravier
e8c7daca35
Reverted capitalization of struct member names
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-06-14 08:37:49 +02:00
Gabriel Ravier
06e65cad6e
Revamped NpChar, NpcHit and NpcTbl
Also changed regex to "((//|\;)[^
\t\n]|(for|while|if|while|do|void|int|bool)\((for|while|if|while|do)\
\(.*\)\;|\(\ |\ \)|//\ [a-z]|\ \ )|break;\n[\t]*[^\n\t\}(\/\/
Fallthrough]|[^\t\n]\{[^\n]|[^\n\t]\}[^\n]"

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-06-13 20:39:46 +02:00
Clownacy
c80b593a3f Some #include fixes
Finally figured out how to get include-what-you-use working
2019-06-06 18:44:28 +00:00
Clownacy
260d245e4c Made NpcTbl.cpp ASM-accurate 2019-05-07 20:59:25 +01:00
Gabriel Ravier
960fa6f456 Removed all trailing spaces and added newline at EOF (when not present)
Also changed a "linux" to "Linux"

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-07 11:55:42 +02:00
Clownacy
0bb9760d87 Rearranged #includes 2019-02-18 21:30:22 +00:00
Clownacy
c44186d93a Ditched SDL's file IO for stdio and our own convenience functions
ASM-accurate file stuff can come later.
2019-02-15 20:33:08 +00:00
Clownacy
8eecbaff3c All NPCs done 2019-02-09 22:45:21 +00:00
Clownacy
f45a0adb29 Merge branch 'master' of https://github.com/cuckydev/Cave-Story-Engine-2 2019-02-09 20:38:35 +00:00
Clownacy
22ccaf76b0 Hell NPCs 2019-02-09 20:36:59 +00:00
cuckydev
4bbc2fa779 wide fix credit stuf 2019-02-09 13:23:51 -05:00
Clownacy
3934705d3f More NPCs 2019-02-09 13:44:19 +00:00
cuckydev
97b8a3b4a2 Fortnite 2019-02-08 18:29:55 -05:00
Clownacy
26bcbdbef7 Added more NPCs
Now with Muscle Doctor
2019-02-08 21:30:08 +00:00
Clownacy
88947cd016 More NPCs 2019-02-08 18:46:10 +00:00
Clownacy
7a97c2c938 More NPCs 2019-02-08 16:38:32 +00:00
Clownacy
b5ebf7a54f More NPCs 2019-02-08 00:24:03 +00:00
Clownacy
c0f29fac7b More NPCs 2019-02-07 22:48:24 +00:00
Clownacy
3306316162 More NPCs, and added the Sisters 2019-02-07 20:45:53 +00:00
Clownacy
2e16660a5a Added NPCs for the destroyed Egg Corridor 2019-02-07 17:02:11 +00:00
Clownacy
aa08331c36 Added IronHead and relevant NPCs
Also added the AMJ TSC command, so getting the Spur works
2019-02-07 15:10:46 +00:00
Clownacy
f47f036e36 Added Core and more NPCs 2019-02-07 14:08:53 +00:00
cuckydev
9e62a6d814 added core npc stuff 2019-02-06 22:26:42 -05:00
Clownacy
66d9de1572 More NPCs 2019-02-06 22:46:28 +00:00
Clownacy
613d2262b4 More NPCs 2019-02-06 22:26:14 +00:00
Clownacy
517d39533a More NPCs 2019-02-06 21:23:16 +00:00
Clownacy
e4c520bb7c Added NPC334 (sweat) 2019-02-06 20:18:19 +00:00
Clownacy
c0120068d3 Added more NPCs, and the TAM TSC command 2019-02-06 20:02:53 +00:00
Clownacy
e5c40c5163 More NPCs 2019-02-06 10:34:37 +00:00
Clownacy
bb78f44a2f Added Labyrinth NPCs 2019-02-06 09:44:29 +00:00
Clownacy
916e835b1f Added more NPCs 2019-02-06 00:13:47 +00:00
Clownacy
e1d8d30d3c Added the NPCs for the first room of the Labyrinth 2019-02-05 23:34:20 +00:00
Clownacy
ee88e805b3 Fix some errors and prevent some GCC warnings 2019-02-05 22:51:44 +00:00
Clownacy
593995d410 Added more NPCs
That should be Sand Zone done.
2019-02-05 18:49:21 +00:00
Clownacy
528f775387 Completed Curly boss fight 2019-02-05 12:28:58 +00:00
Clownacy
91a7c0185c Added more NPCs
Started on Sand Zone NPCs
2019-02-04 21:16:41 +00:00
Clownacy
37dcdcda34 More NPCs 2019-02-04 20:00:05 +00:00
Clownacy
c29543001d Added more NPCs and Balfrog 2019-02-04 18:58:30 +00:00