summaryrefslogtreecommitdiff
path: root/src/gui/setup.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2004-12-12 14:15:33 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2004-12-12 14:15:33 +0000
commit37061920bc263e9d5350aa2d83a7e7785fedc1df (patch)
treedfdf40c4eeb5d6cd4076fdeb804602b558ab2fd8 /src/gui/setup.cpp
parent6808576588e94a3143120a1d1ac308092969f87e (diff)
downloadmana-client-37061920bc263e9d5350aa2d83a7e7785fedc1df.tar.gz
mana-client-37061920bc263e9d5350aa2d83a7e7785fedc1df.tar.bz2
mana-client-37061920bc263e9d5350aa2d83a7e7785fedc1df.tar.xz
mana-client-37061920bc263e9d5350aa2d83a7e7785fedc1df.zip
Added Guichan and converted login dialog. Also resolved some naming conflicts.
Diffstat (limited to 'src/gui/setup.cpp')
-rw-r--r--src/gui/setup.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index a8059799..b88fc8cd 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -25,7 +25,7 @@ int apply_setup(int msg, DIALOG *d, int c); /* Need this here in order to acces
/*
* Hard coded list cuz get_gfx_mode_list fails with AUTODETECT
*/
-const LIST list[] = {
+const LIST mode_list[] = {
{ 1024,768, "1024x768" },
{ 800,600, "800x600" },
{ 640,480, "640x480"}
@@ -40,7 +40,7 @@ char *get_listbox_video_modes(int index, int *list_size)
*list_size = 3;
return NULL;
} else
- return list[index].desc;
+ return mode_list[index].desc;
}
/*