projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved functions to parse GIC parameters from 'libgame' to main source tree
[rocksndiamonds.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index 109e88d0e6e09f49b1cd6cc2de744d716af83725..28eaf6494ceff2328cca6c0603dcf53cd5d91a28 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-33,11
+33,8
@@
int game_status = -1;
boolean game_status_last_screen = -1;
boolean level_editor_test_game = FALSE;
boolean network_playing = FALSE;
boolean game_status_last_screen = -1;
boolean level_editor_test_game = FALSE;
boolean network_playing = FALSE;
-
-#if defined(TARGET_SDL)
boolean network_server = FALSE;
SDL_Thread *server_thread;
boolean network_server = FALSE;
SDL_Thread *server_thread;
-#endif
int key_joystick_mapping = 0;
int key_joystick_mapping = 0;
@@
-1178,17
+1175,17
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
"letter ''"
},
{
"letter ''"
},
{
- "char_
unused
",
+ "char_
button
",
"char",
"letter 'button'"
},
{
"char",
"letter 'button'"
},
{
- "char_u
nused
",
+ "char_u
p
",
"char",
"letter 'up'"
},
{
"char",
"letter 'up'"
},
{
- "char_
unused
",
+ "char_
down
",
"char",
"letter 'down'"
},
"char",
"letter 'down'"
},
@@
-4238,17
+4235,17
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
"steel letter ''"
},
{
"steel letter ''"
},
{
- "steel_char_
unused
",
+ "steel_char_
button
",
"steel_char",
"steel letter 'button'"
},
{
"steel_char",
"steel letter 'button'"
},
{
- "steel_char_u
nused
",
+ "steel_char_u
p
",
"steel_char",
"steel letter 'up'"
},
{
"steel_char",
"steel letter 'up'"
},
{
- "steel_char_
unused
",
+ "steel_char_
down
",
"steel_char",
"steel letter 'down'"
},
"steel_char",
"steel letter 'down'"
},