Commit graph

498 commits

Author SHA1 Message Date
Clownacy
3039e3b846 Link to the actual source code for Organya.cpp and Sound.cpp 2019-06-17 17:03:54 +00:00
Clownacy
f9b498c51c
Merge pull request #37 from GabrielRavier/feature/improveOToR
Improve O to R
2019-06-17 15:48:46 +00:00
Gabriel Ravier
a89d97846c
Fixed brace initilizers to not have spaces at the start and end
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-06-14 21:22:45 +02:00
Gabriel Ravier
11e25b5aa5
Fixed indentation by using spaces instead of tabs when appropriate
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-06-14 20:56:48 +02:00
Gabriel Ravier
00fdea492f
Merge branch 'master' into feature/improveOToR 2019-06-14 20:33:26 +02:00
Gabriel Ravier
4ab849f4ef
Merge branch 'master' into feature/improveNonNpcCharNpcFiles 2019-06-14 20:33:23 +02:00
Clownacy
078da6ccf7 Correct fmod usage 2019-06-14 17:06:42 +01:00
Gabriel Ravier
fd83c08c9c
Added newline at end of NpcHit.cpp
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-06-14 17:50:07 +02:00
Gabriel Ravier
16e66971d5
Reformatted Profile.cpp
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-06-14 16:54:43 +02:00
Gabriel Ravier
5ccb7dfa93
Reformatted Pixtone.cpp
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-06-14 16:52:53 +02:00
Gabriel Ravier
473bd43ca7
Reformatted Organya.cpp
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-06-14 16:51:49 +02:00
Gabriel Ravier
3a80d8f4fb
Did initial sweep with regexes
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-14 16:49:32 +02: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
44094b103e <SDL.h> -> "SDL.h"
The SDL devs recommend this:
https://wiki.libsdl.org/FAQDevelopment#Do_I_.23include_.3CSDL.h.3E_or_.3CSDL.2FSDL.h.3E.3F
2019-06-06 18:51:44 +00: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
0fb147aa0d Change the sound buffer size to a power of 2
Turns out giving SDL2 a non-power-of-2 buffer size crashes it in
Emscripten.
2019-05-29 18:49:09 +00:00
Clownacy
d2b5872c95 Weeded out some bool usage
Cave Story was written in C89. No bools. I've left in Sound.cpp's
though, since that's written in C++98 currently.
2019-05-24 10:07:30 +01:00
Clownacy
5b89a31976 Split bin2h to its own CMake file
Also added warnings to its part of the Makefile
2019-05-23 19:42:52 +01:00
Clownacy
43958d2771 ...For real, this time 2019-05-23 14:28:44 +00:00
Clownacy
a4248b13e2 Fix broken stage centring 2019-05-23 14:15:30 +00:00
Clownacy
d1b71b9fce Add some more widescreen/tallscreen fixes to Frame.cpp
Like I said in the TODO, this *really* needs to be moved to the
enhanced branch
2019-05-23 14:04:21 +00:00
Clownacy
aa44e7ca49 Reduce the size of bin2h-generated .h files
The Japanese font went from 50MB to 25MB.
2019-05-21 16:56:44 +01:00
Clownacy
fcaddc6252 Added a missing #include to Draw.cpp 2019-05-20 15:03:15 +01:00
Clownacy
57b37e84de
Merge pull request #35 from GabrielRavier/feature/improveNpcAct
Improve NpcAct files
2019-05-16 10:31:52 +00:00
Gabriel Ravier
a312be2b4b
Cleaned up NpcAct340.cpp 2019-05-16 08:25:53 +02:00
Gabriel Ravier
c247de7686
Cleaned up NpcAct320.cpp 2019-05-16 08:21:52 +02:00
Gabriel Ravier
e5b499ee67
Cleaned up NpcAct300.cpp 2019-05-16 08:18:12 +02:00
Gabriel Ravier
f1048b21aa
Cleaned up NpcAct280.cpp 2019-05-16 08:11:17 +02:00
Gabriel Ravier
1e6ee2d6ba
Corrected stupid error in NpcAct260.cpp
Also changed regex to "((//|\;)[^ \t\n]|(for|while|if|while|do|void|int|bool)\((for|while|if|while|do)\ \(.*\)\|//\ [a-z]|\ \ )|break;\n[\t]*case|\ \)|\(\ "

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-16 08:03:45 +02:00
Gabriel Ravier
c64110cf05
Cleaned up NpcAct260.cpp
Also changed regex to "((//|\;)[^ \t\n]|(for|while|if|while|do|void|int|bool)\((for|while|if|while|do)\ \(.*\)\|\ \)|\(\ |//\ [a-z]|\ \ )|break;\n[\t]*case"
2019-05-16 07:20:01 +02:00
Gabriel Ravier
33071564a3
Started cleaning up NpcAct260.cpp 2019-05-15 21:42:20 +02:00
Gabriel Ravier
1588fab110
Clean up NpcAct240.cpp 2019-05-15 21:28:38 +02:00
Gabriel Ravier
6c5aea8a2c
Cleaned up NpcAct220.cpp 2019-05-15 21:18:34 +02:00
Gabriel Ravier
5412390860
Cleaned up NpcAct200.cpp 2019-05-15 21:08:23 +02:00
Gabriel Ravier
6d462c6fc6
Clean up NpcAct180.cpp 2019-05-15 19:36:45 +02:00
Gabriel Ravier
edaf94f3c2
Cleaned up NpcAct160.cpp 2019-05-15 19:20:22 +02:00
Clownacy
b49d3acf2c
Merge pull request #32 from GabrielRavier/makeFlagsMacros
Make some of the Flags.cpp stuff simpler
2019-05-15 15:49:54 +00:00
Gabriel Ravier
0e0cbf9409
Simplify a comment in Flags.cpp
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-15 17:46:14 +02:00
Gabriel Ravier
92a2327187
Removed BIT macros in Flags.cpp
Just directly define the FLAG macros as those
2019-05-15 13:25:13 +02:00
Gabriel Ravier
fc57b8e607
Cleaned up NpcAct140.cpp 2019-05-15 13:19:16 +02:00
Gabriel Ravier
ccb37e12b1
Remove space before commented out code
ಠ_ಠ

Co-Authored-By: Clownacy <Clownacy@users.noreply.github.com>
2019-05-14 11:22:38 +02:00
Gabriel Ravier
601e511bff
Did formatting for NpcAct120.cpp 2019-05-14 09:40:56 +02:00
Gabriel Ravier
9b3b7039da
Did formatting for NpcAct100.cpp
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-14 09:31:34 +02:00
Gabriel Ravier
06a7e86c63
Corrected formatting in NpcAct080.cpp
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-14 08:54:03 +02:00
Gabriel Ravier
57767f338e
More formatting stuff
Also "Mahin the sex god" 😂

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-14 08:50:22 +02:00
Gabriel Ravier
c596abdad5
Changed "init" to "Initialize" 2019-05-14 08:46:23 +02:00
Gabriel Ravier
cc9fbbd1c0
Corrected formatting in NpcAct040.cpp 2019-05-14 08:44:46 +02:00
Gabriel Ravier
e8cacce5e7
Did formatting stuff in NpcAct020.cpp 2019-05-14 08:41:08 +02:00
Gabriel Ravier
45fb8940af
Correct style in Font.cpp
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-14 08:24:52 +02:00