Commit 624e6ddfc594a577efe1c19f97e601bf79a29ff1 - springlobby

+9

-0

springlobby_config.h less more

	0	#ifndef SPRINGLOBBY_HEADERGUARD_CONFIG_H
	1	#define SPRINGLOBBY_HEADERGUARD_CONFIG_H
	2
	3	#undef VERSION
	4
	5	/* the git tag / commit we build from */
	6	#define VERSION "0.99"
	7
	8	#endif /* SPRINGLOBBY_HEADERGUARD_CONFIG_H */

+0

-9

~~springlobby_config\.h~~ less more

0		#ifndef SPRINGLOBBY_HEADERGUARD_CONFIG_H
1		#define SPRINGLOBBY_HEADERGUARD_CONFIG_H
2
3		#undef VERSION
4
5		/* the git tag / commit we build from */
6		#define VERSION "0.96"
7
8		#endif /* SPRINGLOBBY_HEADERGUARD_CONFIG_H */

+5

-2

src/battleroomtab.cpp less more

31	31	#include "iunitsync.h"
32	32	#include "user.h"
33	33	#include "battle.h"
	34	#include "defines.h"
34	35	#include "utils/conversion.h"
35	36	#include "utils/debug.h"
36	37	#include "utils/uievents.h"

283	284	//m_info1_sizer = new wxBoxSizer( wxHORIZONTAL );
284	285	m_main_sizer = new wxBoxSizer( wxVERTICAL );
285	286
286		int side_sel_width = m_side_sel->GetWidestItemWidth();
287	287	wxBoxSizer* m_side_sel_sizer = new wxBoxSizer( wxHORIZONTAL );
288		m_side_sel_sizer->SetMinSize( side_sel_width, CONTROL_HEIGHT );
	288	#ifndef HAVE_WX29
	289	int side_sel_width = m_side_sel->GetWidestItemWidth();
	290	m_side_sel_sizer->SetMinSize( side_sel_width, CONTROL_HEIGHT );
	291	#endif
289	292	m_side_sel_sizer->Add( m_side_sel, 1, wxEXPAND );
290	293
291	294	// Put widgets in place

+2

-2

src/chatpanel.cpp less more

450	450	{
451	451	if (m1.Len() > 2 && (m1.GetChar(2) >= 48 && m1.GetChar(2) <= 58))
452	452	{
453		color = (m1.GetChar(1) - 48)*10+(m1.GetChar(2) - 48);
	453	color = (int(m1.GetChar(1)) - 48)*10+(int(m1.GetChar(2)) - 48);
454	454	_2chars = true;
455	455	m1 = m1.Mid(3);
456	456	}
457	457	else
458	458	{
459		color = m1.GetChar(1) -48;
	459	color = int(m1.GetChar(1)) -48;
460	460	_2chars = false;
461	461	m1 = m1.Mid(2);
462	462	}

+4

-3

src/customvirtlistctrl.cpp less more

4	4
5	5	#include "nonportable.h" //pulls in the SL_DUMMY_COL define if applicable
6	6	#include "settings.h"
	7	#include "defines.h"
7	8	#include "iconimagelist.h"
8	9	#include "utils/customdialogs.h"
9	10	#include "uiutils.h"

13	14
14	15	#include <algorithm>
15	16
16		#ifndef HAVE_WX29
17		BEGIN_EVENT_TABLE_TEMPLATE2(CustomVirtListCtrl, ListBaseType, T,L)
	17	#ifdef HAVE_WX29
	18	wxBEGIN_EVENT_TABLE_TEMPLATE2(CustomVirtListCtrl, ListBaseType, T,L)
18	19	#else
19		wxBEGIN_EVENT_TABLE_TEMPLATE2(CustomVirtListCtrl, ListBaseType, T,L)
	20	BEGIN_EVENT_TABLE_TEMPLATE2(CustomVirtListCtrl, ListBaseType, T,L)
20	21	#endif
21	22	#if wxUSE_TIPWINDOW
22	23	EVT_MOTION(CustomVirtListCtrl::OnMouseMotion)

+1

-4

src/flagimages.cpp less more

0	0	/* Copyright (C) 2007 The SpringLobby Team. All rights reserved. */
1		#ifdef __WXMAC__
2		#include <wx/bitmap.h>
3		#endif
4
5	1	#include "flagimages.h"
6	2	#include "flagimagedata.h"
7	3
	4	#include <wx/bitmap.h>
8	5	#include <wx/imaglist.h>
9	6	#include <wx/log.h>
10	7

+10

-3

src/ui.cpp less more

600	600
601	601	if ( server.uidata.panel ) server.uidata.panel->StatusMessage( _T("Connected to ") + server_name + _T(".") );
602	602	mw().GetBattleListTab().OnConnected();
	603	if (m_con_win)
	604	{
	605	delete m_con_win;
	606	m_con_win = 0;
	607	}
	608	if (m_reconnect_dialog)
	609	{
	610	delete m_reconnect_dialog;
	611	m_reconnect_dialog = 0;
	612	}
603	613	}
604	614
605	615

1367	1377
1368	1378	void Ui::CheckForUpdates()
1369	1379	{
1370		wxString t = _T("SpringLobby test\njfrepojeivnpenver\nwvpreivienrio\npwoewnpfwpnef\njcwoejfwp");
1371		Paste2Pastebin( t );
1372		return;
1373	1380	wxString latestVersion = GetLatestVersion();
1374	1381
1375	1382	if (latestVersion == _T("-1"))

+3

-2

src/utils/controls.cpp less more

19	19	if (!main_app_has_focus) return _T("");
20	20	return sett().GetShowTooltips() ? input : _T("");
21	21	#else
22		if (!main_app_has_focus) return _T("").wc_str();
23		return sett().GetShowTooltips() ? input : _T("").wc_str();
	22	wxString dummy = wxEmptyString;
	23	if (!main_app_has_focus) return dummy.wc_str();
	24	return sett().GetShowTooltips() ? input : dummy.wc_str();
24	25	#endif
25	26	}
26	27

+1

-1

tools/make_dist.sh less more

2	2	cd $(dirname $0)/..
3	3
4	4	git archive --format=tar --prefix=${2}/ HEAD > ${1}/${2}.tar
5		tar -Prf ${1}/${2}.tar ${1}/springlobby_config.h --transform "s;${1}/springlobby_config\.h;${2}/springlobby_config\.h;g"
	5	tar -Prf ${1}/${2}.tar ${1}/springlobby_config.h --transform "s;${1}/springlobby_config.h;${2}/springlobby_config.h;g"
6	6	cat ${1}/${2}.tar \| gzip > ${1}/${2}.tar.gz
7	7	cat ${1}/${2}.tar \| bzip2 > ${1}/${2}.tar.bz2
8	8	rm ${1}/${2}.tar