projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed regression bug with bad playfield offset
[rocksndiamonds.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index 793b7af044858fdf23c509249e49b60c7d8dd2b6..95de1f87afde36118f92a3c33c3cc371eacf7447 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-5398,82
+5398,82
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
{
"df_wooden_grid_fixed_1",
"df_wooden_grid_fixed",
{
"df_wooden_grid_fixed_1",
"df_wooden_grid_fixed",
- "fixed wooden polarizer (0\xb0)"
+ "fixed wooden polarizer (
DF) (
0\xb0)"
},
{
"df_wooden_grid_fixed_2",
"df_wooden_grid_fixed",
},
{
"df_wooden_grid_fixed_2",
"df_wooden_grid_fixed",
- "fixed wooden polarizer (22.5\xb0)"
+ "fixed wooden polarizer (
DF) (
22.5\xb0)"
},
{
"df_wooden_grid_fixed_3",
"df_wooden_grid_fixed",
},
{
"df_wooden_grid_fixed_3",
"df_wooden_grid_fixed",
- "fixed wooden polarizer (45\xb0)"
+ "fixed wooden polarizer (
DF) (
45\xb0)"
},
{
"df_wooden_grid_fixed_4",
"df_wooden_grid_fixed",
},
{
"df_wooden_grid_fixed_4",
"df_wooden_grid_fixed",
- "fixed wooden polarizer (67.5\xb0)"
+ "fixed wooden polarizer (
DF) (
67.5\xb0)"
},
{
"df_wooden_grid_fixed_5",
"df_wooden_grid_fixed",
},
{
"df_wooden_grid_fixed_5",
"df_wooden_grid_fixed",
- "fixed wooden polarizer (90\xb0)"
+ "fixed wooden polarizer (
DF) (
90\xb0)"
},
{
"df_wooden_grid_fixed_6",
"df_wooden_grid_fixed",
},
{
"df_wooden_grid_fixed_6",
"df_wooden_grid_fixed",
- "fixed wooden polarizer (112.5\xb0)"
+ "fixed wooden polarizer (
DF) (
112.5\xb0)"
},
{
"df_wooden_grid_fixed_7",
"df_wooden_grid_fixed",
},
{
"df_wooden_grid_fixed_7",
"df_wooden_grid_fixed",
- "fixed wooden polarizer (135\xb0)"
+ "fixed wooden polarizer (
DF) (
135\xb0)"
},
{
"df_wooden_grid_fixed_8",
"df_wooden_grid_fixed",
},
{
"df_wooden_grid_fixed_8",
"df_wooden_grid_fixed",
- "fixed wooden polarizer (157.5\xb0)"
+ "fixed wooden polarizer (
DF) (
157.5\xb0)"
},
{
"df_steel_grid_fixed_1",
"df_steel_grid_fixed",
},
{
"df_steel_grid_fixed_1",
"df_steel_grid_fixed",
- "fixed steel polarizer (0\xb0)"
+ "fixed steel polarizer (
DF) (
0\xb0)"
},
{
"df_steel_grid_fixed_2",
"df_steel_grid_fixed",
},
{
"df_steel_grid_fixed_2",
"df_steel_grid_fixed",
- "fixed steel polarizer (22.5\xb0)"
+ "fixed steel polarizer (
DF) (
22.5\xb0)"
},
{
"df_steel_grid_fixed_3",
"df_steel_grid_fixed",
},
{
"df_steel_grid_fixed_3",
"df_steel_grid_fixed",
- "fixed steel polarizer (45\xb0)"
+ "fixed steel polarizer (
DF) (
45\xb0)"
},
{
"df_steel_grid_fixed_4",
"df_steel_grid_fixed",
},
{
"df_steel_grid_fixed_4",
"df_steel_grid_fixed",
- "fixed steel polarizer (67.5\xb0)"
+ "fixed steel polarizer (
DF) (
67.5\xb0)"
},
{
"df_steel_grid_fixed_5",
"df_steel_grid_fixed",
},
{
"df_steel_grid_fixed_5",
"df_steel_grid_fixed",
- "fixed steel polarizer (90\xb0)"
+ "fixed steel polarizer (
DF) (
90\xb0)"
},
{
"df_steel_grid_fixed_6",
"df_steel_grid_fixed",
},
{
"df_steel_grid_fixed_6",
"df_steel_grid_fixed",
- "fixed steel polarizer (112.5\xb0)"
+ "fixed steel polarizer (
DF) (
112.5\xb0)"
},
{
"df_steel_grid_fixed_7",
"df_steel_grid_fixed",
},
{
"df_steel_grid_fixed_7",
"df_steel_grid_fixed",
- "fixed steel polarizer (135\xb0)"
+ "fixed steel polarizer (
DF) (
135\xb0)"
},
{
"df_steel_grid_fixed_8",
"df_steel_grid_fixed",
},
{
"df_steel_grid_fixed_8",
"df_steel_grid_fixed",
- "fixed steel polarizer (157.5\xb0)"
+ "fixed steel polarizer (
DF) (
157.5\xb0)"
},
{
"df_wooden_wall_1",
},
{
"df_wooden_wall_1",
@@
-6736,6
+6736,11
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
"mm_exit",
"-"
},
"mm_exit",
"-"
},
+ {
+ "mm_gray_ball.active",
+ "mm_gray_ball",
+ "-",
+ },
{
"mm_gray_ball.opening",
"mm_gray_ball",
{
"mm_gray_ball.opening",
"mm_gray_ball",
@@
-7798,6
+7803,7
@@
static void InitProgramConfig(char *command_filename)
InitProgramInfo(command_filename,
config_filename,
userdata_subdir,
InitProgramInfo(command_filename,
config_filename,
userdata_subdir,
+ program_basename,
program_title,
program_icon_file,
COOKIE_PREFIX,
program_title,
program_icon_file,
COOKIE_PREFIX,