Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bugfixes' 

Conflicts:
	data/base/images/frontend.img
	src/Makefile.am
	src/frend.h
	src/multiint.cpp
master
vexed 2013-10-30 23:19:20 -04:00
parent 3eda8704b8 854b22c770
commit 9f005d25a7
8 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/base/images/frontend.img
View File

@ -204,5 +204,9 @@
0,0,image_medium.png
0,0,image_hard.png
0,0,image_insane.png
0,0,image_filter.png
0,0,image_filter_r.png
0,0,image_reload.png
0,0,image_reload_r.png
0,0,image_alli_unshared.png
0,0,image_alli_unshared_hi.png

BIN
data/base/images/frontend/image_filter.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 522 B

BIN
data/base/images/frontend/image_filter_r.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 599 B

BIN
data/base/images/frontend/image_reload.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
data/base/images/frontend/image_reload_r.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

1
src/Makefile.am
View File

@ -326,6 +326,7 @@ warzone2100_LDADD = $(warzone2100_LIBS) $(LTLIBINTL) $(SDL_LIBS) $(PHYSFS_LIBS)
$(THEORA_LIBS) $(OPENAL_LIBS) $(OPENGLC_LIBS) $(OPENGL_LIBS) $(QT4_LIBS) $(GLEW_LIBS) \
$(X_LIBS) $(X_EXTRA_LIBS) $(LIBCRYPTO_LIBS) $(LDFLAGS)
endif
endif
if MINGW32
if PORTABLE

4
src/frend.h
View File

@ -235,6 +235,10 @@ enum
IMAGE_MEDIUM,
IMAGE_HARD,
IMAGE_INSANE,
IMAGE_FILTER,
IMAGE_FILTER_ON,
IMAGE_RELOAD,
IMAGE_RELOAD_HI,
IMAGE_ALLI_UNSHARED,
IMAGE_ALLI_UNSHARED_HI,
};

14
src/multiint.cpp
View File

@ -1159,6 +1159,11 @@ void runGameFind(void )
if (id == MULTIOP_FILTER_TOGGLE)
{
toggleFilter = !toggleFilter;
toggleFilter ? widgSetButtonState(psWScreen, MULTIOP_FILTER_TOGGLE, WBUT_CLICKLOCK) : widgSetButtonState(psWScreen, MULTIOP_FILTER_TOGGLE, 0);
}
else
{
widgSetButtonState(psWScreen, MULTIOP_FILTER_TOGGLE, 0);
}
ingame.localOptionsReceived = true;
if (!NETfindGame()) // find games synchronously
@ -1246,11 +1251,12 @@ void startGameFind(void)
IMAGE_RETURN, IMAGE_RETURN_HI, IMAGE_RETURN_HI);
//refresh
addMultiBut(psWScreen,FRONTEND_BOTFORM,MULTIOP_REFRESH, MULTIOP_CHATBOXW-MULTIOP_OKW-5,5,MULTIOP_OKW,MULTIOP_OKH,
_("Refresh Games List"),IMAGE_REFRESH,IMAGE_REFRESH,false); // Find Games button
addMultiBut(psWScreen, FRONTEND_BOTFORM, MULTIOP_REFRESH, MULTIOP_CHATBOXW-MULTIOP_OKW-5, 5, MULTIOP_OKW, MULTIOP_OKH,
_("Refresh Games List"), IMAGE_RELOAD_HI, IMAGE_RELOAD, IMAGE_RELOAD);
//filter toggle
addMultiBut(psWScreen,FRONTEND_BOTFORM,MULTIOP_FILTER_TOGGLE, MULTIOP_CHATBOXW-MULTIOP_OKW-45,5,MULTIOP_OKW,MULTIOP_OKH,
_("Filter Games List"),IMAGE_FOG_OFF,IMAGE_FOG_OFF_HI,false); // Find Games button
addMultiBut(psWScreen, FRONTEND_BOTFORM, MULTIOP_FILTER_TOGGLE, MULTIOP_CHATBOXW-MULTIOP_OKW-45, 5, MULTIOP_OKW, MULTIOP_OKH,
_("Filter Games List"),IMAGE_FILTER, IMAGE_FILTER_ON, IMAGE_FILTER_ON);
if (safeSearch || disableLobbyRefresh)
{
widgHide(psWScreen, MULTIOP_REFRESH);