Commit graph

1544 commits

Author SHA1 Message Date
Clownacy
17d2c379cd Restore an old workaround from the original portable branch
This can be removed when MSYS2 stops being garbage, and fixes this
upstream.

See https://github.com/msys2/MINGW-packages/issues/4004
2019-09-20 15:47:02 +00:00
Gabriel Ravier
79d8e175a2
Documented some variables and macro-ed some stuff
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-19 10:30:14 +02:00
Gabriel Ravier
6a9abb9a0d
Moar commenting of stuff and macro-ing of certain things
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-18 08:29:20 +02:00
Gabriel Ravier
372872eeea
Some comments and a FIX_BUGS
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-17 11:54:00 +02:00
Gabriel Ravier
38a00ec88a
More tabs to spaces for trailing comments
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-17 11:09:29 +02:00
Gabriel Ravier
3a837a1090
Commented some code
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-17 11:04:30 +02:00
Gabriel Ravier
4766172c3b
Replaced tabs before comments with spaces, shortened a few lines and formatted some switches
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-17 10:48:05 +02:00
Gabriel Ravier
6ffc8d7429
Shorten long line
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-17 10:31:07 +02:00
Gabriel Ravier
f2a2b3fd0c
Commented some func decls in ArmsItem.h and changed a "32" to "0x20" in the cpp
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-17 10:25:18 +02:00
Gabriel Ravier
9bb916e99d
Set PutCampObject as static and commented some func decls
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-17 09:56:33 +02:00
Clownacy
b6f8bf68ec Minor audio backend cleanup 2019-09-16 23:08:05 +00:00
Gabriel Ravier
358423aa38
Some nice commenting and reordering of stuff and staticing of stuff
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-16 15:30:38 +02:00
Clownacy
602315fa39 Deobfuscate a value without affecting ASM
Doing 'fx / 32 / 0x200' produces different assembly.
2019-09-15 18:46:52 +01:00
Clownacy
bc5a9b2d9f These macros produced inaccurate assembly 2019-09-15 18:44:03 +01:00
Clownacy
a55361ec2c
Merge pull request #54 from GabrielRavier/commentBalfrog
Comment BossFrog
2019-09-15 18:43:42 +01:00
Gabriel Ravier
cc4de5e44c
Remove NPC utility macros
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-15 18:16:46 +02:00
Clownacy
f099e0694d Enable optimisations in the VS2017 project
Honestly, it might be worth remaking the VS2017 project from scratch:
the current one is just a conversion of the VS2003 one, so a lot of
VS2017's new options are just blank. If it's remade from scratch,
we'll get the defaults instead.
2019-09-15 15:41:56 +01:00
Gabriel Ravier
c68923fdd5
Corrected erroneous "PIXELS_TO_UNITS(24)"s to "PIXELS_TO_UNITS(20)"s
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-15 16:13:13 +02:00
Gabriel Ravier
c9517bffc4
Un-abbreviated "SPRITE" from "SPRT" in sprite macro names
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-15 16:10:46 +02:00
Gabriel Ravier
0cf2a20a9a
Corrected erroneous PIXELS_TO_UNITS(32) to PIXELS_TO_UNITS(16)
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-15 16:07:03 +02:00
Gabriel Ravier
9e5e2a0e26
Indented some comments
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-15 16:05:24 +02:00
Gabriel Ravier
002e0f7760
Changed erroneous "=" to "+="
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-15 16:00:06 +02:00
Gabriel Ravier
58a02a609c
Defined TILES_TO_UNITS and UNITS_TO_TILES in terms of TILES_TO_PIXELS, PIXELS_TO_TILES, PIXELS_TO_UNITS and UNITS_TO_PIXELS
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-15 15:58:04 +02:00
Gabriel Ravier
04113870a5
Removed tiles comments when useless
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-15 15:51:32 +02:00
Gabriel Ravier
6eadf6c4a5
Changed view stuff to be measured in pixels, not tiles
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-15 14:16:44 +02:00
Gabriel Ravier
08131d527a
Converted hitbox measurements to pixels
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-15 14:12:35 +02:00
Gabriel Ravier
4070f1b972
Changed some stuff to conform to Clownacy's PR review
Changed BalfrogAnims to BalfrogSprites
Changed BALFANI_[name] to BALFROG_SPRT_[name]
Changed -[macro](val) to [macro](-val)

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-15 10:58:55 +02:00
Gabriel Ravier
0d833b38a8
Prevent some annoying warnings popping up everywhere
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-15 10:50:46 +02:00
Gabriel Ravier
fcc1e3cc23
Added some common macro utilities used by most NPCs
I'm pretty sure Pixel didn't actually use macros for this but I don't think just having this kind of stuff copied around everywhere is really great either

Forgot to commit and push this yesterday

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-15 10:48:18 +02:00
Gabriel Ravier
041bd0e5f9
Used doubles for TILES_TO_UNITS weirdly written stuff
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-14 20:47:28 +02:00
Gabriel Ravier
ac498c2be4
After intense debate with Cucky and BLink, ended up changing "PIXELS_TO_UNITS(3) - 1" to "0x5FF"
🙄

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-14 20:07:35 +02:00
Gabriel Ravier
e2c57e6dbc
Alphabetized macros in BossFrog and re-ordered some stuff to go along with Clownacy's coding standards
Also changed NPC_NULL_DELETES_ITSELF to NPC_DAMAGE_TEXT_HOLDER as Fayti pointed out the misnomer

Note to self : Make a PR with coding standards

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-13 20:35:37 +02:00
Gabriel Ravier
aeb1e292b7
Merge branch 'accurate' into commentBalfrog 2019-09-13 19:01:03 +02:00
Gabriel Ravier
8329ec2d16
Merge branch 'accurate' of https://github.com/GabrielRavier/Cave-Story-Engine-2 into accurate 2019-09-13 19:00:32 +02:00
Gabriel Ravier
9bef4b1d49
Commented BossFrog entirely
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-13 18:49:17 +02:00
Clownacy
69292f99f6 Add a new bugfix 2019-09-12 14:50:06 +00:00
Gabriel Ravier
861064bf12
Started improving on balfrog.cpp
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-12 16:47:14 +02:00
Clownacy
5c040608cb
Merge pull request #53 from GabrielRavier/betterCMakeMessages
Improve some comments and the option message for the renderer in the CMakeLists.txts
2019-09-11 18:03:37 +01:00
Clownacy
182f11f017 Fix controller support
Pressing up or down wouldn't work.
2019-09-11 17:51:20 +00:00
Gabriel Ravier
c9b248ba64
Removed space before ':' and re-added comma before or
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-11 19:01:36 +02:00
Clownacy
09ed7a9a9f Capitalise the readme's title suffix 2019-09-11 13:10:19 +00:00
Clownacy
8e8f18a1ee Having second thoughts about this style change 2019-09-11 13:07:55 +00:00
Clownacy
1f5d37a938 Merge branch 'accurate' into portable 2019-09-11 13:03:53 +00:00
Gabriel Ravier
dd190bd276
Remove option change, wrote "cross-gcc" as "cross-GCC" and "mingw" as "MinGW"
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-11 14:32:48 +02:00
Gabriel Ravier
d686152e84
Fixed question not being a question, "Emscriptem" and saying "cross-compiled" twice
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-11 14:11:01 +02:00
Gabriel Ravier
7176bcab9e
Added more detail to the cross-compile comment
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-11 13:37:34 +02:00
Gabriel Ravier
d4ce0839bb
Forgot endif() in bin2h/CMakeLists.txt
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-11 13:33:09 +02:00
Clownacy
5fd6d3dd60
Merge pull request #52 from GabrielRavier/improveDoConfig
Improve DoConfig
2019-09-11 11:11:15 +01:00
Gabriel Ravier
b10d895334
Changed public-private indentation
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-11 12:02:57 +02:00
Gabriel Ravier
69cb6b75c7
Reformatted DoConfig
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-11 11:49:58 +02:00