Skip to content

Commit b8c088f

Browse files
HeatXDHeatXD
committed
Fix C name clashes by adding prefixes to various enums.
1 parent b53c2c6 commit b8c088f

11 files changed

Lines changed: 80 additions & 80 deletions

File tree

‎Examples/OnlineSession/OnlineSession.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ int main(int argc, char* argv[]) {
9494
// gekkonet setup
9595
GekkoSession* session = nullptr;
9696

97-
gekko_create(&session, GekkoSessionType::Game);
97+
gekko_create(&session, GekkoSessionType::GekkoGameSession);
9898

9999
GekkoConfig config{};
100100

@@ -119,15 +119,15 @@ int main(int argc, char* argv[]) {
119119
}
120120

121121
if (is_local) {
122-
gekko_add_actor(session, LocalPlayer, nullptr);
122+
gekko_add_actor(session, GekkoLocalPlayer, nullptr);
123123
gekko_set_local_delay(session, i, 1);
124124
}
125125
else {
126126
GekkoNetAddress addr = {};
127127
std::string address_str = "127.0.0.1:" + std::to_string(ports[i]);
128128
addr.data = (void*)address_str.c_str();
129129
addr.size = address_str.size();
130-
gekko_add_actor(session, RemotePlayer, &addr);
130+
gekko_add_actor(session, GekkoRemotePlayer, &addr);
131131
if (remote_handle < 0) remote_handle = i;
132132
}
133133
}
@@ -158,7 +158,7 @@ int main(int argc, char* argv[]) {
158158
for (int i = 0; i < count; i++) {
159159
GekkoSessionEvent* event = events[i];
160160
switch (event->type) {
161-
case DesyncDetected:
161+
case GekkoDesyncDetected:
162162
auto desync = event->data.desynced;
163163
printf(
164164
"DESYNC!!! f:%d, rh:%d, lc:%u, rc:%u\n", desync.frame, desync.remote_handle,
@@ -167,17 +167,17 @@ int main(int argc, char* argv[]) {
167167
assert(false);
168168
break;
169169

170-
case PlayerConnected:
170+
case GekkoPlayerConnected:
171171
auto connect = event->data.connected;
172172
printf("Player %i connected\n", connect.handle);
173173
break;
174174

175-
case PlayerDisconnected:
175+
case GekkoPlayerDisconnected:
176176
auto disconnect = event->data.disconnected;
177177
printf("Player %i disconnected\n", disconnect.handle);
178178
break;
179179

180-
case PlayerSyncing:
180+
case GekkoPlayerSyncing:
181181
auto sync = event->data.syncing;
182182
printf("Player %i is connecting %d/%d\n", sync.handle, sync.current, sync.max);
183183
break;
@@ -189,17 +189,17 @@ int main(int argc, char* argv[]) {
189189
for (int i = 0; i < count; i++) {
190190
GekkoGameEvent* event = updates[i];
191191
switch (event->type) {
192-
case SaveEvent:
192+
case GekkoSaveEvent:
193193
*event->data.save.state_len = sizeof(Gamestate::State);
194194
*event->data.save.checksum = SDL_crc32(0, &gs.state, sizeof(Gamestate::State));
195195
memcpy(event->data.save.state, &gs.state, sizeof(Gamestate::State));
196196
break;
197197

198-
case LoadEvent:
198+
case GekkoLoadEvent:
199199
memcpy(&gs.state, event->data.load.state, sizeof(Gamestate::State));
200200
break;
201201

202-
case AdvanceEvent:
202+
case GekkoAdvanceEvent:
203203
Input inputs[MAX_PLAYERS] = {};
204204
printf("f%d,", event->data.adv.frame);
205205
for (int j = 0; j < num_players; j++) {

‎Examples/Sliders/Sliders.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ int main(int argc, char* argv[]) {
150150
// gekkonet
151151
GekkoSession* session = nullptr;
152152

153-
gekko_create(&session, GekkoSessionType::Game);
153+
gekko_create(&session, GekkoSessionType::GekkoGameSession);
154154

155155
GekkoConfig config {};
156156

@@ -174,14 +174,14 @@ int main(int argc, char* argv[]) {
174174
}
175175

176176
if (is_local) {
177-
gekko_add_actor(session, LocalPlayer, nullptr);
177+
gekko_add_actor(session, GekkoLocalPlayer, nullptr);
178178
gekko_set_local_delay(session, i, 1);
179179
} else {
180180
GekkoNetAddress addr = {};
181181
std::string address_str = "127.0.0.1:" + std::to_string(ports[i]);
182182
addr.data = (void*)address_str.c_str();
183183
addr.size = address_str.size();
184-
gekko_add_actor(session, RemotePlayer, &addr);
184+
gekko_add_actor(session, GekkoRemotePlayer, &addr);
185185
}
186186
}
187187

@@ -211,7 +211,7 @@ int main(int argc, char* argv[]) {
211211
for (int i = 0; i < count; i++) {
212212
GekkoSessionEvent* event = events[i];
213213
switch (event->type) {
214-
case DesyncDetected:
214+
case GekkoDesyncDetected:
215215
auto desync = event->data.desynced;
216216
printf(
217217
"DESYNC!!! f:%d, rh:%d, lc:%u, rc:%u\n", desync.frame, desync.remote_handle,
@@ -220,12 +220,12 @@ int main(int argc, char* argv[]) {
220220
assert(false);
221221
break;
222222

223-
case PlayerConnected:
223+
case GekkoPlayerConnected:
224224
auto connect = event->data.connected;
225225
printf("Player %i connected\n", connect.handle);
226226
break;
227227

228-
case PlayerDisconnected:
228+
case GekkoPlayerDisconnected:
229229
auto disconnect = event->data.disconnected;
230230
printf("Player %i disconnected\n", disconnect.handle);
231231
break;
@@ -237,19 +237,19 @@ int main(int argc, char* argv[]) {
237237
for (int i = 0; i < count; i++) {
238238
GekkoGameEvent* event = updates[i];
239239
switch (event->type) {
240-
case SaveEvent:
240+
case GekkoSaveEvent:
241241
printf("sav ev\n");
242242
*event->data.save.state_len = sizeof(State);
243243
*event->data.save.checksum = SDL_crc32(0, &game, sizeof(State));
244244
memcpy(event->data.save.state, &game, sizeof(State));
245245
break;
246246

247-
case LoadEvent:
247+
case GekkoLoadEvent:
248248
memcpy(&game, event->data.load.state, sizeof(State));
249249
printf("rb start\n");
250250
break;
251251

252-
case AdvanceEvent:
252+
case GekkoAdvanceEvent:
253253
printf("f%d,", event->data.adv.frame);
254254
for (int j = 0; j < num_players; j++) {
255255
inputs[j] = ((Input*)(event->data.adv.inputs))[j];

‎Examples/SpectatorSession/SpectatorSession.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ int main(int argc, char* argv[]) {
7171
// gekkonet setup
7272
GekkoSession* session = nullptr;
7373

74-
gekko_create(&session, is_spectator ? GekkoSessionType::Spectate : GekkoSessionType::Game);
74+
gekko_create(&session, is_spectator ? GekkoSessionType::GekkoSpectateSession : GekkoSessionType::GekkoGameSession);
7575

7676
GekkoConfig config{};
7777

@@ -95,14 +95,14 @@ int main(int argc, char* argv[]) {
9595
if (!is_spectator) {
9696
// add local players
9797
for (int i = 0; i < NUM_PLAYERS; i++) {
98-
gekko_add_actor(session, LocalPlayer, nullptr);
98+
gekko_add_actor(session, GekkoLocalPlayer, nullptr);
9999
gekko_set_local_delay(session, i, 1);
100100
}
101101
// add spectator
102-
stats_handle = gekko_add_actor(session, Spectator, &rem_addr);
102+
stats_handle = gekko_add_actor(session, GekkoSpectator, &rem_addr);
103103
} else {
104104
// add host as remote player
105-
stats_handle = gekko_add_actor(session, RemotePlayer, &rem_addr);
105+
stats_handle = gekko_add_actor(session, GekkoRemotePlayer, &rem_addr);
106106
}
107107

108108
// setup game
@@ -133,7 +133,7 @@ int main(int argc, char* argv[]) {
133133
for (int i = 0; i < count; i++) {
134134
GekkoSessionEvent* event = events[i];
135135
switch (event->type) {
136-
case DesyncDetected:
136+
case GekkoDesyncDetected:
137137
auto desync = event->data.desynced;
138138
printf(
139139
"DESYNC!!! f:%d, rh:%d, lc:%u, rc:%u\n", desync.frame, desync.remote_handle,
@@ -142,26 +142,26 @@ int main(int argc, char* argv[]) {
142142
assert(false);
143143
break;
144144

145-
case PlayerConnected:
145+
case GekkoPlayerConnected:
146146
auto connect = event->data.connected;
147147
printf("Player %i connected\n", connect.handle);
148148
break;
149149

150-
case PlayerDisconnected:
150+
case GekkoPlayerDisconnected:
151151
auto disconnect = event->data.disconnected;
152152
printf("Player %i disconnected\n", disconnect.handle);
153153
break;
154154

155-
case PlayerSyncing:
155+
case GekkoPlayerSyncing:
156156
auto sync = event->data.syncing;
157157
printf("Player %i is connecting %d/%d\n", sync.handle, sync.current, sync.max);
158158
break;
159159

160-
case SpectatorPaused:
160+
case GekkoSpectatorPaused:
161161
printf("Spectator paused, waiting for more inputs...\n");
162162
break;
163163

164-
case SpectatorUnpaused:
164+
case GekkoSpectatorUnpaused:
165165
printf("Spectator unpaused, resuming playback.\n");
166166
break;
167167
}
@@ -172,17 +172,17 @@ int main(int argc, char* argv[]) {
172172
for (int i = 0; i < count; i++) {
173173
GekkoGameEvent* event = updates[i];
174174
switch (event->type) {
175-
case SaveEvent:
175+
case GekkoSaveEvent:
176176
*event->data.save.state_len = sizeof(Gamestate::State);
177177
*event->data.save.checksum = SDL_crc32(0, &gs.state, sizeof(Gamestate::State));
178178
memcpy(event->data.save.state, &gs.state, sizeof(Gamestate::State));
179179
break;
180180

181-
case LoadEvent:
181+
case GekkoLoadEvent:
182182
memcpy(&gs.state, event->data.load.state, sizeof(Gamestate::State));
183183
break;
184184

185-
case AdvanceEvent:
185+
case GekkoAdvanceEvent:
186186
Input inputs[MAX_PLAYERS] = {};
187187
printf("f%d,", event->data.adv.frame);
188188
for (int j = 0; j < NUM_PLAYERS; j++) {

‎Examples/StressSession/StressSession.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ int main(int argc, char* argv[]) {
4444
// gekkonet setup
4545
GekkoSession* session = nullptr;
4646

47-
gekko_create(&session, GekkoSessionType::Stress);
47+
gekko_create(&session, GekkoSessionType::GekkoStressSession);
4848

4949
GekkoConfig config{};
5050

@@ -57,7 +57,7 @@ int main(int argc, char* argv[]) {
5757
gekko_start(session, &config);
5858

5959
for (int i = 0; i < 2; i++) {
60-
gekko_add_actor(session, LocalPlayer, nullptr);
60+
gekko_add_actor(session, GekkoLocalPlayer, nullptr);
6161
gekko_set_local_delay(session, i, 1);
6262
}
6363

@@ -86,7 +86,7 @@ int main(int argc, char* argv[]) {
8686
for (int i = 0; i < count; i++) {
8787
GekkoSessionEvent* event = events[i];
8888
switch (event->type) {
89-
case DesyncDetected:
89+
case GekkoDesyncDetected:
9090
auto desync = event->data.desynced;
9191
printf(
9292
"DESYNC!!! f:%d, rh:%d, lc:%u, rc:%u\n", desync.frame, desync.remote_handle,
@@ -102,19 +102,19 @@ int main(int argc, char* argv[]) {
102102
for (int i = 0; i < count; i++) {
103103
GekkoGameEvent* event = updates[i];
104104
switch (event->type) {
105-
case SaveEvent:
105+
case GekkoSaveEvent:
106106
*event->data.save.state_len = sizeof(Gamestate::State);
107107
*event->data.save.checksum = SDL_crc32(0, &gs.state, sizeof(Gamestate::State));
108108
memcpy(event->data.save.state, &gs.state, sizeof(Gamestate::State));
109109
printf("sf%d \n", event->data.save.frame);
110110
break;
111111

112-
case LoadEvent:
112+
case GekkoLoadEvent:
113113
memcpy(&gs.state, event->data.load.state, sizeof(Gamestate::State));
114114
printf("lf%d \n", event->data.load.frame);
115115
break;
116116

117-
case AdvanceEvent:
117+
case GekkoAdvanceEvent:
118118
Input inputs[MAX_PLAYERS] = {};
119119
printf("f%d,", event->data.adv.frame);
120120
for (int j = 0; j < 2; j++) {

‎GekkoLib/include/gekkonet.h‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ extern "C" {
5656
typedef struct GekkoSession GekkoSession;
5757

5858
typedef enum GekkoSessionType {
59-
Game, // session for an active player.
60-
Stress, // session to test your local simulation for state desyncs.
61-
Spectate, // session for spectators watching an active player.
59+
GekkoGameSession, // session for an active player.
60+
GekkoStressSession, // session to test your local simulation for state desyncs.
61+
GekkoSpectateSession, // session for spectators watching an active player.
6262
} GekkoSessionType;
6363

6464
typedef struct GekkoConfig {
@@ -74,9 +74,9 @@ typedef struct GekkoConfig {
7474
} GekkoConfig;
7575

7676
typedef enum GekkoPlayerType {
77-
LocalPlayer,
78-
RemotePlayer,
79-
Spectator
77+
GekkoLocalPlayer,
78+
GekkoRemotePlayer,
79+
GekkoSpectator
8080
} GekkoPlayerType;
8181

8282
typedef struct GekkoNetAddress {
@@ -102,10 +102,10 @@ typedef struct GekkoNetAdapter {
102102
} GekkoNetAdapter;
103103

104104
typedef enum GekkoGameEventType {
105-
EmptyGameEvent = -1,
106-
AdvanceEvent,
107-
SaveEvent,
108-
LoadEvent
105+
GekkoEmptyGameEvent = -1,
106+
GekkoAdvanceEvent,
107+
GekkoSaveEvent,
108+
GekkoLoadEvent
109109
} GekkoGameEventType;
110110

111111
typedef struct GekkoGameEvent {
@@ -134,14 +134,14 @@ typedef struct GekkoGameEvent {
134134
} GekkoGameEvent;
135135

136136
typedef enum GekkoSessionEventType {
137-
EmptySessionEvent = -1,
138-
PlayerSyncing,
139-
PlayerConnected,
140-
PlayerDisconnected,
141-
SessionStarted,
142-
SpectatorPaused,
143-
SpectatorUnpaused,
144-
DesyncDetected
137+
GekkoEmptySessionEvent = -1,
138+
GekkoPlayerSyncing,
139+
GekkoPlayerConnected,
140+
GekkoPlayerDisconnected,
141+
GekkoSessionStarted,
142+
GekkoSpectatorPaused,
143+
GekkoSpectatorUnpaused,
144+
GekkoDesyncDetected
145145
} GekkoSessionEventType;
146146

147147
typedef struct GekkoSessionEvent {

0 commit comments

Comments
 (0)