Commit graph

707 commits

Author SHA1 Message Date
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
Clownacy
42d5bfae5f
Merge pull request #34 from GabrielRavier/improveF
Improve files starting with F
2019-05-14 09:52:42 +00: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
Gabriel Ravier
1343e408b1
Merge branch 'master' into feature/makeFlagsMacros 2019-05-14 08:15:43 +02:00
Gabriel Ravier
107fd3551d
Merge branch 'master' into feature/improveNpcAct 2019-05-14 08:15:38 +02:00
Gabriel Ravier
12c633a64a
Merge branch 'master' into feature/improveF 2019-05-14 08:15:35 +02:00
Gabriel Ravier
5a2f98ece4
Merge pull request #20 from Clownacy/master
Merge Clownacy/master into master
2019-05-14 08:09:58 +02:00
Clownacy
b2812053b7 Shut up a warning GCC was giving me 2019-05-14 01:47:30 +01:00
Clownacy
00ca00f5dd Weed out some usage of C++ bools
Pixel used BOOL, the C89-friendly Windows-specific equivalent
2019-05-14 01:35:04 +01:00
Clownacy
9de26337dc
Merge pull request #13 from GabrielRavier/addBetterMakefileDebugFlags
Add better Makefile debug flags
2019-05-13 22:52:55 +00:00
Clownacy
d5dd2c9575 Made TextScr.cpp almost ASM-accurate
TextScriptProc is all that's left, but it's being a pain, so I'm
commiting this now, and dealing with the straggler later.
2019-05-13 23:51:11 +01:00
Clownacy
e1d3898d59 Made SelStage.cpp ASM-accurate 2019-05-13 21:31:14 +01:00
Clownacy
c9d5b3d03a Made Ending.cpp ASM-accurate 2019-05-13 20:43:43 +01:00
Gabriel Ravier
bce894210d
Move macros in Flags.cpp right below the includes
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-13 20:54:43 +02:00
Clownacy
d3af5e372f Made ArmsItem.cpp ASM-accurate 2019-05-13 19:00:48 +01:00
Gabriel Ravier
2cd6692a00
Merge branch 'develop' into feature/makeFlagsMacros 2019-05-13 19:41:44 +02:00
Gabriel Ravier
81a1df6ed4
Merge branch 'develop' into feature/improveNpcAct 2019-05-13 19:41:36 +02:00
Gabriel Ravier
e9d766677e
Merge branch 'develop' into feature/improveF 2019-05-13 19:41:15 +02:00
Gabriel Ravier
843677bd7a
Merged 'develop'. 2019-05-13 19:31:15 +02:00
Gabriel Ravier
11f6bf9f16
Merge pull request #18 from Clownacy/master
Merge Clownacy/master into master
2019-05-13 19:17:40 +02:00
Gabriel Ravier
a0f4bae094
Moved and renamed flag macros
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-13 18:58:29 +02:00
Clownacy
9b82baeb02 Made MiniMap.cpp actually ASM-accurate 2019-05-13 17:50:09 +01:00
Gabriel Ravier
0651f1b910
Cleaned up NpcAct000.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-13 18:35:35 +02:00
Clownacy
cc1df04fab Fix broken code in MyChar.cpp 2019-05-13 16:28:02 +01:00
Clownacy
9398314af6 Shut up some MSVC2003 warnings, and comment on another one
I'm not fixing that last one, since I'd rather futureproof the code in
the event the SDL2 devs update the function to use size_t.
2019-05-13 15:45:45 +01:00