Skip to content

Commit 234f8da

Browse files
madebrmadebr
committed
Frontend continued
1 parent 63ca5a9 commit 234f8da

33 files changed

Lines changed: 1320 additions & 57 deletions

‎src/carma2/newcommon/18-graphics2.c‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,10 @@ int C2_HOOK_FASTCALL DoMouseCursor(void) {
193193

194194
// InitMouseTargetLines
195195

196-
// StartMouseCursor
196+
// STUB: CARMA2_HW 0x0043e6c0
197+
void C2_HOOK_FASTCALL StartMouseCursor(void) {
198+
NOT_IMPLEMENTED();
199+
}
197200

198201
// STUB: CARMA2_HW 0x0043e710
199202
void C2_HOOK_FASTCALL EndMouseCursor(void) {

‎src/carma2/newcommon/18-graphics2.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ extern int C2_HOOK_FASTCALL DoMouseCursor(void);
5656

5757
// InitMouseTargetLines
5858

59-
// StartMouseCursor
59+
extern void C2_HOOK_FASTCALL StartMouseCursor(void);
6060

6161
extern void C2_HOOK_FASTCALL EndMouseCursor(void);
6262

‎src/carma2/newcommon/24-loadsave.c‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ void C2_HOOK_FASTCALL EndSavedGamesList(void) {
2828
gSaved_games = NULL;
2929
}
3030

31-
// GetNthSavedGame
31+
// STUB: CARMA2_HW 0x00491cb0
32+
tSave_game* C2_HOOK_FASTCALL GetNthSavedGame(int pN) {
33+
NOT_IMPLEMENTED();
34+
}
3235

3336
// DoLoadGame2
3437

‎src/carma2/newcommon/24-loadsave.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#define GUARD_24_LOADSAVE_H
33

44
#include "c2_hooks.h"
5+
#include "rec2_types.h"
56

67
extern int gSave_game_out_of_sync;
78

@@ -15,7 +16,7 @@ extern void C2_HOOK_FASTCALL DoSaveGame(void);
1516

1617
extern void C2_HOOK_FASTCALL EndSavedGamesList(void);
1718

18-
// GetNthSavedGame
19+
extern tSave_game* C2_HOOK_FASTCALL GetNthSavedGame(int pN);
1920

2021
// DoLoadGame2
2122

‎src/carma2/newcommon/35-intrface.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
#include "c2_hooks.h"
55
#include "rec2_types.h"
66

7+
extern int gMouse_in_use;
8+
79
extern void C2_HOOK_FASTCALL SetAlwaysTyping(void);
810

911
extern void C2_HOOK_FASTCALL ClearAlwaysTyping(void);

‎src/carma2/newcommon/40-main.c‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,10 @@ C2_NORETURN void C2_HOOK_FASTCALL QuitGame(void) {
5959

6060
// ServiceTheGame
6161

62-
// ServiceGame
62+
// STUB: CARMA2_HW 0x00492180
63+
void C2_HOOK_FASTCALL ServiceGame(void) {
64+
NOT_IMPLEMENTED();
65+
}
6366

6467
// ServiceGameInRace
6568

‎src/carma2/newcommon/40-main.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ extern C2_NORETURN void C2_HOOK_FASTCALL QuitGame(void);
77

88
// ServiceTheGame
99

10-
// ServiceGame
10+
extern void C2_HOOK_FASTCALL ServiceGame(void);
1111

1212
// ServiceGameInRace
1313

‎src/carma2/newcommon/42-input.c‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ void C2_HOOK_FASTCALL PollKeys(void) {
1919

2020
// CheckKeysForMouldiness
2121

22-
// EitherMouseButtonDown
22+
// STUB: CARMA2_HW 0x004824c0
23+
int C2_HOOK_FASTCALL EitherMouseButtonDown(void) {
24+
NOT_IMPLEMENTED();
25+
}
2326

2427
// AnyModifiersDown
2528

@@ -57,7 +60,10 @@ void C2_HOOK_FASTCALL WaitForNoKeys(void) {
5760
NOT_IMPLEMENTED();
5861
}
5962

60-
// GetMousePosition
63+
// STUB: CARMA2_HW 0x00483c10
64+
void C2_HOOK_FASTCALL GetMousePosition(int *pX, int *pY) {
65+
NOT_IMPLEMENTED();
66+
}
6167

6268
// STUB: CARMA2_HW 0x00483c90
6369
void C2_HOOK_FASTCALL InitRollingLetters(void) {

‎src/carma2/newcommon/42-input.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ extern void C2_HOOK_FASTCALL PollKeys(void);
1515

1616
// CheckKeysForMouldiness
1717

18-
// EitherMouseButtonDown
18+
extern int C2_HOOK_FASTCALL EitherMouseButtonDown(void);
1919

2020
// AnyModifiersDown
2121

@@ -37,7 +37,7 @@ extern int C2_HOOK_FASTCALL KeyIsDown(int pKey_index);
3737

3838
extern void C2_HOOK_FASTCALL WaitForNoKeys(void);
3939

40-
// GetMousePosition
40+
extern void C2_HOOK_FASTCALL GetMousePosition(int *pX, int *pY);
4141

4242
extern void C2_HOOK_FASTCALL InitRollingLetters(void);
4343

‎src/carma2/newcommon/72-interface-main.c‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
#include "72-interface-main.h"
2+
3+
#include "72-interface.h"
4+
5+
6+
// GLOBAL: CARMA2_HW 0x005a80f0
7+
tFrontend_spec gFrontend_MAIN = {
8+
#if 0 // FIXME: enable this
9+
"Main",
10+
0,
11+
26,
12+
MainMenuInfunc,
13+
MainMenuOutfunc,
14+
FRONTEND_MainMenuHandler,
15+
&gFrontend_OPTIONS,
16+
0,
17+
0,
18+
0,
19+
2,
20+
2,
21+
1,
22+
{
23+
{ 0x9, OnePlayerSetup, NULL, 0, 17, 18, 0, 0, 0, 0, 0, 1, },
24+
{ 0xa, MultiplayerSetup, &gFrontend_NETWORK, 0, 17, 18, 0, 0, 0, 0, 1, 1, },
25+
{ 0x404, temp, NULL, 0, 17, 18, 0, 0, 0, 0, 0, 1, },
26+
{ 0x403, testUp, NULL, 0, 17, 18, 0, 0, 0, 0, 1, 1, },
27+
{ 0x404, MainMenuSelectRace, NULL, 0, 17, 18, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, },
28+
{ 0x404, MainMenuSelectRace, NULL, 0, 17, 18, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, },
29+
{ 0x404, MainMenuSelectRace, NULL, 0, 17, 18, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, },
30+
{ 0x404, MainMenuSelectRace, NULL, 0, 17, 18, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, },
31+
{ 0x403, testDn, NULL, 0, 17, 18, 0, 0, 0, 0, 1, 1, },
32+
{ 0xf, temp, &gFrontend_OPTIONS, 0, 17, 18, 0, 0, 0, 0, 1, 1, },
33+
{ 0x402, temp, &gFrontend_CHANGE_CAR, 0, 17, 18, 0, 0, 0, 0, 1, 1, },
34+
{ 0x402, temp, &gFrontend_CHANGE_CAR, 0, 17, 18, 0, 0, 0, 0, 1, 1, },
35+
{ 0x402, temp, &gFrontend_CHANGE_CAR, 0, 17, 18, 0, 0, 0, 0, 1, 1, },
36+
{ 0x402, temp, &gFrontend_CHANGE_CAR, 0, 17, 18, 0, 0, 0, 0, 1, 1, },
37+
{ 0x402, temp, &gFrontend_CHANGE_CAR, 0, 17, 18, 0, 0, 0, 0, 1, 1, },
38+
{ 0x402, temp, &gFrontend_CHANGE_CAR, 0, 17, 18, 0, 0, 0, 0, 1, 1, },
39+
{ 0xc, temp, NULL, 0, 17, 18, 0, 0, 0, 0, 0, 1, },
40+
{ 0x404, temp, NULL, 0, 17, 18, 0, 0, 0, 0, 0, 1, },
41+
{ 0x404, NewGameToggleTyping, NULL, 0, 17, 18, 0, 0, 0, 0, 1, 1, },
42+
{ 0xec, temp, NULL, 0, 17, 18, 0, 0, 0, 0, 0, 1, },
43+
{ 0x404, temp, NULL, 0, 17, 18, 0, 0, 0, 0, 0, 1, },
44+
{ 0xe, StartFudge, &gFrontend_NEWGAME, 0, 17, 18, 0, 0, 0, 0, 1, 1, },
45+
{ 0x401, temp, NULL, 0, 17, 18, 0, 0, 0, 0, 0, 1, },
46+
{ 0x401, temp, NULL, 0, 17, 18, 0, 0, 0, 0, 0, 1, },
47+
{ 0xf7, temp, NULL, 0, 17, 18, 0, 0, 0, 0, 0, 1, },
48+
{ 0x401, temp, NULL, 0, 17, 18, 0, 0, 0, 0, 0, 1, },
49+
},
50+
1,
51+
{
52+
{ 1, 8, 6, 12, 12, 12, 19 },
53+
}
54+
#else
55+
0
56+
#endif
57+
};
58+

0 commit comments

Comments
 (0)